Commit Graph
7214 Commits
Author SHA1 Message Date
VelcroboyandVelcroboy 86883b4ad5 Map Edits: Submarine (#797)
Co-authored-by: Velcroboy <>
2024-02-08 19:21:16 +00:00
VelcroboyandVelcroboy d13687490e Replace NTES_Box with NTES_Delta (#794)
Co-authored-by: Velcroboy <>
2024-02-08 17:50:25 +00:00
Debug bde57bb886 Merge pull request #792 from DebugOk/Wizmerge-08/02
Merge wizden up to 08/02
2024-02-08 16:47:37 +01:00
VelcroboyandVelcroboy e42d139730 Re-Re-Add Lean (#760)
Co-authored-by: Velcroboy <>
2024-02-08 16:41:04 +01:00
Fluffiest Floofers bca1d1d56f Change Gladiator requirement to match Prisoner (#774)
similar requirement to prisoner
2024-02-08 16:39:51 +01:00
VelcroboyandVelcroboy e230e35bc6 Gives martial artist the same access and time reqs as boxer (#777)
Co-authored-by: Velcroboy <>
2024-02-08 16:39:24 +01:00
VelcroboyandVelcroboy 1abef985a5 Drop the mics (#791)
Co-authored-by: Velcroboy <>
2024-02-08 16:38:38 +01:00
Fluffiest Floofers 2ae246e02e PSB tag fix so Reptilian can eat it (#793)
Fruit tag
2024-02-08 16:38:11 +01:00
Debug a4fd13ae70 Fix current test fails 2024-02-08 13:05:23 +01:00
deltanedas c73f3837bd predict egg cracking + refactor (#25028)
* move stuff to server and some refactoring

* update spikables to not use triggering

* add Delete bool just incase

* a new egg

* mom can we have webedit. no, we have webedit at home

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 55dbe26019)
2024-02-08 12:41:42 +01:00
Kevin Zheng aac95649d1 Disable voting for Sandbox mode (#25027)
Sandbox mode should not be votable, because players can vote for it, and
then entity spam to quickly lag a server or run it out of memory.

(cherry picked from commit 8ccdbe7350)
2024-02-08 12:41:26 +01:00
Kevin Zheng 7cc7dbab0a Make radiation collector a power supplier (#24978)
(cherry picked from commit effcc5d827)
2024-02-08 12:39:59 +01:00
ada-please aebe8d2071 Added Monitor Computer Boards to Observation Kit (#24979)
* Added Monitor Computer Boards to Observation Kit

* Removed crew monitor board from bundle as requested by mainters

(cherry picked from commit c5027b51ec)
2024-02-08 12:39:57 +01:00
Rainfey ecf9634e0c Make Health Analysers UI continuously update (#22449)
(cherry picked from commit 4129c77a5b)
2024-02-08 12:39:55 +01:00
FungiFellow d49acecdc5 Borg Module QoL and Gas Analyzer Module Removal (#24702)
* Borg Module QoL Focused on Engi Modules

* Update borg_modules.yml

* Update borg_modules.yml

* Removed Gas Analyzer Module Recipe

* Update borg_modules.yml

* Removes Gas Analyzer Module from research

* Update borg_modules.yml

* Update lathe.yml

* Update handheld_crew_monitor.yml

* Update borg_modules.yml

* Exchanged Service Module Dropper with BorgDropper

* Made a Lingering Plasteel Stack

* Made Lingering Reinforced Glass Stack

* Added Reinforced Glass and Plasteel into Construction Module

* Change Borg Crew Monitor Charge use

* Update handheld_crew_monitor.yml

* Removed Borg Crew Monitor

* Removed Crew Monitor From Diagnosis Module

* ID change

* Update handheld_crew_monitor.yml

* Delete Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml

* Update borg_modules.yml

* Update metal.yml

* Update glass.yml

(cherry picked from commit ce77589155)
2024-02-08 12:39:31 +01:00
SlamBamActionman f87117fdeb Minor addition to Cybersun pen description (#24704)
Minor change to cybersun pen description

(cherry picked from commit d47865cb2d)
2024-02-08 12:39:04 +01:00
Emisse 1fb94bdec1 Special pens embed again (#24849)
* embeddable pen

* exploding pen

* lol

(cherry picked from commit 43b9233e09)
2024-02-08 12:39:02 +01:00
themias 343d00052e Restore Outlaw Glasses full identity blocking coverage (#24971)
(cherry picked from commit 66e162c1a2)
2024-02-08 12:39:00 +01:00
Tayrtahn 378e29e1af Adjust drink reagent colors (#24968)
(cherry picked from commit a1fa82fdb4)
2024-02-08 12:37:59 +01:00
deltanedas 965e1cae57 criminal records revival (#22510)
(cherry picked from commit 683591ab04)
2024-02-08 12:37:29 +01:00
Scribbles0 a60a0a3c8e Auto Attack for Holoparasites (#24944)
autoAttack field

(cherry picked from commit 8ae63ccc03)
2024-02-08 12:36:42 +01:00
deltanedas ac1f8436c4 grille is flimsy (#24881)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 66d7e60cdc)
2024-02-08 12:36:27 +01:00
Tayrtahn 83c1438b40 Add open/closed/fill states and sprites (#24600)
This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah.

As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately.

(cherry picked from commit 41cf3e5599)
2024-02-08 12:36:25 +01:00
Velcroboy c4a57075f0 Adds navmap beacon for escape pods (#24938)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit aa86b93add)
2024-02-08 12:36:23 +01:00
themias fe0e533769 Add face bandanas (#24597)
* add face bandanas

* oops

* make face bandanas butcherable, also one bite

* oops

* Add mouth IdentityBlocker to bandanas

* refactor to use foldablecomponent

* remove some leftover bits

* remove HamsterWearable until face sprite updated

* oops

* review changes

* remove a few unneeded bits

(cherry picked from commit b503fe5864)
2024-02-08 12:36:09 +01:00
deltanedasanddeltanedas 6a9259db2e nuke biochem research discipline (#24871)
* make chem machine boards roundstart

* nuke biochem

* kill

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 24af66a544)
2024-02-08 12:34:15 +01:00
Nemanja 3c4421c107 chat color change (#24922)
(cherry picked from commit 2d48ec52ab)
2024-02-08 12:32:27 +01:00
deltanedas 508568a6bb Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 604748534e)
2024-02-08 12:32:24 +01:00
shamp 1b913a2b7d Fixed incorrect path to the uranium spear image in the construction menu (#24895)
Update weapons.yml

Fixed incorrect path to the uranium spear image in the construction menu

(cherry picked from commit 8af1bea937)
2024-02-08 12:32:22 +01:00
lzk aded2ef145 Remove soapy water (#24301)
* localize shuttle timer eta etd

* remove soapy water for real

(cherry picked from commit c4e7f1ebe8)
2024-02-08 12:31:59 +01:00
Adrian16199 51707741b8 Make scarfs craftable (#24735)
* Make scarfs craftable

Also sorted the lathe a bit because I like it when it looks nice.

* reverts sorting

(cherry picked from commit bff50de746)
2024-02-08 12:31:25 +01:00
lapatison 5c149505cd Space-Up flavor quick-fix (#24863)
Fix spaceup flavor

(cherry picked from commit e7ee364af3)
2024-02-08 12:31:23 +01:00
IProduceWidgets 160ec32471 freezer prevents nuclear annihilation (#24884)
(cherry picked from commit ca5db8a8d4)
2024-02-08 12:31:21 +01:00
Tayrtahn 3de3e13bb3 Add Stonk Pockets (#24876)
* Added stonk pockets

* Give me a little credit

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 765ea789cc)
2024-02-08 12:30:17 +01:00
metalgearsloth 00586dd79f Add puller sanity test (#24885)
* Add puller sanity test

* weh

* NRTs

(cherry picked from commit 641fb665b7)
2024-02-08 12:28:50 +01:00
metalgearsloth ed2d91526e Remove puller from simplemob (#22957)
Not every mob needs to be able to pull, no, if you want it implement it manually.

(cherry picked from commit 2191c7558a)
2024-02-08 12:27:25 +01:00
Anzarot121 7678ac3d75 Fix mob pull issue (#22485)
* fix issue

* fix fix

* add space

* really fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 30bd3d1da0)
2024-02-08 12:27:16 +01:00
Arendian c68e6eac1a Fix slipping through fences (#24850)
* Can't slide under fences anymore

* Small mobs can't pass instead

(cherry picked from commit 214961f46e)
2024-02-08 12:26:23 +01:00
Hanz d47df4cceb Booze/Soda Dispenser label fix (#24848)
This is literally it

Ayup

(cherry picked from commit 82434e7959)
2024-02-08 12:26:22 +01:00
Vasilis 1f3659ab14 Nerf the fridge explosion resistance (#24844)
Nerf

(cherry picked from commit 20ecbc252c)
2024-02-08 12:26:20 +01:00
themias 7113ea3a13 Add Diona salute sound (#24836)
(cherry picked from commit f25093e85e)
2024-02-08 12:25:38 +01:00
deltanedas 0b0de4eb50 spray painter rework (#23287)
* refactor and add Department to PaintableAirlock, move it to server dir since its in namespace

* add departments to doors, cleanup

* add style -> departments mapping

* AirlockDepartmentsPrototype

* update shared spray stuff to have department

* name file the same as the class name

* department optional

* refactor spray painter system + send department

* fixy

* client

* no need to rewrite ActivateableUi

* pro ops

* the reckoning

* hiss

* .

* :trollface:

* add standard atmos colors to palette

* Update Content.Shared/SprayPainter/SharedSprayPainterSystem.cs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c49c78bafa)
2024-02-08 12:25:35 +01:00
SlamBamActionman 4ca11a55e5 Remove gondola donkpocket & change berry box description (#24655)
* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly

(cherry picked from commit e36844de47)
2024-02-08 12:25:20 +01:00
themias 90824ea0cf Fix dylovene OD damage (#24826)
fix dylovene OD damage

(cherry picked from commit eed7ca1ddc)
2024-02-08 12:24:28 +01:00
Blazeror 92dfc1dd7e Adds ExaminableSolutionComponent to spray bottles (#24838)
Added missing component to base spray bottle

(cherry picked from commit 66b37b45f4)
2024-02-08 12:24:26 +01:00
metalgearsloth 757c5c992e Remove bad tag (#24820)
(cherry picked from commit 0375cd866f)
2024-02-08 12:23:26 +01:00
Magnus Larsen e0a3cfacea Fix clientside storage Whitelists (#24063)
* Fix outdated component name in assaultbelt whitelist

RangedMagazine was replaced with BallisticAmmoProvider in the Gun
refactor (#8301)

* Move FlashOnTrigger, SmokeOnTrigger, Flash components to Shared

* Move LightReplacerComponent to Shared

* Move Utensil, Mousetrap components to Shared

* Move SprayPainterComponent to Shared

The PaintableAirlock tag has also been removed, as it was unused &
unnecessary, likely a vestige of spray painter development when the
PaintableAirlock component wasn't in Content.Shared.

* Add trivial Produce and Seed components to Client

This allows the plant bag and botanical belt whitelists to correctly
match produce and seeds on the client, fixing the extraneous "Can't
insert" message that previously appeared.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 9cd6e4dccd)
2024-02-08 12:22:58 +01:00
Aexxie 16d77d483e Move grenade components to shared (#22691)
* Moves FlashComponent.cs, FlashOnTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Moves ExplodeOnTriggerComponent.cs, OnUseTimerTriggerComponent.cs, ActiveTimerTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Delete .run/Content Server+Client.run.xml

HOW DID THIS GET IN HERE ITS NOT AHHHH

* Update Content.Client/Explosion/SmokeOnTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update ExplodeOnTriggerComponent.cs

* Revert "Delete .run/Content Server+Client.run.xml"

This reverts commit 29ee05f57de60eab5c92158d8eba5e3acba483c2.

* Fix?

* cannot figure out how to get this to go back please forgive

* Fixes a network issue

* leftovers

* Fixes

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 467e983ba9)
2024-02-08 12:22:56 +01:00
lunarcomets a08f6f4888 add lizard speech bubble (#23365)
* add bubble sprites and yaml changes

* fixed issues

* lizardified names

* more fixes, got rid of error

* add indicator to kobolds

* updated sprites (removed notch, brightened colours)

(cherry picked from commit 4520ac8c9b)
2024-02-08 12:22:55 +01:00
nikthechampiongr 639d3af97a Rev Components are no longer leaked + Rev and Zombie icon visibility to ghosts is now controlled by a cvar (#22194)
* Initial work on having the Rev icons not be visible to ghosts depending on a Cvar and a component.

This commit just makes it so that the revcomponent and headrev component
are not shared with clients that shouldn't know about them. This is due
to the concern that clients having access to those components, even if
no image was displayed could allow modified clients to have meta
knowledge of revs.

Currently this has the issue that if a player later
for example becomes a rev, none of the existing rev components get
networked to them. I am not sure there is currently an effecient
solution to this.

This is probably in an issue for a lot more stuff. I might just make it
so all the logic just moves to the client on whether to put the icon
again.

Also this commit adds the ShowRevIconsComponent to allow anyone with it to just
view rev icons.

* Rev components now get communicated to clients that didn't have them previously and the AntagIconSystem is now properly checking whether to give the icons.

We now dirty all the rev/headrev components when someone gets converted
or gets the ViewRevIcons component. The AntagIconSystem now checks
whether it should draw the icons mostly based on an event, this is still done
client side.

This is not a full proof solution to make it so clients can't know
someone is an antag when they shouldn't because:
1. There are other components that need similar treatment, to my
   knowledge not to for revs but for other antags. Maybe even the mind
   component. This could be addressed in future PRs.
2. We cannot ensure that clients forget about these components if the
   client gets deconverted for example. We can of course have code that
   does this, but it will necessarily need to be done on the client and
   if the client is modified then there is no way to ensure this.
   Of course at that point they should already know who their fellow
   revs are so this might not be an issue.

I now need to do the same thing for zombies in a future commit.
A similar system for nukies also needs to be looked at but I will not be
doing that in the PR this commit ends up in.

* Misc name changes and cleaning up the ZombieSystem

Changed some names around and decoupled the ZombieSystem from the
AntagStatusIconsystem. Now there is a cvar for ghost visibility for them
as well. The Zombie Component was not made SessionSpecific because:
1. Zombies are pretty visible anyways
2. The Component is needed to change the appearance of zombie players.

* Misc name changes and cleaning up the ZombieSystem

Changed some names around and decoupled the ZombieSystem from the
AntagStatusIconsystem. Now there is a cvar for ghost visibility for them
as well. The Zombie Component was not made SessionSpecific because:
1. Zombies are pretty visible anyways
2. The Component is needed to change the appearance of zombie players.

* Merged 2 if statements into 1 on the Zombiesystem.

* Cut down on code duplication in AntagStatusIconSystem

Now instead of having a seperate function for each component, there is 1 generic function. Functions for special cases
like the Rev/Headrev comp can have a separate function that does the special check and then calls the generic one.
This is done through the IAntagStatusIconComponent interface which provides a common interface to get the Icon.

* Removed some duplication from the SharedRevolutionarySystem with generics.

I have no idea why I didn't think of this sooner.

* Addressed Reviews I think

I think events get unsubbed automatically but I am probably missing something that I have not understood.
Either way this is a requested change.

* Replace war crimes with actual fixes for reviews

It was not clear to me what the reviews meant

* Addressed reviews by removing need for cvars.

Whether icons are visible to ghosts is now determined by a bool in IAntagStatusIcon which all antag components
with status icons should implement.

* Update Content.Shared/Revolutionary/SharedRevolutionarySystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 8b19b7fab9)
2024-02-08 12:22:54 +01:00