Commit Graph

36638 Commits

Author SHA1 Message Date
DeltaV-Bot 67cee092b2 Automatic Changelog Update (#497) 2023-12-06 15:57:17 +00:00
Tryded afe2bcdfd9
Fixes for More Energy Guns (#497)
* Fixes

* revert fixes

* Update Resources/Prototypes/Entities/Structures/Machines/lathe.yml

Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Signed-off-by: Tryded <139474617+Tryded@users.noreply.github.com>

---------

Signed-off-by: Tryded <139474617+Tryded@users.noreply.github.com>
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
2023-12-06 16:57:01 +01:00
Adrian16199 9bdd56244e
Allow breaching hammer to breach in like JoL. (#505) 2023-12-06 16:56:16 +01:00
Bakke 25d775c9c6
Disable cognizine ghost roles for humanoids. (#507) 2023-12-06 16:55:05 +01:00
DeltaV-Bot cb3fa2490e Automatic Changelog Update (#511) 2023-12-06 15:54:53 +00:00
Bakke 003f262562
Bring back the prisoner role (#511)
* Revert "Removes Prisoner selection from maps (#262)"

This reverts commit d73f485fa2.

* Fix alwaysUseSpawner, add DesiredSpawnPointType

Prisoners are now forced to spawn in the prison again.

* Updated map prototypes for prisoner

Yaaay, we love confinement!

* Update asterisk.yml

Add a drain to the cell area :trollface:

---------

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-12-06 16:54:36 +01:00
Bakke a29c36d9bc
Prevent shooting while inside a duffelbag (#510)
Anyone shoved into a duffelbag gets an ItemComponent. This denies anyone
with an ItemComponent from shooting a gun.
2023-12-06 16:54:05 +01:00
DeltaV-Bot ba20b1301f Automatic Changelog Update (#517) 2023-12-06 08:16:32 +00:00
Fluffiest Floofers f9df410cff
Vulpkanin mask and helmet custom sprites (#517)
* First batch buuuuuuuuuuh

So much stuff to redo

* gasmasks

* other important masks

* the rest of the one from that PR

* ert

* the smokeables

* changed smokeables sprite position

ye they looked goofy

* Remove paramed one

Doesn't fit anymore

* remove duplicate inventory comp

---------

Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
2023-12-06 09:16:14 +01:00
Velcroboy 2335418077
Port spider parts from Nyano (#521)
* Port spider parts from Nyano

* Remove migration for spider parts

* Dynamic Price No More

---------

Co-authored-by: Jeff <>
2023-12-05 16:34:01 -06:00
Bakke 5860faf8b6
Add some missing reagent descriptions (#518) 2023-12-05 13:25:40 -06:00
DeltaV-Bot 72cf0842ba Automatic Changelog Update (#519) 2023-12-05 19:16:35 +00:00
Velcroboy ddf57dec31
Map Edits (#519)
Co-authored-by: Jeff <>
2023-12-05 13:16:17 -06:00
Rondalph Diggs 3c17bd0fb3
Update cargo_armory.yml (#523)
Categorize mini energy gun crates as 'Armory' on the market.

Signed-off-by: Rondalph Diggs <107864742+africalimedrop@users.noreply.github.com>
2023-12-05 13:15:43 -06:00
Bakke 873d06ab85
Make salvage corpses unrevivable (#506) 2023-12-03 13:47:38 +01:00
Debug e829b13651
Update SharedMaterialReclaimerSystem.cs (#503)
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2023-12-03 00:58:58 +00:00
DeltaV-Bot eb2eb7c545 Automatic Changelog Update (#486) 2023-12-03 00:48:56 +00:00
Debug 85c3603f0e
Update subdermal_implants.yml (#486) 2023-12-03 01:48:40 +01:00
Debug 14c7ba41c7
Merge pull request #501 from DebugOk/Wizmerge-2/12-part-2
Merge wizden up to 02/12 - Part 2
2023-12-02 22:59:00 +01:00
Debug ebfd7f4af4
Merge pull request #500 from DebugOk/Wizmerge-2/12
Merge wizden up to 02/12 - Part one
2023-12-02 21:04:56 +01:00
Tomás Alves fb0fcc4bd0 Fixes Electrocuting grabbed targets while insulated (#22087) 2023-12-02 21:04:07 +01:00
Debug 2741a3de9d Update drinks-cartons.yml 2023-12-02 21:03:42 +01:00
coolmankid12345 5a2942690c Ghetto Mindshield Icon (#20958)
* Looks like shit frfr

* White for sure

* New icon

---------

Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
2023-12-02 20:35:40 +01:00
PJBot 52c87a6639 Automatic changelog update 2023-12-02 20:35:40 +01:00
zero dacd620ca7 Add sounds when inserting/missing into a disposal (#22077) 2023-12-02 20:35:40 +01:00
PJBot 7a2d48b410 Automatic changelog update 2023-12-02 20:35:40 +01:00
Minty642 1ab939cf32 Add New Reaction : Oil (#21737) 2023-12-02 20:35:40 +01:00
PJBot 8852a19428 Automatic changelog update 2023-12-02 20:35:40 +01:00
Cohnway 671059fafe updated Remilia sprite/copyright (#21846) 2023-12-02 20:35:40 +01:00
qwerltaz afb1aab45b fix anom scanner interact check (#21929)
* fix anom scanner doafter check

* no break on move, damage
2023-12-02 20:35:40 +01:00
GNF54 bced72b475 added Dark Green Jumpsuits and Jumpskirts to the Clothesmate (#21713)
added Dark Green Jumpsuits and Jumpskirts to the Clothesmate. It's a weird inconsistency to have blue be the only jumpsuit in the dispenser with an alternate color.
2023-12-02 20:35:39 +01:00
PJBot 399feb1ff3 Automatic changelog update 2023-12-02 20:35:39 +01:00
Doru991 51fff78b6b Botany balancing fixes and QoL ('No romerol ambrosia' edition) (#21756)
* Chem 1984 phase 1

* Chem 1984 phase 2

* Notification on species mutation

* Plant yml balancing

* Better localization

* First version of reagent list

* Revert "Better localization"
nvm
This reverts commit bab87cb1bd58523164d306dccaefc1ac5c6b64ad.

* cooler reagents and no more popups

* :trollface:

* I’m blind
2023-12-02 20:35:39 +01:00
Chronophylos 1f1a722a58 Refactor NPCRetaliationSystem::Update to fix crash caused by Debug Assertion (#21785)
* refactor names for clarity

* remove check adding entity to deaggro queue twice

* merge loops

* remove unused queue

* add back check for terminating or deleted entities

* trigger workflow
2023-12-02 20:35:39 +01:00
PJBot 399d416e38 Automatic changelog update 2023-12-02 20:35:39 +01:00
Moomoobeef 1dfeb053a3 added new chemical called Sodium Polyacrylate (#21833)
* added Sodium Polyacrylate chemical/recipe

* added new lines to appease the linter

* Update Resources/Prototypes/Reagents/chemicals.yml

Co-authored-by: Vasilis <vascreeper@yahoo.com>

---------

Co-authored-by: Vasilis <vascreeper@yahoo.com>
2023-12-02 20:35:39 +01:00
Nairod 2202782f58 Research Server Texture (#22092) 2023-12-02 20:35:39 +01:00
PJBot c9e865531b Automatic changelog update 2023-12-02 20:35:39 +01:00
DrSmugleaf f79746e016 Fix RoundToLevels not working with an even amount of levels if the threshold is the same (#21863) 2023-12-02 20:35:39 +01:00
EEASAS 6a3f9e8394 Nerf mothroaches slightly + make them not able to pull (#21864)
* Update animals.yml

* mald

mald
2023-12-02 20:35:38 +01:00
PJBot 20b53a9440 Automatic changelog update 2023-12-02 20:35:38 +01:00
metalgearsloth cdaa2bbea7 Update submodule to 187.0.0 (#22080) 2023-12-02 20:35:38 +01:00
PJBot 125cfa320f Automatic changelog update 2023-12-02 20:35:38 +01:00
Skye dc4ec07ac1 Borgs can now speak while in Crit (#21802)
* Borgs can speak while crit, also radio bug fix

* Revert "Borgs can speak while crit, also radio bug fix"

This reverts commit e1136ad781229cf5fc3cadcf70742168fc73d961.

* Borgs can speak in crit + radio bug fix

* Tied to a new generic component on SpeechComponent

* Ignoring Speech Block via Component uses an event!

* Remove debug logs and bypass if already true
2023-12-02 20:35:38 +01:00
metalgearsloth 5df59eb857 Remove the awful audio command (#22071) 2023-12-02 20:35:38 +01:00
PJBot 0b285a7a45 Automatic changelog update 2023-12-02 20:35:38 +01:00
Vasilis 991c92b774 Lizards can now have taco tuesdays (#21957)
* TACO TUESDAYS

* Satisfy github with a line ending
2023-12-02 20:35:38 +01:00
chromiumboy 91b8c4c05c Reduced the fuel decay rate of rad collectors (#22063) 2023-12-02 20:35:38 +01:00
crazybrain23 63c103145c Gri​nch's ultimatum (#22067)
Alright buddy, you have two options here. You can be a saint, or you can be a Grinch. Those are your two choices. Choose wisely. So what's it gonna be, huh, huh? A saint (sainte) or a Grinch (grunch)?
2023-12-02 20:35:38 +01:00
PJBot e6da6e9e05 Automatic changelog update 2023-12-02 20:35:37 +01:00