Commit Graph

36638 Commits

Author SHA1 Message Date
CheddaCheez ce7c4b1425 Add missing nacho recipes (#33637)
* Nacho recipes, nutrition, and trash

In meal_recipes.yml: Add recipes for Nachos, Cheesy Nachos, and Cuban Nachos.

In meals.yml: Add a solutions container to regular nachos so it lines up with the others, and add a small plate as trash to each one.

* Volumes, nutritional tweaks, and flavor

In meals.yml: Lowered maxVol on nachos to leave 5 units of space. Nachos nutriment and vitamin lowered for costing so little. A cheese wedge is 3.75 nutriment, so cheesy having 4 more total nutritional value lines up nicely to me.

Cuban nachos had too little volume to fit its reagents in the first place, so increased maxVol by 10. Chili peppers are 4 nutri / 4 vitamin and ketchup has a touch of tomato, so bumped to 8 and 5. Capsaicin lowered partly to make it an even 20u. Ketchup dilutes I guess. Also they don't have cheese so I changed the flavor profile to tomato instead.

In meal_recipes.yml: Cuban Nachos recipe tweaked to require one less pepper. Given above numbers, this fits the nutritional value imo.
2024-12-07 22:00:50 +00:00
Luiz Costa 6dac60294c Juiceable slimeballs (#33660)
adds extractable component to slimeball prototype
2024-12-07 22:00:50 +00:00
Velcroboy e42adddbf3 Adds a morgue locked maints airlock (#33693)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-12-07 22:00:50 +00:00
SpaceRox1244 f5dc4b5899 Makes kukri not use combat knife's storage sprite (#33661) 2024-12-07 22:00:50 +00:00
PJBot 1a300a106f Automatic changelog update 2024-12-07 22:00:40 +00:00
SpaceManiac d5e53e97d3 Fix lobby countdown not showing hours (#33685) 2024-12-07 22:00:07 +00:00
PJBot 3ac38a43f3 Automatic changelog update 2024-12-07 22:00:05 +00:00
JIPDawg 9f871d320a Fixed ghost role rules for some syndicate familiars (#32457)
* fix ghost role rules for some syndicate familiars

* change from monkey rules to Team Antag rules.

* Resolve reviews + Fix rules for LoneOp and Xenos

* ghostrole rules

---------

Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2024-12-07 21:59:39 +00:00
PJBot 6c94e2a2a4 Automatic changelog update 2024-12-07 21:55:33 +00:00
MilenVolf 6e0284636c Fix BuckleSystem always marking InteractHandEvent as Handled (#33602)
* Add check before marking event as handled

* Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-07 21:55:33 +00:00
MilenVolf c05a974132 Fix wrong system usage (#33679)
Fix wrong system using
2024-12-07 21:55:33 +00:00
PJBot 00d2e3238d Automatic changelog update 2024-12-07 21:55:25 +00:00
MilenVolf 9b4b264012 Replace obsolete GetTilesIntersecting methods (#32455)
* Remove usage of obsolete GetTilesIntersecting round 1

* Oop wrong uids

* Remove usage of obsolete GetLocalTilesIntersecting round 2

* Remove usage of obsolete GetLocalTilesIntersecting final round

* weh

* Fix using `SharedMapSystem` in `StencilOverlay`
2024-12-07 21:55:22 +00:00
Nikolai Korolev 511a3ac7d0 Fix formatting IDE0055 warnings in VS Code (#33669) 2024-12-07 21:55:15 +00:00
deltanedas 42c4bb0d1e this isnt needed anymore 2024-12-07 21:55:00 +00:00
PJBot 98f183b74f Automatic changelog update 2024-12-07 21:54:42 +00:00
Token 0cd0206c70 Fix makeghostroleraffle command where 4 arguments (#31836)
Fix makeghostroleraffle command with 4 arguments
2024-12-07 21:54:42 +00:00
PJBot be0fece54a Automatic changelog update 2024-12-07 21:54:42 +00:00
Preston Smith 5f07969825 Require Wield To Activate Double-bladed ESword (#32869)
* Add MeleeRequiresWield component

* Prevent world activation
2024-12-07 21:54:42 +00:00
PJBot b699ea2bd2 Automatic changelog update 2024-12-07 21:54:42 +00:00
Winkarst 4471e1783a Fix borgs not getting names on roundstart (#33578)
* Fix borgs not getting names on roundstart

* Glory to the NT

* Allow riggable to take in multiple reagents

* Revert

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
2024-12-07 21:54:42 +00:00
PJBot 84ea983545 Automatic changelog update 2024-12-07 21:54:35 +00:00
Plykiya f8d7995780 Fix for inspecting entities in the stripping window (#33644)
Handle it
2024-12-07 21:54:26 +00:00
PJBot 72258362a4 Automatic changelog update 2024-12-07 21:54:26 +00:00
Plykiya a8e0295656 Fix for inspecting entities in hand (#33642)
Actually inspect entity in hands
2024-12-07 21:54:25 +00:00
PJBot efa2c69995 Automatic changelog update 2024-12-07 21:54:25 +00:00
Plykiya 4299bcfafc Fix for handcuffing someone more than once (#33646)
* Fix for over-cuffing someone

* comment
2024-12-07 21:54:13 +00:00
PJBot 32981ded71 Automatic changelog update 2024-12-07 21:54:05 +00:00
lunarcomets d1b427bec3 fix PermanentBlindnessComponent to be not so permanent (#33292)
* adjust min blindness back to 0 when PermanentBlindnessComponent is removed

* mapinit changes

* remove OnRemove, move changes to OnShutdown

* goodbye event

* dependency removal

* final adjustment

---------

Co-authored-by: lunarcomets <luanrcomets2@gmail,com>
2024-12-07 21:53:59 +00:00
PJBot 99a5b982ef Automatic changelog update 2024-12-07 21:53:59 +00:00
VideoKompany da047e571f add locale to Shuttle Console Map tab (#33651)
fixed
2024-12-07 21:53:59 +00:00
PJBot bb7b22f5ff Automatic changelog update 2024-12-07 21:53:59 +00:00
Gansu eb45cadd29 Fix for arrivals deleting nuke (#33659)
Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing
Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked

Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>
2024-12-07 21:53:58 +00:00
MilenVolf b3456640af Cleanup some Client atmos systems (#33634)
* Cleanup `ScrubberControl.xaml.cs`

* Minor cleanups

* Another pile of minor cleanups

* Apply requested changes

* Rename "which" into "bound". Add whitespace after "if"
2024-12-07 21:53:06 +00:00
PJBot 2e7c385f97 Automatic changelog update 2024-12-07 21:53:06 +00:00
MossyGreySlope 024b8710dd Rename nitrogen internals crate (#33545)
* rename nitrogen internals crate

* nitrogen internals crate description

* migrate CrateNitrogenInternals ID
2024-12-07 21:52:54 +00:00
PJBot ead46761de Automatic changelog update 2024-12-07 21:52:53 +00:00
DrSmugleaf 863b9650d2 Add admin log for ghost warping (#33636) 2024-12-07 21:52:42 +00:00
PJBot e217653281 Automatic changelog update 2024-12-07 21:52:32 +00:00
Alice "Arimah" Heurlin 7f5188fbb7 Display GPS coordinates on their own line (#33625) 2024-12-07 21:52:32 +00:00
Alpha-Two df0cc19f5e Fix gender, maybe (#33631)
Co-authored-by: Alpha-Two <alpha2.5232@gmail.com>
2024-12-07 21:52:23 +00:00
Nikolai Korolev cbd3f4d6c1 Update `Content.PatreonParser` to use `net8.0` `TargetFramework` (#33559)
Update Content.PatreonParse to use net8.0 targetframework
2024-12-07 21:52:08 +00:00
PJBot 894101e98f Automatic changelog update 2024-12-07 21:52:08 +00:00
beck-thompson df595e10c3 Light verb is now predicted (#33622)
Fix
2024-12-07 21:52:08 +00:00
SpaceRox1244 ce9a535b43 Makes knives fly straight when thrown (#33615)
Gives knives a thrown angle
2024-12-07 21:52:08 +00:00
SpaceManiac 08e1a152d0 Fix swapped uniform printer east/west sprites (#33442)
Fix uniform printer sprites rotating the wrong way
2024-12-07 21:52:08 +00:00
Mifia 7560ae6d92 Fix gauze eyepatch flying pixel (#33564)
boo
2024-12-07 21:52:08 +00:00
AlexUm a1061372fe Fix version for electril_grill meta.json (#33611)
fix

fixing the version thing in meta json for electril grill textures

Co-authored-by: Arthur Kustenko <arthur.kustenko@learnet.se>
2024-12-07 21:52:08 +00:00
ScarKy0 581a51e989 Added Oppenhopper poster to the game. (#33588)
* o7

* -

* oppenhopper v2

* Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

* Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-07 21:51:53 +00:00
Flareguy 8980440782 Removes burnt tiles (#33422)
remove burnt tiles
2024-12-07 21:50:38 +00:00