Commit Graph
2062 Commits
Author SHA1 Message Date
nao fujiwara a91f6379cb repositioned spooky long hair to its proper place in the alphabet (tweak) (#27370)
* repositioned spooky long hair to its proper place in the alphabet

* forgot the meta.json for hairstyles oopsie
2024-05-06 01:35:34 +02:00
brainfood1183andmetalgearsloth eb9e3974d0 Rodents can be Faxecuted (executed via Fax machine) (#21461)
* Rodents can be Faxecuted (executed via Fax machine)

* use brute instead of new group.

* fax visuals now use tags for mouse and hamster instead of comps

* fix for ubuntu, damn ubuntu bane of my life

* cant copy hamlet, can now faxecute mothroaches.

* fix

* fix

* fixes

* removed ifs now using switch, removed hastag now using string.

* fixes and no more switch

* cleanup

* more cleanup

* fix

* cleanup

* moved damage out of faxmachine and into own system and component.

* changes

* fixes and done i think.

* tidy

* Fixes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-05-06 01:31:20 +02:00
eoineoineoin 6b2fd62ee7 Add tooltips to artifact analyzer UI (#27393)
Add tooltips to indicate why "Extract" button is disabled.

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
(cherry picked from commit b8a8d6f8fc)
2024-05-03 00:30:47 +02:00
Ps3Moira e3721da175 Canes + Cane Blade for Syndicate Librarians (#25873)
* Cane + Cane Blade

* Add - type: ContainerContainer

* Add another - type: ContainerContainer

* Fix and add proper ContainerContainer component

* Add UserInterface component

* Remove Space

* Stat Changes

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 77d7c77f59)
2024-05-03 00:30:14 +02:00
nao fujiwara 2109d476c4 spooky dress and hairstyle (#27333)
* first draft loooong hair

* *added the old dress item *added old dress to the theatrical performances create

* updated spooky long hair name

* fixed an oopsie made when updating item names

(cherry picked from commit c6d935497c)
2024-05-03 00:20:22 +02:00
Mr. 27andTayrtahn 22cb3eb23a monkey reinforcement teleporters can now select between kobold or monkey with a verb (#25982)
* inital

* Update animals.yml

* Update animals.yml

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* selecting different role will change the description and name

* fix name

* gargh

* the review

Hello

* e

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

(cherry picked from commit 50fb91bd18)
2024-05-03 00:20:15 +02:00
wafehling 338fc46f78 Added hotkey and controller to re-open end of round scoreboard (#25884)
* Added keybind for scoreboard, starting work

* Fixed the window appearing

* Added loc text

* Updated namespace for ScoreboardUIController.cs

* Switched to UISystemDependency

"- UIControllers can use [Dependency] as normal for IoC services and other controllers, but must use [UISystemDependency] for entity systems, which may be null as controllers exist before entity systems do." Jezithyr — 10/12/2022 1:20 PM

* Reverted back to functional state

* Replace with UISystemDependency

* Move RoundEndSummaryWindow to ScoreboardUIController

* Convert to EntitySystem

* Clean up command bind

* Move to RoundEnd directory

* Remove Nukeops rule when no nukies

* Cleanup

* Change to toggle hotkey

* Cleanup

* Revert "Remove Nukeops rule when no nukies"

This reverts commit 5d4bbca09f45110b24a674d59b505be87b602b67.

* Cleanup

* Make the Toggle hotkey work in lobby

* Fix error

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
(cherry picked from commit 8febdc5fc4)
2024-05-03 00:19:00 +02:00
beck-thompson 2351ca213f Radio jammer update! (#25912)
* Added selectable power level to radio jammer

* Cleaned up OnGetVerb

* Settings are now stored in the .yml file. Simplified stuff a lot!

* Minor fixes!

* Small little baby fix :)

* Added the power level switch to the examine menu and also removed the ftl file as it was in the incorrect location.

* Minor code cleanup

* Changed byte -> int

* Update sprite

* Fixed licence

* Added power LED that changes if the jammer is on low power.

* Removed tabs

* Changed github link to the commit

* Changed all the RemComp to RemComDeferred

* Moved NetworkedComponent to shared

* Changed radio jammer textures back with minor edits

* Added a space because it was annoying me

* Jammer now updates range for suit sensors properly! Thanks nikthechampiongr :)

* Removed useless comment

* Cleaned up code that updates the range of tracking devices.

* Fixed client namespace and removed newline

* Cleaned up ChangeLEDState and ChangeChargeLevel.

* Added comments

* Read only

* Fixed another comment

* Locked in

* Made server inherit shared

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* review fixes

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit d3b1178428)
2024-05-03 00:10:47 +02:00
metalgearsloth efa7b57f3d Fix .ftl keys (#27289)
Required for https://github.com/space-wizards/RobustToolbox/pull/4885 to not kill content

(cherry picked from commit f6ac494ad3)
2024-05-03 00:05:50 +02:00
Pieter-Jan Briers a0bceb5c97 Various item status fixes/tweaks (#27267)
* Always display item status panel fully

Initial feedback from the UI changes seems to be that a lot of people go "why is there empty space" so let's fix that.

* Fix item status middle hand being on the wrong side

I think I switched this around when fixing the left/right being inverted in the UI code.

* Minor status panel UI tweaks

Bottom-align contents now that the panel itself doesn't dynamically expand, prevent weird gaps.

Clip contents for panel

* Fix clipping on implanters and network configurators.

Made them take less space. For implanters the name has to be cut off, which I did by adding a new ClipControl to achieve that in rich text.

* Update visibility of item status panels based on whether you have hands at all.

This avoids UI for borgs looking silly.

Added a new "HandUILocation" enum that doesn't have middle hands to avoid confusion in UI code.

* Use BulletRender for laser guns too.

Provides all the benefits like fixing layout overflow and allowing multi-line stuff. Looks great now.

This involved generalizing BulletRender a bit so it can be used for not-just-bullets.

* Fix geiger word wrapping if you're really fucked

(cherry picked from commit 7b90c08a2c)
2024-05-03 00:01:56 +02:00
Just-a-Unity-DevandKara 8086508273 General slime improvements (#23425)
* General slime improvements

* Finish morphing

* oops 2x2 not 3x3

* actually lets ball - 2x3 inventory

* Last two things on the todo list

* .\RobustToolbox\

* JUST COMPILE

* fix tests 2.0

* fix tests 3.0

* Do reviews

* minor change

* guideboob

* more

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>

(cherry picked from commit fd0ca42c58)
2024-05-02 23:57:52 +02:00
Terraspark4941andKara 90ddc61356 Engineering guidebook update (#26851)
* RTG page update

* old commits from #22272

* Small fixes over most pages

* TEG tweaks

* Fixed a thing in airlock security

* fixed an italics tag

* singularity page now includes tesla

* Added a burn chamber to TEG page

* Prettyprinted TEG page, fixed some more issues with details

* Moved ONE singular comma

* Change Singularity page heading to include tesla

* Singularity page pretty printing + fixes

* TIL its [italic] NOT [italics]

* RTG Prettyprinting

* Access Config Prettyprinting + Netconfig tweak

* Atmospherics prettyprinting

* Construction keybind fix

* Apply suggestions from code review

---------

Strategy: -Xtheirs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

(cherry picked from commit c5ab839b2c)
2024-05-02 23:54:53 +02:00
potato1234_x 9ad13b8200 Psicodine, Mannitol, Lipolicide and Happiness (#27134)
* reagents

* Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit e2b260d894)
2024-05-02 23:53:00 +02:00
deltanedasanddeltanedas fccee49fbb early merge projector rewrite/fixes (#1128)
* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-01 15:03:26 +00:00
Null 511685e7b6 Revert "Railgun" (#1155)
Revert "Railgun (#718)"

This reverts commit c0de272a13.
2024-04-29 19:55:00 +00:00
c0de272a13 Railgun (#718)
* test

please work

* cleanup

removing old assets causing issues

* addition to uplink

both traitors and nukeops can buy this absurdly powerful cannon

* Update railgun_ammo.yml

* laser variant

shrimple as adding a new variant with two firemodes, overkill, and overkiller

* laser railgun cleanup

fixing some trash

* adds the caninator

shoot cans and scare security

* admeme variant and removal of clown variant for now

* Slowdown in Hands

Slows you down when any variant is held as to make the weapon more balanced

* Laser railgun Sprite

adds a unique sprite for the laser variant of the railgun

* fix the sprite

i am dumb

* Issue Cleanup

Dusts off some of the code and makes some balance changes, along with better parenting.

* purchasable ammo and charge sound update

made the charge sound slightly less annoying and added ammo purchasable by both traitors and syndicate

* QA pass

various little fixes to improve the code and general cleanup

* error fixing

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* Sprite Update + Reverse Engineering

This adds reverse engineering, the new sprites, and a host of balance changes.
- The Railgun now does 80 stamina damage again on hit with normal bolts.

* reverse engineered fast firerate

as a reward for researching new technology, you've made it slightly faster. yay. also resprites the non-lethal variant to look more plunger-like

* Final Changes

ready for merge, sir!

* Copyright Update

Makes the sounds all under free use creative commons to avoid copyright issues.

* Update license.txt

* remove old attributions

this sound has been altered as to not use pixabay

* price increase

sorry danger but 14 tc is way too low lmao, nukies get it for 20 tc

* requested changes

hopefully

* conversion to mono

yipeeee

* fix of that other fix for the new file rename shit

pure agony

* proper noun

the Decimator is now a proper noun similar to other weapons

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/railgun.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>

* Update duffelbag.yml

* Update uplink_catalog.yml

* Update rod_impact.ogg

* Update uplink_catalog.yml

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-04-29 10:16:53 +00:00
beck-thompson ac641f74b1 Fixed grammar when drinking empty drink (#27218)
Fix

(cherry picked from commit 877ccd6e8f)
2024-04-21 23:46:37 +02:00
Hannah Giovanna DawsonandNemanja 4edf577b1b SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit f059714a75)
2024-04-21 23:46:34 +02:00
Pieter-Jan Briersandmetalgearsloth 176e9b0a81 THE RETURN OF ITEM STATUS (#22986)
* THE RETURN OF ITEM STATUS

Item status is now inline with the hands again. You can now see item status for both hands at once.

If you have more than 2 hands, the last active hand of that side is displayed in the respective item status.

The item status for the active hand is also highlighted.

Item status has been given a new look so it looks unique and matches every UI theme.

* Shrink item status to 125px

This is going to require fixing the existing controls. Do that later.

* New bullet item status rendering

sex

* Make gun item status look just a little bit nicer.

Avoid only one or two bullets ending up on a single row of an item status.

* Delete Eris theme files

* More improvements

Fixed the fact that left/right were flipped around when assigning status panel locations. Involved renaming all the UI textures.

Redid how content margins are set from the theme. Less complex and cleaner now.

Made the item name always left-aligned, just looks better since other UI elements don't adapt anyways.

* Compact down item status text

Now it fits 3 lines of text on one line. Yay.

This is achieved by compacting RichTextLabels by reducing their line height and giving them a negative bottom margin.

* Add item status sprites for Ashen theme.

* Add status control to show beaker/bucket/jug solution/transfer volumes

Also PollingItemStatusControl I'll be using that more.

* Fix welder item status, clean up welder code

The item status control implementation was ancient and bad. That's why it was buggy.

Removed all the complex dated networking stuff for welders, we just sync the solution contents now anyways so none of that is needed anymore. This moves a buncha stuff to shared and just removes code.

Cleanup. The code was doing some really dumb stuff.

* Spray bottles show contents in item status.

* cowtools

* Fix plasmafire and clockwork themes.

Actual git gaslighting wtf.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit 58f025ba80)
2024-04-21 23:41:08 +02:00
KittenColony 42a4d86bcb Two-Tone lizard snouts (#27143)
snouts

(cherry picked from commit b48d0ddefc)
2024-04-21 23:38:29 +02:00
Whisper 5b64262401 fix burning to ash not working on all mobs (#27158)
(cherry picked from commit c7bbaa48a4)
2024-04-21 23:34:47 +02:00
deathride58 13af11e3db Adds the option to fit the viewport to vertical screenspace (#27061)
* Adds the option to fit your viewport to your vertical screenspace

* fixes documentation

* Removes commented-out leftover

* Hides the viewport width slider and also we dont know if the viewport width causing stretching/squishing was a bug present before but we fixed that while we were at it

* Removes commented out leftovers

(cherry picked from commit 396c613366)
2024-04-21 23:32:41 +02:00
Gyrandolaandmetalgearsloth 38a4bee25e chili/chilly peppers sprite alignment fix & minor refactorization (#25971)
* png alignment and minor refactorization

* Update migration.yml

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit fa5b93871f)
2024-04-21 23:21:17 +02:00
dffdff2423 107fc0ff25 Disable Communication Console Announcement Button for Too Long Messages. (#27145)
Disable comms console announce for long messages

Disable the "announce" button on the communications console for messages
above the cap. I did not touch broadcasting because I could not identify
an easy way to check the maximum length for it.

(cherry picked from commit cff8083650)
2024-04-21 23:20:48 +02:00
Ed 0016a29544 Killer tomatoes (#26053)
* make tomatoes

* many friends! many mommies

* finish

* renaming system

* fix

* Update miscellaneous.yml

* Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* N

* deleete exception?

* merge conflict fix

* fix?

* fuck you

* sloth fixes

* fixess?

* fix

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit f3a97fc0c5)
2024-04-21 22:56:29 +02:00
Hannah Giovanna Dawson 0df68584e0 Chatfactor: Chat Repository, Admin Commands, Chat Created Events (#26113)
* Chatfactor: Chat Repository, Admin Commands, Chat Created Events

This addition-only PR covers a repository that stores chat messages.
This PR defines what chat messages can be stored, what can be done
with those stored messages, and what events occur when the repository
does things.

This PR also includes to admin commands that show how the repository
will be used for administration purposes at first. Because all chat
messages will be uniquely identified per round (and, as rounds are
uniquely identified, are essentially a GUID) we can delete, amend
or nuke messages.

Note there's no "amend" command right now. The original chatfactor PR
didn't include one, and I'm avoiding further feature bloat with these
chatfactor PRs...

* Remove an event that shouldn't be in this PR

* Resolve PR comments.

* Resolve peak goober moment

* Also make sure we tell the user why if their delete command fails

* Supply a reason if the nukeuserids command is malformed

* Tidy messages

* Some more docstring tidyup

* Imagine tests handling IOC correctly chat

* Imagine tests handling IOC correctly chat

* Resolve PR comments

* Fix goobering with needing to use ToolshedCommand

* In which we bikeshed toolshed

* loud metal pipe sound effect

* One must imagine funny boulder pushing man happy

* Move commands to new folder

* Mald, seethe, cope.

* I hate toolshed I hate toolshed I hate toolshed

* Fix command ftls

* Bit of tidy-up and a YAGNI removal of a get we don't need yet

* Whelp lmao

* UserIDs are in a weird fucky state I didn't anticipate, so I've removed the remove-by-userID command for the time being.

* Rename ChatRepository to ChatRepositorySystem.

* Resolve PR review comments

---------

Co-authored-by: Your Name <you@example.com>
(cherry picked from commit b1136c98d7)
2024-04-21 22:34:09 +02:00
Tayrtahn 794302839d Add ability to shake fizzy drinks so they spray in peoples' faces (#25574)
* Implemented Shakeable

* Prevent shaking open Openables

* Prevent shaking empty drinks. Moved part of DrinkSystem to Shared.

* DrinkSystem can have a little more prediction, as a treat

* Cleanup

* Overhauled PressurizedDrink

* Make soda cans/bottles and champagne shakeable. The drink shaker too, for fun.

* We do a little refactoring.
PressurizedDrink is now PressurizedSolution, and fizziness now only works on solutions containing a reagent marked as fizzy.

* Documentation, cleanup, and tweaks.

* Changed fizziness calculation to use a cubic-out easing curve.

* Removed broken YAML that has avoid the linter's wrath for far too long

* Changed reagent fizzy bool to fizziness float.
Solution fizzability now scales with reagent proportion.

* Rename file to match changed class name

* DoAfter improvements. Cancel if the user moves away; block if no hands.

* Match these filenames too

* And this one

* guh

* Updated to use Shared puddle methods

* Various fixes and improvements.

* Made AttemptShakeEvent a struct

* AttemptAddFizzinessEvent too

(cherry picked from commit cfa94be4c2)
2024-04-21 22:08:21 +02:00
icekot8 c2f49864fd cargo console radio messages on approving (#27038)
* 1

* void --> "Unknown"

(cherry picked from commit fd109d61b8)
2024-04-21 22:07:14 +02:00
deltanedas c597aec3a8 prop hunt ss14 (real) (#26691)
* texture appropriation

* add code for projector

* add chameleon projector yml

* damage and actions

* prevent small props being killed round removing you (700 damage from a single shot)

* tweak default

* oop

* do appearance properly, need engine update

* fix bugs, blacklist pda

* remove status icons

* amou

* sus

* fix test + make props fast

* amouuuung

* remove funny log

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 395c33024c)
2024-04-21 22:05:50 +02:00
slarticodefast a2e1dc8107 Show volume on the gas analyzer (#25720)
The gas analyzer now shows the volume of pipes, tanks, canisters and the environment.

Adjust gas analyzers so that the volume and number of moles shown corresponds to only the scanned element, e.g. a canister or single pipe in a pipenet.

(cherry picked from commit 5a5efa11cf)
2024-04-21 22:05:43 +02:00
metalgearslothandiNVERTED cc5d741a09 Added Jukebox (#26736)
* Added Jukebox, along with music for jukebox

* Fixed Jukebox meta.json copyright

* Removed songs I couldn't find a license for.

* Renamed files to solve check failures from spaces

* Added missing attributions.yml

* Fixed lack of description in Jukebox

* Jukebox is now constructable.

* Change Jukebox menu to FancyWindow

* Moved Jukebox messages out of jukebox component

* Removed Jukebox OnValueChanged.

* JukeboxComp now uses AutoGenerateComponentState

* Removed state code, since it's auto generated

* Fixed various Jukebox code to match conventions.

* Updated Standard.yml to match changed song list.

* fixes

* Jukebox workin

* Fix

* Polishing

* Finalising

* Revert

* bad

* jukey

* Reviews

* name

* Update submodule to 218.2.0

---------

Co-authored-by: iNVERTED <alextjorgensen@gmail.com>

(cherry picked from commit 2db374988c)
2024-04-21 22:04:54 +02:00
Whisper 1815b086f4 Mobs burn to ashes on excessive heat damage (#26971)
* mobs burn to ashes on excessive heat damage

* remove comment, remove random lines I didn't mean to add

* combine code into behavior

* clean unused

* fix namespace

* drop next to

* fix spawn entities behavior spawning entities outside container

(cherry picked from commit 4a6cf480cc)
2024-04-21 22:00:50 +02:00
Tayrtahn f8f0b39692 Fix cryostorage identifying unknown characters as captain (#26927)
Fixed cryostorage getting captain's record for unknown jobs.
Also localized Unknown job string.

(cherry picked from commit 9b97a2e05d)
2024-04-21 21:55:04 +02:00
Nemanja c651727215 uplink and store freshening (#26444)
* uplink and store freshening

* more

* im gonna POOOOOOGGGGGGG

* we love it

(cherry picked from commit 9d5a3992fa)
2024-04-21 21:54:07 +02:00
lunarcomets 39ba08e631 Cryogenic storage tweaks (#26813)
* make cryo remove crewmember's station record when going to cryo

* Revert "make cryo remove crewmember's station record when going to cryo"

This reverts commit 9ac9707289b5e553e3015c8c3ef88a78439977c6.

* make cryo remove crewmember from station records when the mind is removed from the body

* add stationwide announcement for people cryoing (remember to change pr title and desc)

* minor changes

* announcement actually shows job now

* requested changes

* get outta here derivative

(cherry picked from commit 9d62b3c3e6)
2024-04-21 21:52:16 +02:00
Killerqu00 e0333ee9de Skipping bounties (#26537)
* add button to menu

* networking and component work

* try to add access stuff

* main functionality done

* add access lock? I think?

* remove extra line

* fix access system

* move SkipTime to StationCargoBountyDatabaseComponent

* Disable/Enable skip button based on cooldown

* remove debugging

* add access denied sound

* remove DataField tags

* dynamic timer

(cherry picked from commit fd067731b5)
2024-04-21 21:47:43 +02:00
Pieter-Jan Briers 7c255a8788 Add new "grant_connect_bypass" admin command (#26771)
This command allows you to grant a player temporary privilege to join regardless of player cap, whitelist, etc. It does not bypass bans.

The API for this is IConnectionManager.AddTemporaryConnectBypass().

I shuffled around the logic inside ConnectionManager. Bans are now checked before panic bunker.

(cherry picked from commit d879665b52)
2024-04-21 21:47:30 +02:00
KittenColony 0326835b57 Gauze Markings 3 - Revenge of the Wrap (#25481)
* Insectoid Gauze, Added racial marks to variants

* removed excess r from gauze_moth_lowerleg_r

* Update gauze.ftl

* moved all markings to Overlay Category

* fixed localization error

* a

(cherry picked from commit a1fcfed7d9)
2024-04-21 21:45:42 +02:00
Crotalus c569162bb3 Fix lathe materials list bug (#26826)
Fix lathe material list bug

(cherry picked from commit a9df8cf18a)
2024-04-21 21:30:47 +02:00
chromiumboy 1c00c720f2 Bug fixes for RCD (#26792)
Various fixes

(cherry picked from commit f784e9ca4e)
2024-04-21 21:28:57 +02:00
Crotalus 9cd3e23dfd Show missing materials in lathes tooltip (#26795)
* Lathes: Show missing materials amount in tooltip

* Use AppendLine and remove the last newline at the end

(cherry picked from commit a178754980)
2024-04-21 21:28:54 +02:00
deepdarkdepths e1ede878cf Sanitizes "tbf" into "to be fair" (#26811)
add

(cherry picked from commit 5ecff8a04b)
2024-04-21 21:28:44 +02:00
UnicornOnLSD ffd1e968c8 remove duplicate "classic crewcut" (got upstreamed) (#1085)
remove duplicate "classic crewcut" as it was upstreamed
2024-04-18 12:33:40 -05:00
no d8b97e8d37 Randomized lollipop and gumball flavors (#1074)
* Give lollipops and gumballs random flavors

* RandomizedCandy: Fix borg lollipop action

* RandomizedCandy: Play sound when candy is fabricated

* RandomizedCandy: Lollipop can now be put in mouth

* RandomizedCandy: Quieten fab sound

* RandomizedCandy: merge icons and reexport without pHYs chunk

should speed up downloading these textures on 9600 baud modems

* RandomizedCandy: loads more flavors and update description

* RandomizedCandy: Fix duplicate candyFlavor IDs

* RandomizedCandy: Fix attrib and preserve flavor order

* RandomizedCandy: init on MapInit instead of ComponentInit

* RandomizedCandy: Fix minor code style issues, file placement

* RandomizedCandy: put new code into DeltaV namespace

* RandomizedCandy: Removed redundant datafield tags

Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>

---------

Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>
2024-04-14 16:48:59 +00:00
NullWanderer bd47164e95 Merge remote-tracking branch 'upstream/master' into 2024/04/07-merge-master
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Books/lore.yml
2024-04-07 18:14:38 +02:00
deltanedas 5a262ae2b3 move fishops manual to deltav 2024-04-07 15:14:42 +01:00
NullWanderer aff5fec56c Various fixes, I got lazy so its all one commit now 2024-04-07 15:13:36 +02:00
Alzore 9f8885dc48 Dionae now bleed sap, and this can be used to make syrup. (#25748)
* SapAndSyrup

* centrifug

* morewatervapor

* whyisitnotpushing

* nymphs

* lessrealmorefun

(cherry picked from commit 5523e016f4)
2024-04-07 14:35:55 +02:00
Aexxie b28c3a5da3 OOC Patron Color Toggle (#26653)
* Adds the option for you to toggle your OOC Patron color visibility to yourself and others.

* Makes the button magically disappear if you arent a patron

(cherry picked from commit 7ced9d42f0)
2024-04-07 14:33:45 +02:00
4c1720df4e Infinity books (#25840)
* setup text data

* roundstart reshuffling keywords with gibberish words

* saved data categorized

* add book with hints

* start redrawing books

* +4 book design

* +books +random visual upgrade

* finish first file

* finish lore file

* finish with books.rsi now authorbooks.rsi...

* aurora! and some fix

* nuke author books

* speelbuke update

* finish respriting work

* fix scientist guide visual

* setup datasets

* setup stupid funny random story

* restore author books, upgrade hint generation

* add variety to story generator

* add learning system

* minor textgen edit

* file restruct, hint count variation

* more restruct

* more renaming
add basis learning system logic. Spears locked for special book for test.

* nuke all systems, for splitting PR gods

* typo fix

* update migration with deleted books

* add random story books to maint

* Update construction-system.ftl

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* typo fix

* interchangeably

* final

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* "."

* Update Content.Server/Paper/PaperRandomStorySystem.cs

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* Ubazer fix

* inadequate

* localized

* Update meta.json

* fuck merge conflicts

* fix jani book

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
2024-04-07 14:30:40 +02:00