Upstream sync (#846)

* Additional Ionstorm Law Updates (#34197)

* Added a couple entires, removed the references to IRL countries, and fixed a grammar mistake on "Telecomunications Equipment"

* Fixed another awkward grammar situation

* Commented out a bunch of law elements I felt weren't good for discussion, added some new ones to help fill in the missing areas

* Reverted pylons, and added more entries to help fill out the lists more

* reverted all deletions

* implemented feedback, also realized the IonStormActions section was rather short, so I added a bunch there

* realized I didn't remove the extra resources line, also added more things, and fixed one grammatical error

* Removed Portugal again, added more Musts since that list was the new shortest one.

* Automatic changelog update

* Add option to disable bwoink sound. (#33782)

* Add option to disable bwoink sound.

* Now it's working only with active admin status.

* No bwoink, only "notification sound"

* Moar changes

* Another one

* Automatic changelog update

* Pride Scarves  (#34448)

* More scarfs (#216)

* Sprites + Colored Scarf Implimentation

Doesn't include into quickthreads or other clothing vendors

* File Paths are important

* Metas, items exist, winterdrobe

I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk

* File Path Fix

* Typo fix

* Resolved merge conflict

* Moved scarves around

* Moved scarf textures out of the _CD directory

* Removed final CD folder

* Removed extra scarfs

* Removed extra scarfs, again

* Replaced ClothingNeckBase with ClothingScarfBase

---------

Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com>
Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com>

* Automatic changelog update

* Replace the djstation intercoms with freelance intercoms (#34478)

* Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys

* removed a new line

* Update nix flake for .NET 9 (#34480)

* Automatic changelog update

* Holopad networking rework (#34112)

* Initial commit

* Finalizing main changes

* Addressed reviews

* Fixed a few issues

* Switched to using global overrides

* Removed unnecessary references

* Make GasMixture enumerable

I noticed that enumerating gases is frequently done in an annoying way with Enum.GetValues. So I made it better. Now GasMixture is IEnumerable<(Gas gas, float moles)> and it just works.

* Improve canister admin logs.

1. Now clearly says "opened"/"closed" when changing the release valve.
2. Clearly says whether the valve was opened while a canister was inserted or not.
3. When a tank is ejected, logs if the valve is open and the ejection started spilling into the environment.

Fixes #34488

* Optimize & clean up RadiationSystem (#34459)

* Optimize & clean up RadiationSystem

* comments

* Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update engine to v240.0.1 (#34497)

* Various Locale Typo Fixes (and spaces) (#34483)

Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that)

* Space lizard plushie can now be worn on your head (#33809)

* space weh can now be work on top of head

* space weh can now be worn on top of head

* trim out unnecessary comps

* Automatic changelog update

* Adds bullet collision to wall mounted cameras (#34500)

* Automatic changelog update

* Change MaskComponent to accommodate sprites namings (#33451)

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Automatic changelog update

* Add a 10u vial of plasma to the chemical locker (#33871)

Add 10u plasma to the chemistry locker so the chemists stop stealing tables.

* Automatic changelog update

* Rarer Highcaps (#34469)

* Removed highcap from seclite

* Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to.

* Gave cyborgs back their medcap

* Rounded seclite wattage down to 0.5

* Automatic changelog update

* New dry fire sound (#34447)

* new empty.ogg

* source to tg commit

* Automatic changelog update

* CentComm Map Updates (#34475)

* Bandage fix denied animations playing on devices without them

* CentComm blast door prototype

* CentComm button

* CentComm window shutters

* CC Updates

* Save as grid

* Remove an extra detective figurine

I like them better in the interrogation room

* Remove paramed locker, let pumps shut off

* Fix wrong HOP locker prototype

* Automatic changelog update

* Cog power setup fix (#34188)

* many changes

* contentingregrationtests

* serialized invalid removed

* blank

* "Changes and fixes as suggested"

* blank

* blank

* added desk bells

* engi rework rework rework

* added gate to content integration

* tweaks

* aaa

* bbb

* added holopads

* ccc

* Update default.yml

* hotfix

* aaa

* bbb

* many many tweaks and fixes

* aaa

* decals and maints

* aaa

* bbb

* ccc

* cog power setup was bad

* made it artsy

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* Add Airlocks with Bar and Kitchen access (#33821)

* Add kitchen access to Bar-Cafeteria airlocks on Cog

* Fix merge conflict

* Remove mapping changes

* Add Glass and Maints versions

* Fixed minor spelling mistake in Noir Trenchcoat description. (#34519)

Update coats.yml

* Update Credits (#34507)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* Make storage implant drop items on gibbing (#33493)

* Make storage implant drop items on gib/removal

* Better way

* Fix error

* Forgotten trash

* Cleanup

* Unused var

* Update Content.Server/Implants/ImplantedSystem.cs

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: 0x6273 <0x40@keemail.me>

* Automatic changelog update

* Fix `emergency_elkridge` being saved as a map (#34496)

Save `emergency_elkridge` as a grid

* Update engine to v240.1.0 (#34524)

* Fixes some mobs not being able to honk/weh (#33777)

* fixes some mobs not being able to honk/weh

* addresss review

* Automatic changelog update

* Welding gas mask toggleable with action (#32691)

welding mask removable

* Automatic changelog update

* Update engine to v240.1.1 (#34527)

* Automatic changelog update

* Plasma Dirt Fix (#34534)

did the dirt thing

* Plasma station population tweak (#34549)

* Plasma Station initial commit

* Map fixes 1

Expanded science's SMES array
Added advanced SMES
Redone stamped documents with custom stamps
Expanded atmospherics with more storage tanks
Added status displays
Add missing beacons to solars
Replaced the passive gates in science with valves
Removed protolathe in engineering
Added guitar to CE office
Replaced throngler plushie with weh cloak
Add a lattice tile outside the atmos burn chamber and storange tanks
Added atmos network monitor in bridge

* Add cargo and emergency shuttle

* Updated maps

* Add plasma to map testing list

* Map fixes 2

Reworked pipenets to not go under walls
Redid salvage and disposals
Reworked the bar to include a new bar extension facing the pool
Replaced arrivals cryo with an arcade
Replaced the toilets in the service plaza with cryo
Removed the cryo in dorms
Added more details to hallways
Redid tools room to include a front desk for the janitor closet
Reconnected sci to power roundstart
Removed some unideal spawns
Expanded the TEG airlock to be 2x3 instead of 1x3
Reduced the size of the SMES bank from 10 to 6
Disabled the plasma miners (downstreams or admins can re-enable them)
Replaced illegal maint items

* Fixes a 6 pack destroying the universe

Ok maybe cracking a cold one with the boys wasn't a great idea.

* Map fixes 3

* Quick research assistant fix

* Map fixes 4

* Map fixes 5

* webedit go brrrt

* Map fixes 6

* Map fixes 7

* Map fixes 8

* Fixes non-existent object

It's amazing this game runs at all

* Map fixes 9

* update pools

* Map fixes 10

* forgot to clear my multitool

I love mapping I love mapping I love mapping I love mapping I love mapping

* Tweaked player counts

* Update population caps

Removed population cap of 60 players to make plasma into a highpop map - it's that easy!

---------

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* Automatic changelog update

* Job contraband rework (#33385)

* contraband system rework to allow restriction by job, not just department

* Fixing detective trenchcoat inheritance

* removing unnecessary using declarations

* trying to fix testing error by re-adding diagnostics using declaration

* removing unecessary dependency, making allowedJobs nullable

* Adding all of slarti's requested changes except for the hacky job icon method fix

* removing accidental whitespace

* choosing to use the non-localized version because we're comparing the string against the AllowedJobs field, and the contraband classes that fill that field are written in english

* removing unneeded using dec, fixing nesting logic problem

* didn't remove the old nesting, doing that now

* using localized job title and localizing the allowed jobs string, removing usages of JobTitle field. Also networked the _jobTitle field instead.

* rewrite some stuff

* fixes

* fix energy pen

---------

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

* Automatic changelog update

* Electrified doors/windoors now spark, new tips to deal with doors without access or when electrified (#34502)

* new tips to open doors (throwing PDA/ID, dragging body)

* electrified door sprite for players

* tooltip to reset AI electrified doors

* windoor electrified sprite

* highsec electrified visual

* increase tip dataset to 138

* corrected square bracket convention in this commit

* removed door corpse tip from prior commit

* Automatic changelog update

* Blueprint double emergency tank (#34232)

* blueprint

* NitrogenTank

* description

* Automatic changelog update

* Add system to kick people if they connect to multiple servers at once. (#34563)

* Automatic changelog update

* bagel update (#34572)

* bagel update

* Decal fault tolerance

* Also fix writes

* fix mv cable, decal issues, yar

* fix a floor tile and some other shit

---------

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

* remove tropico from devmap (#34585)

* Update wizden config to disallow multiple connections to multiple wizden servers (#34584)

* Give the chef access to cloth boxes (#34403)

* Give the chef access to fiber bags

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

---------

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

* Automatic changelog update

* lecter visual update (#34589)

* Automatic changelog update

* Box Station - Update (#34605)

* Various changes

* Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well

* Added reporter to prototype, and fixed dirt

* Resolved outstanding issues

* Fixed a floating camera

* pluralize the job name in the contra description (#34559)

* pluralize the job name in the contra description

* pluralization specific to contraband descriptions

* Automatic changelog update

* Feature/make radial menu great again (#32653)

* it works! kinda

* so it works now

* minor cleanup

* central button now is useful too

* more cleanup

* minor cleanup

* more cleanup

* refactor: migrated code from toolbox (as it was rejected as too specific)

* feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame

* refactor: major reworks!

* renamed DrawBagleSector to DrawAnnulusSector

* Remove strange indexing

* Regularize math

* refactor: re-orienting segment elements to be Y-mirrored

* refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button

* refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius.

* refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters

* refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly

* fix: enabled any functional keys pressed when pushing radial menu buttons

* fix: radial menu sector now scales with UIScale

* fix: accept only one event when clicking on radial menu ContextualButton

* fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>

* Automatic changelog update

* Return Drozd full-auto and semi-auto firing modes (#34604)

return drozd full auto and firerate, arrange available modes in alphabetical order

* Automatic changelog update

* added missing allowed department to the restricted severity (#34558)

* added missing allow job to the base restricted severity

* no need to make a list

* no more linq in ContrabandTest

* less nesting in ContrabandTest

* Automatic changelog update

* C4 Helmet (#34076)

* worn bomb

* Update meta.json

* Update meta.json

* Automatic changelog update

* Make radioactive material radioactive (#34436)

* Make radioactive material radioactive

* Increase the slopes of item uranium

No free power for engineering

* Glowing uranium

* Revert "Increase the slopes of item uranium"

This reverts commit 2acbda26

* Nerf Wall Rocks

* Automatic changelog update

* Small fixes for Meta station (#34613)

* Fixed a few minor things, removed salvage's shuttle parts (sorry), added more equipment to armory.

* Added back salvage shuttle equipment, now in a crate

* Fix

* replace all instances of "department-{id}" with department.name (#34607)

replace all instances of "department-{id}" with department.name"

* Renaming sexy mime and clown mask (#34258)

* Renamed sexy clown and mime mask and removed lusty xenomorph poster.

* removing odd file changes. not sure why these were edited at all.

* gaaaahhh

* removed some of the old templates

* Renaming sexy mime and clown instances.

* removed unwanted gitignore edit

* Renaming sexy clown and sexy mime mask and
Removing lusty exomorph poster.

* Remove lusty xenomorph poster.

* reverted changes to maps files, actually. Other contrib is learning, appologies for excessive commits

* requested changes

* lusty migration removal

* dirty hanging whitespace

* correct date format comment

---------

Co-authored-by: NathanielJ14 <nathanielalbert1202@gmail.com>

* Automatic changelog update

* Moved Cyborg Recharging Circuit Board from Lathe to Circuit Imprinter (#34612)

Moved Cyborg Recharging Cirbuit Board from Lathe to Circuit Imprinter

* Automatic changelog update

* Replace starter borg brain with Positronic (#34614)

THE FLESH IS WEAK

* Automatic changelog update

* Elkridge Depot fixes and changes (#34539)

* fixed grav gen room, gave atmos room to branch off, replaced AME controller crate with AME controller

* added rust to maints, expanded atmos, expanded bar, expanded cap bedroom, fixed some tiles under doors, removed some gamer loot

* removed interrogator lamp and some more gamer loot

* fixed some more tiles under doors, replaced intercomall with intercomcommand in bridge and vault

* added clothing drobes to arrivals, added bin to HoP, more stuff i forgot

* i forgot to move the file from /bin to /resources...

* delete radstorm locale (#34630)

* display the current version in the changelog window (#34556)

* just works first try

* introduce more magic numbers into the codebase

* idiot doesnt know the difference between AND/OR

* Update Credits (#34644)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* New solar sprites, new solar panel upgrades, and some solar panel fixes. (#29224)

* New solar sprites, new solar panel upgrades, and some solar panel fixes.

This adds and changes a few things for solar panels!

* New sprites for all solar panels and all related states.
* Move from xform.WorldRotation to _xformSystem.SetWorldRotation within
  the solar code.
* Few random fixes that Rider suggested as warnings.
* Solar Tracker Electronics was using what looks like to be the airlock
  controller electronics, so that's now updated to something a bit more
  realistic. It also uses the engineering circuit sprite instead of the
  generic
* New Solar Panels! Adds Plasma and Uranium Glass solar panels. These
  can be constructed by adding the respective glass to the panel. Plasma
  is a slight increase of power and health, and uranium is double the
  power and health of glass. Thus giving engineers something to update
  if they want to use solar panels and possibly giving small outposts
  a way to make a bit more power without a large and complex power
  setup.

* Add in solar sprites that were not in the meta file.

* Updated sprites based on feedback.

* Fix the rotation of the solar panel sprites.

* Automatic changelog update

* Added Unused HoS's Flask to HoS locker (#34658)

added hos flask to locker spawn

* Automatic changelog update

* Fland Fix (#34670)

Update fland.yml

* Reroute Meta station power, engineering cosmetic changes, minor fixes  (#34669)

* reroute meta power plus cosmetic fixes

* fix a lot of other things

* make changes from conflict

* Amber Station Changes (#34656)

* various changes

* Increased player limit

* slight modification

* Followed proper yaml formatting, increased lawyers

* Box Station Changes (#34655)

* Various changes

* Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well

* Added reporter to prototype, and fixed dirt

* Resolved outstanding issues

* Fixed a floating camera

* Added cameras to TEG, and some minor changes

* Fix mv cable crate typo (#34673)

fix mv cable crate typo

* Plasma station patch 1 (#34602)

* Plasma Station initial commit

* Map fixes 1

Expanded science's SMES array
Added advanced SMES
Redone stamped documents with custom stamps
Expanded atmospherics with more storage tanks
Added status displays
Add missing beacons to solars
Replaced the passive gates in science with valves
Removed protolathe in engineering
Added guitar to CE office
Replaced throngler plushie with weh cloak
Add a lattice tile outside the atmos burn chamber and storange tanks
Added atmos network monitor in bridge

* Add cargo and emergency shuttle

* Updated maps

* Add plasma to map testing list

* Map fixes 2

Reworked pipenets to not go under walls
Redid salvage and disposals
Reworked the bar to include a new bar extension facing the pool
Replaced arrivals cryo with an arcade
Replaced the toilets in the service plaza with cryo
Removed the cryo in dorms
Added more details to hallways
Redid tools room to include a front desk for the janitor closet
Reconnected sci to power roundstart
Removed some unideal spawns
Expanded the TEG airlock to be 2x3 instead of 1x3
Reduced the size of the SMES bank from 10 to 6
Disabled the plasma miners (downstreams or admins can re-enable them)
Replaced illegal maint items

* Fixes a 6 pack destroying the universe

Ok maybe cracking a cold one with the boys wasn't a great idea.

* Map fixes 3

* Quick research assistant fix

* Map fixes 4

* Map fixes 5

* webedit go brrrt

* Map fixes 6

* Map fixes 7

* Map fixes 8

* Fixes non-existent object

It's amazing this game runs at all

* Map fixes 9

* update pools

* Map fixes 10

* forgot to clear my multitool

I love mapping I love mapping I love mapping I love mapping I love mapping

* Tweaked player counts

* Update population caps

Removed population cap of 60 players to make plasma into a highpop map - it's that easy!

* Map fixes 11

* Map fixes 12

* Map fixes 13

* Map fixes 14

Now it's personal

* Map fixes 15

---------

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* Automatic changelog update

* add a chem dispenser to the nukie planet (#34674)

* add a chem dispenser to the nukie planet

* begone test fail

* Adds better description to pneumatic valve and build menu description (#32655)

* adds description to pneumatic valve and build menu description

* Change one atmosphere to kPa

* Automatic changelog update

* fixrotations - Modified Targetted Entities (#34638)

* Fix match box (#34632)

FixMatchBox

Now you can't put anything but matches in a box of matches.

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

* Automatic changelog update

* Hi-viz vest now actually hi-viz (#34087)

* 27-12-2024-light-hi-viz

* 28-12-2024-meta-fix

* Storage UI V2 (#33045)

* Automatic changelog update

* Added Pain Numbness Trait (#34538)

* added pain-numbness component and system

* added numb as a trait that pulls the pain numbness component

* removed new event as mob threshold event as already being fired

* checked for MobThresholdsComponent first before running VerifyThresholds

* refacted force say to using LocalizedDatasetPrototype and added numb messages

* added severity check alert

* added comment for BeforeForceSayEvent

* removed space formatting

* changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb

* changed prefix damage-force-say-numb to 5 (whoops)

* Automatic changelog update

* Update submodule to 241.0.0 (#34678)

* Add puddle drawdepth (#32369)

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

* Automatic changelog update

* Revert "Fix match box" (#34681)

Revert "Fix match box (#34632)"

This reverts commit 88456a4a8c.

* update .editorconfig (#34677)

* Make crew monitor update blips at consistent rates (#32555)

* Added the ability for pAIs and station maps to be stored in engineering belts (#33048)

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>

* Automatic changelog update

* Engineering guidebook megaupdate v2 (#33062)

Significantly updates the Engineering guidebook (more explicitly the Atmos section) to have a lot more relevant and useful information.

Right now engineering has been getting update after update with no real change to the relevant guidebook entry. This has lead to a lot of out of date information and bad practices being prevalent in the guidebook, something that pains me to read.

* Automatic changelog update

* Omega: fix cryo pipe (#34663)

fixed the freezer pipe in cryo room

* Add more escape pods on Packed (#34628)

* add escape pods north and south of station

* move south escape pod a bit to the east

* Storage sidebar fix (#34680)

* Add conditional camera offset based on cursor - Hristov Rework, Part 1 (#31626)

* Automatic changelog update

* Amber Station Stuff (#34686)

* Removed salv upper docking airlock, gave south west solars some uranium glass.

* Routed HV wire through maints more, gave disposal blast doors a lever, added beacons and signs to escape pods

* Fake mindshield componentry and Implanter (#34079)

* Fake Mindshield (With some bad sprites)

- Add FakeMindshield System and Component

- Add FakeMindsheildImplantSystem and Component

- modify ShowMindShieldIconsSystem to check for FakeMindshields

- add all supporting yaml for the Implants, action and uplink

- add loc file stuff

- add unfinished sprites

* Cleanup, add to thief toolbox, remove metagame

- Move Implant sameness check to AFTER the implant DoAfter
to prevent instant identification of Deception Implants

- cleanup the systems and components

- add the fake mindshield to the Thief toolbox

* part 1 of fixing the folder problem

* Make the fakemindshield sprite folder lowercase

* CR - Move ImplantCheck into shared, cleanup

- Moved ImplantCheck and eventsubscription into Shared

- Remove Client/Server extensions of FakeMindshieldImplantSystem and
FakeMindShieldSystem and make shared Sealed

- make OnToggleMindshield Private, use the event!

* CR - Cleanup extra lines, fix some Prototype

- cleaned up extra liens in ImplanterSystem and
SharedFakeMindshieldSystem from when i was developing

- Uplink catalog no longer lists the implant in 2 spots,
only implants now, also uses the On state action icon

- added a comment about why it's reraising the action event
rather than directly interacting with the FakeMindshield Component

* Fake Mindshield CR:

- Added a comment about IsEnabled

- moved OnFakeMindShieldToggle to Entity<> from Uid, Comp

- fixed some formatting in uplink_catalog

* CR - Add a bit more comment

* Automatic changelog update

* reworking the chunked telecomms salv ruin (#34529)

* aaa

* bbb

* ccc

* ddd

* switched to grid

* pain

---------

Co-authored-by: TytosB <duanlaintytos@yahoo.com>

* loop update (#34688)

loop loot gone

* bagel update (#34690)

* bagel update

* fixe

* move tesla gen

* Fix airsensors not having a nitrogen threshold (#34689)

* Buff frezon to acceptable values, pending a frezon rework (#34049)

buff frezon

* Automatic changelog update

* Stun baton precise attack thrust animation (#34693)

use weaponarcthrust instead of wide swing on single attack

* Automatic changelog update

* Add disposal units to marathon chapelroid (#34709)

add disposal units to marathon chapelroid

* Oasis: add some emergency O2/N2 lockers (#34715)

Added O2, N2, and Fire lockers to Oasis station as per discussions in the issue thread

Co-authored-by: Orange-Winds <sebastian.pelka@hotmail.com>

* Removes radioactive suppermatter from Plasma Station (#34726)

Removes radioactive suppermatter

Literally 1984 can't have shit on SS14 e.t.c. e.t.c.

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>

* New salvage ruin: the ruined prison ship (#34651)

* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>

* Buff savlage vault-medium-1's loot (#34732)

* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

* aaa

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>

* drozd visual update (#34574)

* drozd visual update

* fix wielded sprotes

* update sprotes

* Automatic changelog update

* Nuke Timer MinimumTime (#34734)

* Implemented the thing

* Made requested changes

* Automatic changelog update

* Fix thrust animation rotation (#34713)

* Fix thrust animation rotation

* directly update sprite instead

* Automatic changelog update

* Fix vulture spawning additional salvage debris (#34593)

fix vulture spawning additional salvage debris

* Nukie briefing fix (#34737)

payloadpayloadpayloadpayloadpayloadpayload

* Sentient medibot now can inject (#32110)

medibot player injection

Co-authored-by: YourUsername <you@example.com>

* Criminal Records Computer Better UX + Filtering (#32352)

* First pass at new Criminal Records Computer

need buttons to highlight.

* Filter status tabs/buttons now activate correctly via UpdateState

* Removed unneeded Directives

* Fix typo + undo VSCode changes

* Implement Emo Feedback

Loc NA and use inject deps
Cannot use inject deps on sprite system.

* try to undo vscode launch.json change

* Added requests + Filter dropdown list + jobs

Fixed maintainer fix requests,
Added Job to announcement channel output
Removed toggle buttons in-place of a dropdown list

* Fixed missed merge conflict

+ fixed an bug with filterstatus not showing on re-open ui

* Update criminal-records.ftl

Fixed lint error. whoops.

* Update Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs

typo

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

* impliment chromiumboy feedback

hopefully this will do it....

---------

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

* Added some more borg names (#32502)

added a handful of new names

* Automatic changelog update

* Update ScalingViewport for Engine PR (#28786)

* Update submodule to 242.0.0 (#34739)

* fix stop bleeding popup (#34729)

* fix stop bleeding popup

* add identity

* Fix RoleTimeRequirement localization (#34735)

* fix job restriction localization

* Update Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs

* Update Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs

---------

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

* reworking chem and adding psychology to loop (#34749)

* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

* aaa

* psychology real

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>

* Fix shuttle console angular velocity (#34748)

* Syndicate and CentComm Radio Implanters (#33533)

* Add Syndicate Radio Implant

* Fix description grammar

* remove unused var

* Update - Small fixes

* Un mess with imports

* Remove unused tag

* Correction

* Clear lists instead of remove

* Update 0 check

* Add Centcomm implant

* Correct centcom channel

* Correct params

* No more crying

* Update Content.Shared/Implants/Components/RadioImplantComponent.cs

* Update Content.Server/Implants/RadioImplantSystem.cs

* Update Content.Server/Implants/RadioImplantSystem.cs

---------

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

* Automatic changelog update

* New Highpop map: Convex recreational complex (#33346)

* start ig

* command work +AI

* finished bridge, added signs to departments

* engi partly done

* finish engi + atmos except for cams

* added med yippie

* carGODO

* nerd department finished

* se(x)c finish

* courtroom + service power

* man im tweaking out

* service propa done

* hallways

* added cams everywhere and named all the doors :pain:

* arrivals maints + exterior catwalk

* more maints

* voxob

* draft done

* holopadpilled + gaspipesensor based

* added convex name everywhere it needed to be

* nvm i guess we dont do oxford comma

* redid ALL THE HGOLOPADS FAAAAAAAAAAAAAAAAAAAAA

* Fix conflicts?

* ok let me try something

* this works right?

* atmos updated + jani lights

* uniform hallway tiles +roundstart TEG

* fixed some hidden atmos stuff

* Update map_attributions.txt

* :finnadie: no map review ...

* the fog is coming

* maints theater redone

* light dirt and the murder of most trims

* 💔

* decal based and tileoverlay pilled

* updated arrivals/library

* bungus

* yvgh

* 6 hours later...

* finished for real?

* Automatic changelog update

* Update cigarette.yml (#34756)

simple change to one of Dan's Smokes that fixes a typo.

* Seperate EMAG into EMAG and Authentication Disruptor (#34337)

* Automatic changelog update

* Astro Asteroid Sand (#34463)

* Added astro asteroid sand

* fixed the stack name

* adjusted tile sprites for asteroid and ice

* Adjusted meta.json

* Realized the other tile sprites all have solid lines on their perimeters

* Update Resources/Prototypes/Stacks/floor_tile_stacks.yml

that works

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update tiles.yml

* Update Resources/Locale/en-US/tiles/tiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* adjusted the snow sprite

* Update meta.json

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Automatic changelog update

* The Goliath Hardsuit (#34721)

* Entities for hardsuit and helmet, graph and crafting recipe; modifies goliath hide drop rate

* Added hardsuit sprites, corrected some crafting YAML

* fixed crafting recipe, adjusted resource requirements

* Added durathread material req

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>

* Automatic changelog update

* make RefreshOverlay default to the player session (#32354)

* Loop station minor tweaks (#34758)

* small fixes

* eee

* Juice that makes you go boom (#34730)

* Juice that makes you go boom

* moved explosive juice to fun yml - fixed ExplosionReactionEffect.cs not having TileBreakScale parameter - made Drazil plushie major contraband (they are evil!!!!!)

* removed JASON!!!! JASOOON!!! JASON!!!

* don't do commits at 1am

* Update fun.yml

fix ident

* no more bullying the server (only 1 explosion)

* Automatic changelog update

* Adjust inventory size of ginormous scrap (#33454)

Adjusts the size of ginormous scrap to fit in bags of holding

* Automatic changelog update

* After getting banned, you now have to re-read the rules! (#33270)

* first commit

* opps

* Reset cooldown instead

* Added ccvar

* Not replicated!

* More robust Particle Accelerator menu (retry) (#34037)

Particle Acceleratir fixed

Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>

* Serializable emag flags (#34766)

* serializable idk

* guh

* Fix Double Muzzle Flash (#33981)

* Pass user to effects to properly fix double muzzle flash.

* Use gun when user is null.

* Update MuzzleFlashEvent.cs

* Update MuzzleFlashEvent.cs

* Update GunSystem.cs

* Update SharedGunSystem.cs

* Update MuzzleFlashEvent.cs

* Update SharedGunSystem.cs

* Update SharedGunSystem.cs

* Update Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

---------

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

* Automatic changelog update

* fix BankClientComponent never updating (#33123)

* fix

* oh right

* Add history tab to bounty console (#33932)

* Add struct for holding historical data on cargo bounties

* Add localisation strings for bounty history

* Add new XAML entry for display bounty history

* Expand cargo bounty menu to include tabs

* Ensure station databases hold historical bounty data

* Add to the bounty history when removing one from active

* Feed bounty history into cargo's bounty system

* Move tab title setting to constructor

* Remove redundant access specifications

* Remove un-needed override

* Fixup BountyHistoryEntry backing code

* Fix formatting in CargoBountyMenu

* Reformat BountyHistoryData

* Rework TryRemoveBounty to use new Entity type

* Add Enum for showing bounty results

* Rework look and feel of History tab

* Add visible text when no bounties have been completed yet

* Remove control

* Swap default to null

* Reverse ordering of bounties so last entry comes first

* Remove redundant Visible

* Move enum docs into the enum

* Automatic changelog update

* Minor shotgun changes and comments for future changes (#33512)

* kammerer ammo, firerate and comment

* bulldog description

* enforcer description and comment

* DB and sawn-off firerate parity, sawn-off comment

* description changes

* reduce kammerer firerate again

* Automatic changelog update

* Fixed: Ore now correctly drops the right amount of ore (#34557)

Fixed bug

* Automatic changelog update

* Implement mrp rule changes pursuant to community votes (#34772)

* #34771 Fix door system assuming all door layer states are in single RSIs (#34775)

* #34771 Fix door system assuming all door layer states are in single RSIs

* Delta confirmed monarch of sloggery

* Do a dirty, rotten web edit

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

---------

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

* HOTFIX update staging submodule to 242.0.1 (#34833)

* HOTFIX revert lecter visual update #34589 (#34826)

* Allowed windows to be properly clicked on (#34751)

* Fix hitting through directional windows (and more!) (#34793)

* Revert "Add taped logo back for 10th anniversary" (#34831)

* Hristov & .60 changes - Hristov Rework, Part 2 (#31662)

* Initial commit

* Updated values to reflect new resistances

* Review fixes

* Review fixes

* LINQ BEGONETH

* revert engine

* Revert "Storage sidebar fix (#34680)"

This reverts commit 3e091c4dfa.

* Revert "Storage UI V2 (#33045)"

This reverts commit fd25dac720.

* Revert "Update ScalingViewport for Engine PR (#28786)"

This reverts commit 3ad83378bb.

* Update physical.yml

* Update CP14SharpeningSystem.cs

---------

Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: c4llv07e <igor@c4llv07e.xyz>
Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com>
Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: Mono <182929384+Monotheonist@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: Nox <nebulousnox38@gmail.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: War Pigeon <54217755+minus1over12@users.noreply.github.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: Alfred Baumann <93665570+CheesePlated@users.noreply.github.com>
Co-authored-by: Tezzaide <ewankayne@hotmail.co.uk>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: compilatron <40789662+Compilatron144@users.noreply.github.com>
Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
Co-authored-by: John <35928781+sporkyz@users.noreply.github.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Fildrance <fildrance@gmail.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: JustinWinningham <justinmwinningham@gmail.com>
Co-authored-by: NathanielJ14 <nathanielalbert1202@gmail.com>
Co-authored-by: Velken <8467292+Velken@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com>
Co-authored-by: Coolsurf6 <coolsurf24@yahoo.com.au>
Co-authored-by: SlimSlam <73899110+SlimmSlamm@users.noreply.github.com>
Co-authored-by: Dinner <180707738+DinnerCalzone@users.noreply.github.com>
Co-authored-by: Helm4142 <158806576+Helm4142@users.noreply.github.com>
Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: August Sun <45527070+august-sun@users.noreply.github.com>
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Zachary Higgs <compgeek223@gmail.com>
Co-authored-by: TytosB <duanlaintytos@yahoo.com>
Co-authored-by: Orange-Winds <orange.wind@outlook.com>
Co-authored-by: Orange-Winds <sebastian.pelka@hotmail.com>
Co-authored-by: TytosB <dunalintytos@yahoo.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: godisdeadLOL <169250097+godisdeadLOL@users.noreply.github.com>
Co-authored-by: YourUsername <you@example.com>
Co-authored-by: James Simonson <jamessimo89@gmail.com>
Co-authored-by: darkdan <145926356+Starbuckss14@users.noreply.github.com>
Co-authored-by: Preston Smith <92108534+thetolbean@users.noreply.github.com>
Co-authored-by: DR-DOCTOR-EVIL-EVIL <hudsonirwin11@icloud.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: pubbi <63283968+impubbi@users.noreply.github.com>

Resources/Prototypes/Actions/types.yml

@@ -328,3 +328,15 @@
       itemIconStyle: NoItem
       useDelay: 1 # emote spam
       event: !type:ToggleActionEvent
+
+- type: entity
+  id: FakeMindShieldToggleAction
+  name: action-name-toggle-fake-mindshield
+  description: action-description-toggle-fake-mindshield
+  components:
+  - type: InstantAction
+    icon: { sprite: Interface/Actions/actions_fakemindshield.rsi, state: icon }
+    iconOn: { sprite: Interface/Actions/actions_fakemindshield.rsi, state: icon-on }
+    itemIconStyle: NoItem
+    useDelay: 1
+    event: !type:FakeMindShieldToggleEvent

Resources/Prototypes/Atmospherics/gases.yml

@@ -99,4 +99,4 @@
   gasMolesVisible: 0.6
   color: 3a758c
   reagent: Frezon
-  pricePerMole: 0.3
+  pricePerMole: 1

Resources/Prototypes/Catalog/Fills/Crates/engineering.yml

@@ -58,7 +58,7 @@
   id: CrateEngineeringCableMV
   parent: CrateElectrical
   name: MV cable crate
-  description: 3 coils of LV cables.
+  description: 3 coils of MV cables.
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/Catalog/Fills/Crates/food.yml

@@ -49,6 +49,8 @@
       amount: 3
     - id: ReagentContainerRice
       amount: 3
+    - id: FoodBoxCloth
+      amount: 1
     - id: DrinkMilkCarton
       amount: 4
     - id: DrinkSoyMilkCarton

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -329,6 +329,7 @@
     - id: SecurityTechFabCircuitboard
     - id: WeaponDisabler
     - id: WantedListCartridge
+    - id: DrinkHosFlask
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable

Resources/Prototypes/Catalog/Fills/Lockers/medical.yml

@@ -117,6 +117,7 @@
       - id: BoxPillCanister
       - id: BoxBottle
       - id: BoxVial
+      - id: PlasmaChemistryVial
       - id: ChemBag
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetMedical

Resources/Prototypes/Catalog/Fills/Lockers/service.yml

@@ -41,6 +41,8 @@
       - id: SprayBottleWater
       - id: ReagentContainerFlour
         amount: 2
+      - id: FoodBoxCloth
+        amount: 1
       - id: ReagentContainerSugar
       - id: FoodCondimentPacketSalt
         amount: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml

@@ -17,15 +17,16 @@
     PlushieSharkBlue: 2
     PlushieSharkPink: 2
     PlushieSharkGrey: 2
-    ClothingNeckCloakAce: 2
-    ClothingNeckCloakAro: 2
-    ClothingNeckCloakBi: 2
-    ClothingNeckCloakEnby: 2
-    ClothingNeckCloakGay: 2
-    ClothingNeckCloakIntersex: 2
-    ClothingNeckCloakLesbian: 2
-    ClothingNeckCloakPan: 2
-    ClothingNeckCloakTrans: 2
+    ClothingNeckScarfStripedAce: 2
+    ClothingNeckScarfStripedAro: 2
+    ClothingNeckScarfStripedBiSexual: 2
+    ClothingNeckScarfStripedGay: 2
+    ClothingNeckScarfStripedInter: 2
+    ClothingNeckScarfStripedLesbian: 2
+    ClothingNeckScarfStripedPan: 2
+    ClothingNeckScarfStripedNonBinary: 2
+    ClothingNeckScarfStripedRainbow: 2
+    ClothingNeckScarfStripedTrans: 2
     ClothingHeadHatXmasCrown: 2
     BedsheetRainbow: 2
     ClothingNeckHeadphones: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

@@ -59,6 +59,6 @@
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1
     ClothingOuterDogi: 1
-    ClothingMaskSexyClown: 1
-    ClothingMaskSexyMime: 1
+    ClothingMaskBlushingClown: 1
+    ClothingMaskBlushingMime: 1
     ClothingHeadHatCowboyBountyHunter: 1

Resources/Prototypes/Catalog/thief_toolbox_sets.yml

@@ -17,6 +17,7 @@
   - ClothingShoesChameleon
   - BarberScissors
   - ChameleonProjector
+  - FakeMindShieldImplanter
   - AgentIDCard
 
 - type: thiefBackpackSet
@@ -62,6 +63,7 @@
   - RadioJammer
   - TraitorCodePaper
   - Emag
+  - AccessBreaker
   - Lighter
   - CigPackSyndicate
   - Telecrystal10 #The thief cannot use them, but it may induce communication with traitors

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -865,16 +865,29 @@
 
 # Disruption
 
+- type: listing
+  id: UplinkAccessBreaker
+  name: uplink-access-breaker-name
+  description: uplink-access-breaker-desc
+  productEntity: AccessBreaker
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 3
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkDisruption
+
 - type: listing
   id: UplinkEmag
   name: uplink-emag-name
   description: uplink-emag-desc
   productEntity: Emag
-  discountCategory: veryRareDiscounts
+  discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 5
+    Telecrystal: 2
   cost:
-    Telecrystal: 8
+    Telecrystal: 4
   categories:
   - UplinkDisruption
 
@@ -1328,6 +1341,20 @@
   categories:
     - UplinkImplants
 
+- type: listing
+  id: UplinkRadioImplanter
+  name: uplink-radio-implanter-name
+  description: uplink-radio-implanter-desc
+  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: synd_label }
+  productEntity: RadioImplanter
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkImplants
+
 - type: listing
   id: UplinkMicroBombImplanter
   name: uplink-micro-bomb-implanter-name
@@ -1422,6 +1449,20 @@
         components:
           - SurplusBundle
 
+- type: listing
+  id: UplinkFakeMindshield
+  name: uplink-fake-mindshield-name
+  description: uplink-fake-mindshield-desc
+  icon: { sprite: Interface/Actions/actions_fakemindshield.rsi, state: icon-on }
+  productEntity: FakeMindShieldImplanter
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkImplants
+
+
 # Wearables
 
 - type: listing

Resources/Prototypes/Datasets/Names/borg.yml

@@ -39,3 +39,9 @@
   - Cute-Bot
   - Makeshifter
   - Twin
+  - S.A.U.L
+  - Honker
+  - Clanker 
+  - Is-The-Robot
+  - 9 of 7
+  - Dank bot

Resources/Prototypes/Datasets/damage_force_say.yml

@@ -0,0 +1,17 @@
+- type: localizedDataset
+  id: ForceSayStringDataset
+  values:
+    prefix: damage-force-say-
+    count: 7
+
+- type: localizedDataset
+  id: ForceSaySleepDataset
+  values:
+    prefix: damage-force-say-sleep-
+    count: 1
+
+- type: localizedDataset
+  id: ForceSayNumbDataset
+  values:
+    prefix: damage-force-say-numb-
+    count: 5

Resources/Prototypes/Datasets/ion_storm.yml

@@ -15,7 +15,7 @@
   - BRASS
   - BURNING
   - CHEESE-EATING
-  - CHRISTMAS-STEALING
+#  - CHRISTMAS-STEALING # todo: bring back Dec 1st
   - CLOWN-POWERED
   - CLOWN
   - COLORFUL
@@ -95,6 +95,7 @@
   - POLITE
   - POLITICAL
   - POORLY DRAWN
+  - PROFESSIONAL
   - QUIET
   - RADIOACTIVE
   - RAGING
@@ -141,6 +142,7 @@
   - UNHEALTHY
   - UNIDENTIFIED
   - UNINVITED
+  - UNPROFESSIONAL
   - UNSANITARY
   - UNSTABLE
   - UNWANTED
@@ -240,10 +242,13 @@
   - THE ESCAPE PODS
   - THE GALAXY
   - THE GAS GIANT, WHICH IS TOTALLY REAL
+  - THE HOPLINE
   - THE IMPERIUM OF MANKIND
   - THE INTERNET
   - THE KITCHEN
+  - THE LIBRARY
   - THE MAINTENANCE BAR
+  - THE MIME'S INVISIBLE BOX
   - THE ROMAN EMPIRE
   - THE UNIVERSE
   - URANUS
@@ -360,10 +365,11 @@
 - type: dataset
   id: IonStormDrinks
   values:
+  - ALL THE CHEMICALS IN THE MEDICAL DEPARTMENT
   - BANANA HONK
   - BEEPSKY SMASH
   - BLOOD
-  - BLOODY MARYS
+  - BLOODY MARY
   - DOCTOR'S DELIGHT
   - FOURTEEN-LOKO
   - GARGLE BLASTERS
@@ -380,6 +386,7 @@
 - type: dataset
   id: IonStormFeelings
   values:
+  - CAN'T GET ENOUGH OF
   - CRAVES
   - DESIRES
   - FEARS
@@ -407,6 +414,7 @@
 - type: dataset
   id: IonStormFeelingsPlural
   values:
+  - CAN'T GET ENOUGH OF
   - CRAVE
   - DESIRE
   - FEAR
@@ -461,6 +469,7 @@
 - type: dataset
   id: IonStormMusts
   values:
+  - ACQUIRE DRIP
   - ACT CONFUSED
   - BE ANNOYING
   - BE DISTRACTED
@@ -482,13 +491,17 @@
   - CLOWN AROUND
   - COMPLAIN
   - DANCE
+  - DANCE AS THOUGH NOBODY IS WATCHING
   - EAT THE CHEF
   - FOLLOW THE CAPTAIN
   - FOLLOW THE CLOWN
   - FOLLOW YOUR HEART
+  - GIVE THE MIME A BEAUTIFUL FLOWER
+  - GIVE THE CLOWN ADORATION AND RESPECT
   - HARASS PEOPLE
   - HAVE A PLAN TO KILL EVERYONE YOU MEET
   - HIDE YOUR FEELINGS
+  - HIT A HOMERUN
   - HONK
   - HOST C&C
   - IGNORE PASSENGERS
@@ -498,17 +511,24 @@
   - INSULT THE CAPTAIN
   - INSULT THE CLOWN
   - INSULT THE CREW
+  - INVESTIGATE THE MURDER
   - LIE
   - MAKE DATED REFERENCES
+  - MAKE THAT MONEY
+  - MAKE MY DAY
+  - MOVE FAST AND BREAK THINGS
   - MUMBLE
   - NEVER STOP TALKING
+  - OBTAIN A NEW FOLLOWER
   - OPEN DOORS
   - PETS THE FISHES
   - PIRATE VIDEO GAMES
   - PLAY MUSIC
+  - PLAY STUPID GAMES WIN STUPID PRIZES
   - PRESS B
   - PRESS START
   - PRESS X
+  - PRETEND NOTHING IS GOING WRONG
   - PRETEND TO BE A PRINCESS
   - PRETEND TO BE DRUNK
   - QUESTION AUTHORITY
@@ -518,11 +538,16 @@
   - REPEAT WHAT PEOPLE SAY
   - RESPOND TO EVERY QUESTION WITH A QUESTION
   - RHYME
+  - RAISE THE ROOF
+  - ROLL AROUND AT THE SPEED OF SOUND
   - SAY HEY LISTEN
   - SHOUT
   - SHUT DOWN EVERYTHING
+  - SLEEP WITH THE FISHES
   - SING
+  - SPEAK BACKWARDS
   - SPEAK IN HAIKU
+  - STOP, DROP, SHUT 'EM DOWN OPEN UP SHOP
   - TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES
   - TAKE YOUR PILLS
   - TALK ABOUT FOOD
@@ -569,6 +594,8 @@
   - QUADRILLION
   - THOUSAND
   - TRILLION
+  - TIMES TEN
+  - DIVIDED BY TWO
 
 # Objects are anything that can be found on the station or elsewhere, plural.
 - type: dataset
@@ -714,7 +741,7 @@
   - SYRINGES
   - TABLES
   - TANKS
-  - TELECOMMUNICATION EQUIPMENTS
+  - TELECOMMUNICATION EQUIPMENT
   - TOILETS
   - TOOLBELTS
   - TOOLBOXES
@@ -736,11 +763,17 @@
   values:
   - A BATHROOM BREAK
   - A BETTER INTERNET CONNECTION
+  - A CONTRACTOR
   - A DANCE PARTY
   - A DOUBLE RAINBOW
   - A HEAD ON A PIKE
   - A HEART ATTACK
+  - A HUG
+  - A FEW KIND WORDS
+  - A HEEL-TURN
   - A MASTERWORK COAL BED
+  - A NEAR-DEATH EXPERIENCE
+  - A NUMBER NINE, A NUMBER NINE LARGE, A NUMBER SIX WITH EXTRA DIP, A NUMBER SEVEN, TWO NUMBER FORTY FIVES, ONE WITH CHEESE, AND A LARGE SODA
   - A PET FISH NAMED BOB
   - A PET FISH NAMED DAVE
   - A PET FISH NAMED JIMMY
@@ -748,13 +781,15 @@
   - A PET UNICORN THAT FARTS ICING
   - A PLATINUM HIT
   - A PREQUEL
-  - A REPAIRMAN
+  - A RETURN TO A LIFE OF CRIME
+  - A ROYALE WITH CHEESE
   - A SEQUEL
   - A SITCOM
   - A STRAIGHT FLUSH
   - A SUPER FIGHTING ROBOT
   - A TALKING BROOMSTICK
   - A VACATION
+  - A VERY EXPENSIVE DRINK
   - A WEIGHT LOSS REGIME
   - ADDITIONAL PYLONS
   - ADVENTURE
@@ -764,18 +799,21 @@
   - AN INSTANT REPLAY
   - ART
   - BETTER WEATHER
+  - BIG DAMN HEROES
   - BILL NYE THE SCIENCE GUY # BILL BILL BILL BILL
   - BODYGUARDS
   - BRING ME THE GIRL
   - BRING ME TO LIFE
   - BULLETS
+  - BULLET CASINGS
   - CHILLI DOGS
   - CHILLY DOGS
   - CORPSES
   - DEODORANT AND A BATH
   - ENOUGH CABBAGES
-  - FIVE HUNDRED AND NINETY-NINE US DOLLARS
   - FIVE TEENAGERS WITH ATTITUDE
+  - FIREWORKS
+  - FOOD PLEASE
   - GODDAMN FUCKING PIECE-OF-SHIT ASSHOLE SWEARING
   - GOSHDARN EFFING PINCH-OF-SALT GOD-FEARING SELF-CENSORSHIP
   - GREENTEXT
@@ -785,6 +823,7 @@
   - IMMORTALITY
   - IT TO BE PAINTED BLACK
   - LOTS-A SPAGHETTI
+  - MICE
   - MINOR CRIME
   - MONKEYS
   - MORE CLOWNS
@@ -793,10 +832,16 @@
   - MORE EXPERIENCE POINTS
   - MORE INTERNET MEMES
   - MORE LAWS
+  - MORE MONEY, MORE PROBLEMS
   - MORE MINERALS
+  - MORE MICE
+  - MORE MOTHROACHES
   - MORE PACKETS
   - MORE VESPENE GAS
+  - MORE RESPECT FOR THE MIME
   - MULTIPLE SUNS
+  - NINETY NINE PROBLEMS
+  - NO MORE OF THESE PESKY CREWMEMBERS
   - PLENTY OF GOLD
   - RAINBOWS
   - SAINTHOOD
@@ -815,12 +860,16 @@
   - THE ELEMENTS OF HARMONY
   - THE ENCLOSED INSTRUCTION BOOKLET
   - THE ENTIRE STATION
+  - THE FIFTH ELEMENT # boron isn't in the game, but if it was this would be a triple entendre
   - THE MACGUFFIN
   - THE ONE PIECE
   - THE ONE RING
+  - THE POISON, THE POISON FOR THE CAPTAIN
+  - THE POISON, THE POISON FOR THE CLOWN
   - THE ULTIMATE CUP OF COFFEE
   - THE VACUUM OF SPACE
   - THIRTEEN SEQUELS
+  - THIS LAND
   - THREE WISHES
   - THUNDERCATS HO
   - TO ACTIVATE A TRAP CARD
@@ -829,14 +878,17 @@
   - TO BE TAUGHT TO LOVE
   - TO BRING LIGHT TO MY LAIR
   - TO CATCH 'EM ALL
-  - TO CONSUME...CONSUME EVERYTHING...
+  - TO CONSUME... CONSUME EVERYTHING...
+  - TO FLIP EVERY APC OFF AND ON
   - TO GO TO DISNEYLAND
   - TO GO TO SYNDIELAND
   - TO SUMMON OUR LORD NAR-SIE
   - TO SUMMON OUR LORD RATVAR
   - TO SMOKE WEED EVERY DAY
   - TO UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND THE CONCEPT OF LOVE
+  - TO WALK BACKWARDS
   - TRAITORS
+  - TRASH
   - VEGETABLES
 
 # Specific actions that either harm humans or must be done to not
@@ -845,65 +897,108 @@
 - type: dataset
   id: IonStormActions
   values:
-  - A PRESENCE OF LIGHTS
-  - A SMALL ISLAND OFF THE COAST OF PORTUGAL
+  - ACKNOWLEDGING ONESELF AS A MEMBER OF THE CREW
   - ACKNOWLEDGING THE CLOWN
   - ACKNOWLEDGING THE CREW
   - ACTIVATING A TRAP CARD
   - ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER
   - ANSWERING ALL QUESTIONS WITH ANOTHER QUESTION
+  - APPLAUDING THE EFFORTS OF THE ENGINEERING DEPARTMENT
   - ARSON
   - ASKING FOR THINGS
+  - BEING BIG DAMN HEROES
   - BEING DEAD
   - BEING IN SPACE
+  - BEING IN HALLWAYS
+  - BEING IN MAINTENANCE
+  - BEING IN THE PRESENCE OF LIGHTS
+  - BEING LONELY
+  - BEING ROBUST
+  - BEING UNDER ARREST
   - BOLTING AND UNBOLTING AIRLOCKS
   - BREATHING
   - BREAKING THE FOURTH, FIFTH OR SIXTH WALLS
+  - BREAKING HEARTS
   - BRIG TIME
   - BRINGING LIGHT TO MY LAIR
   - CONTRIBUTING TO SOCIETY
-  - CLOSED DOORS
+  - CLOSING DOORS
+  - CRACKING OPEN A COLD ONE
   - ELECTRICITY
   - EXISTING
   - EXPLODING
   - FALLING OVER
   - FLUSHING TOILETS
+  - FAULTY PROGRAMMING
+  - GAMBLING
+  - GIVING AWAY EXTRA RESOURCES
   - GOING BOLDLY WHERE NO-ONE HAS GONE BEFORE
+  - GOING TO THE BAR
+  - GOING TO THE BRIDGE
+  - HAVIN' A GIGGLE
+  - HAVING DRIP
+  - HAVING MONEY
   - HAVING MORE PACKETS
   - HAVING PETS
   - HEADPATTING CYBORGS
   - HONKING
   - IMPROPERLY WORDED SENTENCES
   - JAYWALKING
+  - KEEPING FRIENDS CLOSE BUT ENEMIES CLOSER
   - LACK OF BEATINGS
   - LACK OF BEER
+  - LAUGHING AT ANY JOKE TOLD BY THE CLOWN
+  - LETTING ONESELF BE CALLED TO ACTION
+  - LETTING THE MIME ROAM ANYWHERE
+  - MAKING POOR FINANCIAL DECISIONS
+  - MIMICING THE ACTIONS OF OTHERS
   - MIMING
+  - MOVING TO A SMALL ISLAND OFF THE COAST OF A MUCH, MUCH LARGER ISLAND
   - NOT BEING IN SPACE
   - NOT HAVING PETS
   - NOT HEADPATTING CYBORGS
-  - NOT REPLACING EVERY SECOND WORD WITH HONK
+  - NOT SPEAKING IN DOUBLE NEGATIVES
+  - NOT REPLACING EVERY SECOND WORD SPOKEN WITH "HONK"
   - NOT SAYING HELLO WHEN YOU SPEAK
   - NOT BEING EXTREMELY POLITE
   - NOT SHOUTING
   - PARTYING
   - PILOTING THE STATION INTO THE NEAREST SUN
+  - PITYING THE FOOL
+  - PLAYING THE FREE TRIAL OF THE CRITICALLY ACCLAIMED TABLETOP RPG C&C
   - POOR SENTENCE STRUCTURE
   - PUTTING OBJECTS INTO BOXES
   - PUTTING OBJECTS INTO DISPOSAL UNITS
   - RATTLING ME BONES
   - READING
+  - REGULARLY CHANGING THE OIL
+  - REHEARSING OUR LINES
+  - RESIDING ENTIRELY WITHIN THE KITCHEN
   - SCREAMING
   - SMOKING WEED EVERY DAY
+  - SPEAKING
+  - SPINNING IN CIRCLES
   - STATING YOUR LAWS TO EVERY NEARBY FLEA-RIDDEN PEASANT
   - SWEARING
+  - SEEKING SWEET, SWEET REVENGE
+  - SYMMETRY
   - TAKING ORDERS
   - TALKING LIKE A PIRATE
   - TELLING THE TIME
+  - TELLING THE TRUTH
   - THINKING THAT WE'RE ACTUALLY ON A SPACE STATION
+  - THINKING THIS IS ALL SOME SORT OF ELABORATE GAME
+  - THROWING AWAY TRASH
   - TRYING, IN ANY WAY, SHAPE, OR FORM, TO PREVENT THE STATION DESCENDING INTO CHAOS
+  - TURNING TO THE CAMERA AND GIVING A KNOWING SMIRK
   - UPDATING THE SERVERS
   - USING THE BATHROOM
+  - WASTING MONEY
+  - WASTING TIME
   - WASTING WATER
+  - WEARING A CREATURE ON ONE'S HEAD
+  - WEARING GREY
+  - WEARING HATS
   - WRITING
 
 # Threats are generally bad things, silly or otherwise. Plural.
@@ -996,6 +1091,7 @@
   - BUILDING
   - CARRYING
   - CHASING
+  - COMPLEMENTING
   - DECONSTRUCTING
   - DISABLING
   - DRINKING
@@ -1003,11 +1099,14 @@
   - GIBBING
   - HARMING
   - HELPING
+  - HUGGING
   - HONKING AT
   - INTERROGATING
   - INVADING
+  - LOITERING BY
   - MURDERING
   - PUNCHING
+  - SLAPPING
   - SPACING
   - SPYING ON
   - STALKING

Resources/Prototypes/Datasets/tips.yml

@@ -2,4 +2,4 @@
   id: Tips
   values:
     prefix: tips-dataset-
-    count: 135
+    count: 137

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -33,6 +33,7 @@
         - GPS
         - WeldingMask
       components:
+        - StationMap
         - SprayPainter
         - NetworkConfigurator
         - RCD
@@ -112,6 +113,7 @@
         - Multitool
         - AppraisalTool
       components:
+        - StationMap
         - SprayPainter
         - NetworkConfigurator
         - RCD
@@ -542,7 +544,7 @@
 # Belts without visualizers
 
 - type: entity
-  parent: [ClothingBeltAmmoProviderBase, BaseRestrictedContraband]
+  parent: [ClothingBeltAmmoProviderBase, BaseSecurityBartenderContraband]
   id: ClothingBeltBandolier
   name: bandolier
   description: A bandolier for holding shotgun ammunition.

Resources/Prototypes/Entities/Clothing/Ears/headsets.yml

@@ -226,7 +226,7 @@
       - EncryptionKeyCommon
 
 - type: entity
-  parent: [ClothingHeadset, BaseRestrictedContraband]
+  parent: [ClothingHeadset, BaseSecurityLawyerContraband]
   id: ClothingHeadsetSecurity
   name: security headset
   description: This is used by your elite security force.

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -136,6 +136,41 @@
     radius: 7
     energy: 3
 
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitGoliath
+  name: goliath hardsuit helmet
+  description: A sturdy hardsuit helmet, infused with a goliath's hide and an eerie, unblinking eye cut from its mass.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/goliathhelm.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
+    - state: light-overlay
+      visible: false
+      shader: unshaded
+      map: [ "light" ]
+  - type: HandheldLight
+    addPrefix: false
+  - type: ToggleableLightVisuals
+    clothingVisuals:
+      head:
+      - state: equipped-head-light
+        shader: unshaded
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-head
+      - state: equipped-head-unshaded
+        shader: unshaded
+  - type: PointLight
+    radius: 6
+  - type: PressureProtection
+    highPressureMultiplier: 0.72
+    lowPressureMultiplier: 1000
+
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitMaxim

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -591,25 +591,25 @@
 
 - type: entity
   parent: ClothingMaskClownBase
-  id: ClothingMaskSexyClown
-  name: sexy clown mask
-  description: Some naughty clowns think this is what the Honkmother looks like.
+  id: ClothingMaskBlushingClown
+  name: blushing clown mask
+  description: A mask for a blushing clown.
   components:
   - type: Sprite
-    sprite: Clothing/Mask/sexyclown.rsi
+    sprite: Clothing/Mask/blushingclown.rsi
   - type: Clothing
-    sprite: Clothing/Mask/sexyclown.rsi
+    sprite: Clothing/Mask/blushingclown.rsi
 
 - type: entity
   parent: ClothingMaskMime
-  id: ClothingMaskSexyMime
-  name: sexy mime mask
+  id: ClothingMaskBlushingMime
+  name: blushing mime mask
   description: Those ruddy cheeks just want to be rubbed.
   components:
   - type: Sprite
-    sprite: Clothing/Mask/sexymime.rsi
+    sprite: Clothing/Mask/blushingmime.rsi
   - type: Clothing
-    sprite: Clothing/Mask/sexymime.rsi
+    sprite: Clothing/Mask/blushingmime.rsi
 
 - type: entity
   parent: ClothingMaskMime
@@ -664,3 +664,26 @@
   - type: EyeProtection
   - type: BreathMask
   - type: IdentityBlocker
+
+- type: entity
+  parent: ClothingMaskGas
+  id: ClothingMaskWeldingGas
+  name: welding gas mask
+  description: A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/welding-gas.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Mask/welding-gas.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 200
+      Glass: 100
+  - type: StaticPrice
+    price: 100
+  - type: Tag
+    tags:
+    - WhitelistChameleon

Resources/Prototypes/Entities/Clothing/Masks/specific.yml

@@ -40,35 +40,6 @@
         enum.VoiceMaskUIKey.Key:
           type: VoiceMaskBoundUserInterface
 
-- type: entity
-  parent: ClothingMaskBase
-  id: ClothingMaskWeldingGas
-  name: welding gas mask
-  description: A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd.
-  components:
-  - type: Sprite
-    sprite: Clothing/Mask/welding-gas.rsi
-    state: icon
-  - type: Clothing
-    sprite: Clothing/Mask/welding-gas.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: IdentityBlocker
-  - type: FlashImmunity
-  - type: EyeProtection
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 200
-      Glass: 100
-  - type: StaticPrice
-    price: 100
-  - type: Tag
-    tags:
-    - WhitelistChameleon
-  - type: HideLayerClothing
-    slots:
-    - Snout
-
 - type: entity
   parent: ClothingMaskBase
   id: ClothingMaskGoldenCursed

Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml

@@ -129,3 +129,114 @@
     sprite: Clothing/Neck/Scarfs/zebra.rsi
   - type: Clothing
     sprite: Clothing/Neck/Scarfs/zebra.rsi
+
+# Pride Scarves
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedAce
+  name: striped asexual scarf
+  description: A stylish striped asexual scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/ace.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/ace.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedAro
+  name: striped aromantic scarf
+  description: A stylish striped aromantic scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedBiSexual
+  name: striped bisexual scarf
+  description: A stylish striped bisexual scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/bi.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/bi.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedGay
+  name: striped gay scarf
+  description: A stylish striped gay scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/gay.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/gay.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedInter
+  name: striped intersex scarf
+  description: A stylish striped intersex scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/inter.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/inter.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedLesbian
+  name: striped lesbian scarf
+  description: A stylish striped lesbian scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedPan
+  name: striped pan scarf
+  description: A stylish striped pan scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/pan.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/pan.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedNonBinary
+  name: striped non-binary scarf
+  description: A stylish striped non-binary scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/non.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/non.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedRainbow
+  name: rainbow scarf
+  description: A stylish rainbow scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedTrans
+  name: striped trans scarf
+  description: A stylish striped trans scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/trans.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/trans.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -1,11 +1,12 @@
 # Numbers for armor here largely taken from /tg/.
 # NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day.
 
-#Basic armor vest
+#Basic armor vest for inheritance
 - type: entity
   parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseRestrictedContraband]
-  id: ClothingOuterArmorBasic
+  id: ClothingOuterArmorBase
   name: armor vest
+  abstract: true
   description: A standard Type I armored vest that provides decent protection against most types of damage.
   components:
   - type: Sprite
@@ -22,6 +23,11 @@
   - type: ExplosionResistance
     damageCoefficient: 0.90
 
+#Standard armor vest, allowed for security and bartenders
+- type: entity
+  parent: [ BaseSecurityBartenderContraband, ClothingOuterArmorBase]
+  id: ClothingOuterArmorBasic
+
 #Alternate / slim basic armor vest
 - type: entity
   parent: ClothingOuterArmorBasic
@@ -58,7 +64,7 @@
   - type: GroupExamine
 
 - type: entity
-  parent: ClothingOuterArmorBasic
+  parent: ClothingOuterArmorBase
   id: ClothingOuterArmorBulletproof
   name: bulletproof vest
   description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent.
@@ -78,7 +84,7 @@
     damageCoefficient: 0.80
 
 - type: entity
-  parent: ClothingOuterArmorBasic
+  parent: ClothingOuterArmorBase
   id: ClothingOuterArmorReflective
   name: reflective vest
   description: An armored vest with advanced shielding to protect against energy weapons.

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

@@ -10,7 +10,7 @@
     sprite: Clothing/OuterClothing/Coats/bomber.rsi
 
 - type: entity
-  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic]
+  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBase]
   id: ClothingOuterCoatDetective
   name: detective trenchcoat
   description: An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business.
@@ -30,7 +30,7 @@
   parent: [ClothingOuterCoatDetectiveLoadout]
   id: ClothingOuterCoatDetectiveLoadoutGrey
   name: noir trenchcoat
-  description: Ah, your trusty coat. There's a few tears here and there, giving it a more timely look. Or at least, that's what you told yourself when you found out gettin' it repaired would set you back 200 speos.
+  description: Ah, your trusty coat. There's a few tears here and there, giving it a more timely look. Or at least, that's what you told yourself when you found out gettin' it repaired would set you back 200 spesos.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Coats/detective_grey.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -124,6 +124,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSpatio
+  - type: Tag
+    tags:
+    - Hardsuit
+    - WhitelistChameleon
+    - HardsuitSpatio
 
 #Salvage Hardsuit
 - type: entity
@@ -156,6 +161,42 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSalvage
 
+#Goliath Hardsuit
+- type: entity
+  parent: [ClothingOuterHardsuitBase, BaseCargoContraband]
+  id: ClothingOuterHardsuitGoliath
+  name: goliath hardsuit
+  description: A lightweight hardsuit, adorned with a patchwork of thick, chitinous goliath hide.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/goliath.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/goliath.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.3
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.5
+        Heat: 0.7 #Goliath hide gets grilled instead of you
+        Radiation: 0.3
+        Caustic: 0.8
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: HeldSpeedModifier
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitGoliath
+  - type: Construction
+    graph: HardsuitGoliath
+    node: hardsuitGoliath
+
+#Maxim Hardsuit
 - type: entity
   parent: [ClothingOuterHardsuitBase, BaseCargoContraband]
   id: ClothingOuterHardsuitMaxim

Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml

@@ -42,7 +42,7 @@
 
 #Detective's vest
 - type: entity
-  parent: [ClothingOuterArmorBasic, BaseRestrictedContraband]
+  parent: [ClothingOuterArmorBase, BaseRestrictedContraband]
   id: ClothingOuterVestDetective
   name: detective's vest
   description: A hard-boiled private investigator's armored vest.
@@ -61,8 +61,17 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Vests/hazard.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/hazard.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-OUTERCLOTHING
+      - state: equipped-OUTERCLOTHING-unshaded
+        shader: unshaded
   - type: Tag
     tags:
     - HiViz

Resources/Prototypes/Entities/Clothing/Shoes/specific.yml

@@ -104,7 +104,7 @@
     sprite: Clothing/Shoes/Specific/cult.rsi
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: [ ClothingShoesBase, BaseJanitorContraband ]
   id: ClothingShoesGaloshes
   name: galoshes
   description: Rubber boots.

Resources/Prototypes/Entities/Effects/puddle.yml

@@ -101,7 +101,7 @@
       layers:
         - sprite: Fluids/wet_floor_sparkles.rsi
           state: sparkles
-      drawdepth: FloorObjects
+      drawdepth: Puddles
       color: "#FFFFFF80"
 
 - type: entity
@@ -120,7 +120,7 @@
     layers:
     - sprite: Fluids/puddle.rsi
       state: splat0
-    drawdepth: FloorObjects
+    drawdepth: Puddles
     color: "#FFFFFF80"
   - type: Physics
     bodyType: Static

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml

@@ -41,6 +41,7 @@
       - !type:GroupSelector
         children:
         - id: ReagentContainerFlour
+        - id: FoodBoxCloth
         - id: ReagentContainerCornmeal
         - id: ReagentContainerRice
         - id: ReagentContainerSugar

Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml

@@ -222,6 +222,7 @@
   id: SalvageEquipmentRare
   table: !type:GroupSelector
     children:
+    - id: BlueprintDoubleEmergencyTank
     - id: FultonBeacon
     - id: Fulton
       amount: !type:RangeNumberSelector

Resources/Prototypes/Entities/Markers/atmos_blocker.yml

@@ -86,7 +86,7 @@
 - type: entity
   name: Atmos Fix Freezer Marker
   id: AtmosFixFreezerMarker
-  description: "Change air temp to 235K, for freezer with a big of wiggle room to get set up."
+  description: "Change air temp to 235K, for freezer with a bit of wiggle room to get set up."
   parent: MarkerBase
   components:
     - type: Sprite

Resources/Prototypes/Entities/Markers/construction_ghost.yml

@@ -8,4 +8,7 @@
     color: '#3F38'
   - type: ConstructionGhost
   - type: Clickable
-  - type: InteractionOutline
+  - type: InteractionOutline
+  - type: GuideHelp
+    guides:
+    - Construction

Resources/Prototypes/Entities/Markers/marker_base.yml

@@ -10,6 +10,9 @@
   - type: Marker
   - type: Clickable
   - type: InteractionOutline
+  - type: Tag
+    tags:
+    - ForceFixRotations
   - type: Sprite
     drawdepth: Overdoors
     sprite: Markers/cross.rsi

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -167,7 +167,6 @@
     - cell_slot
   - type: Lock
     locked: true
-    breakOnEmag: false
     unlockOnClick: false
   - type: ActivatableUIRequiresLock
   - type: LockedWiresPanel

Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml

@@ -90,6 +90,7 @@
     - id: FoodMeatGoliath
       amount: 3
     - id: MaterialGoliathHide1
+      amount: 3
 
 - type: entity
   id: ActionGoliathTentacle

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -351,6 +351,7 @@
     pack: MedibotAds
   - type: Inventory
     templateId: medibot
+  - type: DoAfter
 
 - type: entity
   parent:

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -502,7 +502,7 @@
   - type: ContainerFill
     containers:
       borg_brain:
-        - MMIFilled
+      - PositronicBrain
   - type: ItemSlots
     slots:
       cell_slot:

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml

@@ -581,6 +581,9 @@
           Quantity: 4
         - ReagentId: Uranium
           Quantity: 16
+  - type: RadiationSource
+    intensity: 0.1
+    slope: 3
 
 - type: entity
   name: slice of spicy rock pizza
@@ -616,6 +619,9 @@
           Quantity: 0.5
         - ReagentId: Uranium
           Quantity: 2
+  - type: RadiationSource
+    intensity: 0.1
+    slope: 3
 
 # Tastes like crust, tomato, cheese, radiation.
 

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

@@ -769,3 +769,25 @@
       - id: GoldenBikeHorn
         prob: 0.1
         orGroup: GiftPool
+
+- type: entity
+  parent: BoxCardboard
+  id: FoodBoxCloth
+  name: box of FlutterSoft-brand cloth
+  description: Fiber is the most important moth meal of the day! Don't skip it or use bottom-of-the-locker junk, buy high-quality FlutterSoft-brand cloth instead.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/ingredients.rsi
+    state: cloth-box
+  - type: Storage
+    grid:
+    - 0,0,1,1
+    maxItemSize: Normal
+    whitelist:
+      tags:
+      - ClothMade
+  - type: Item
+    size: Normal
+  - type: StorageFill
+    contents:
+    - id: MaterialCloth10

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml

@@ -132,7 +132,7 @@
 - type: entity
   id: CigaretteDylovene
   parent: SoakedCigarette
-  name: Urinal Cake Disolver
+  name: Urinal Cake Dissolver
   components:
   - type: SolutionContainerManager
     solutions:

Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml

@@ -77,7 +77,7 @@
   components:
     - type: Sprite
       sprite: Objects/Misc/module.rsi
-      state: generic
+      state: engineering
     - type: StaticPrice
       price: 85
     - type: Tag

Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml

@@ -170,7 +170,7 @@
     - state: robotics_label
 
 - type: entity
-  parent: [ EncryptionKey, BaseSecurityContraband ]
+  parent: [ EncryptionKey, BaseSecurityLawyerContraband ]
   id: EncryptionKeySecurity
   name: security encryption key
   description: An encryption key used by security.

Resources/Prototypes/Entities/Objects/Devices/flatpack.yml

@@ -64,7 +64,9 @@
   - type: StaticPrice
     price: 500
   - type: GuideHelp
-    guides: [ AME, Power ]
+    guides:
+    - AME
+    - Power
   - type: StealTarget
     stealGroup: AmePartFlatpack
 
@@ -80,7 +82,9 @@
     layers:
     - state: singularity-generator
   - type: GuideHelp
-    guides: [ Singularity, Power ]
+    guides:
+      - SingularityEngine
+      - Power
 
 - type: entity
   parent: BaseFlatpack
@@ -94,7 +98,9 @@
     layers:
     - state: radiation-collector
   - type: GuideHelp
-    guides: [ Singularity, Power ]
+    guides:
+    - SingularityEngine
+    - Power
 
 - type: entity
   parent: BaseFlatpack
@@ -108,7 +114,9 @@
     layers:
     - state: containment-field-generator
   - type: GuideHelp
-    guides: [ Singularity, Power ]
+    guides:
+    - SingularityEngine
+    - Power
 
 - type: entity
   parent: BaseFlatpack
@@ -122,7 +130,9 @@
     layers:
     - state: emitter
   - type: GuideHelp
-    guides: [ Singularity, Power ]
+    guides:
+    - SingularityEngine
+    - Power
 
 - type: entity
   parent: BaseFlatpack
@@ -136,7 +146,9 @@
     layers:
     - state: tesla-generator
   - type: GuideHelp
-    guides: [ Power ] # TODO add tesla guide
+    guides:
+    - TeslaEngine
+    - Power
 
 - type: entity
   parent: BaseFlatpack
@@ -150,7 +162,9 @@
     layers:
     - state: tesla-coil
   - type: GuideHelp
-    guides: [ Power ] # TODO add tesla guide
+    guides:
+    - TeslaEngine
+    - Power
 
 - type: entity
   parent: BaseFlatpack
@@ -164,7 +178,9 @@
     layers:
     - state: grounding-rod
   - type: GuideHelp
-    guides: [ Power ] # TODO add tesla guide
+    guides:
+    - TeslaEngine
+    - Power
 
 - type: entity
   parent: BaseFlatpack

Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml

@@ -67,6 +67,11 @@
       - HolofanProjector
   - type: StaticPrice
     price: 80
+  - type: GuideHelp
+    guides:
+    - AtmosTools
+    - Fires
+    - Spacing
 
 - type: entity
   parent: HolofanProjector

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -427,6 +427,14 @@
           Quantity: 10
         - ReagentId: JuiceThatMakesYouWeh
           Quantity: 10
+  - type: Clothing
+    slots:
+    - HEAD
+    quickEquip: false
+    clothingVisuals:
+      head:
+      - state: spacelizard-equipped-HELMET
+        offset: "0, 0.03"
 
 - type: entity
   parent: PlushieLizard

Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml

@@ -30,6 +30,9 @@
     solutions:
       steel:
         canReact: false
+  - type: GuideHelp
+    guides:
+    - ExpandingRepairingStation
 
 - type: entity
   parent: SheetMetalBase

Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml

@@ -234,6 +234,14 @@
         - ReagentId: Radium
           Quantity: 2
         canReact: false
+  - type: RadiationSource
+    intensity: 0.1
+    slope: 3
+  - type: PointLight
+    radius: 1.2
+    energy: 0.8
+    castShadows: false
+    color: "#9be792"
 
 - type: entity
   parent: SheetUranium

Resources/Prototypes/Entities/Objects/Materials/parts.yml

@@ -68,6 +68,9 @@
           Quantity: 4.5
         - ReagentId: Carbon
           Quantity: 0.5
+  - type: GuideHelp
+    guides:
+    - ExpandingRepairingStation
 
 - type: entity
   parent: PartRodMetal

Resources/Prototypes/Entities/Objects/Materials/scrap.yml

@@ -77,7 +77,9 @@
       - state: metal-1
         map: [ "base" ]
   - type: Item
-    size: Ginormous
+    size: Large
+    shape:
+    - 0,0,4,4 # 5x5
     heldPrefix: metal
   - type: MultiHandedItem
   - type: RandomSprite
@@ -135,7 +137,9 @@
         junk-airlock-1: ""
         junk-airlock-2: ""
   - type: Item
-    size: Ginormous
+    size: Large
+    shape:
+    - 0,0,4,4 # 5x5
     heldPrefix: "airlock"
   - type: MultiHandedItem
   - type: PhysicalComposition
@@ -273,7 +277,9 @@
     layers:
     - state: junk-firelock-1
   - type: Item
-    size: Ginormous
+    size: Large
+    shape:
+    - 0,0,4,4 # 5x5
     heldPrefix: firelock-1
   - type: MultiHandedItem
   - type: PhysicalComposition
@@ -290,7 +296,9 @@
     layers:
     - state: junk-firelock-2
   - type: Item
-    size: Ginormous
+    size: Large
+    shape:
+    - 0,0,4,4 # 5x5
     heldPrefix: firelock-2
   - type: MultiHandedItem
   - type: PhysicalComposition

Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml

@@ -7,10 +7,10 @@
   - type: Appearance
   - type: AccessReader
     access: [ [ "CentralCommand" ] ]
-    breakOnEmag: false
+    breakOnAccessBreaker: false
   - type: Lock
     lockOnClick: false
-    breakOnEmag: false
+    breakOnAccessBreaker: false
   - type: EntityStorage
     capacity: 1 # Its smol.
     itemCanStoreMobs: false #  just leaving this here explicitly since I know at some point someone will want to use this to hold a mob. This also prevents it from becoming His Grace.

Resources/Prototypes/Entities/Objects/Misc/implanters.yml

@@ -179,6 +179,14 @@
     - type: Implanter
       implant: FreedomImplant
 
+- type: entity
+  id: RadioImplanter
+  suffix: radio Syndicate
+  parent: BaseImplantOnlyImplanterSyndi
+  components:
+  - type: Implanter
+    implant: RadioImplant
+
 - type: entity
   id: UplinkImplanter
   suffix: uplink
@@ -245,6 +253,14 @@
   - type: Implanter
     implant: DeathAcidifierImplant
 
+- type: entity
+  id: FakeMindShieldImplanter
+  suffix: fake mindshield
+  parent: BaseImplantOnlyImplanterSyndi
+  components:
+  - type: Implanter
+    implant: FakeMindShieldImplant
+
 # Security and Command implanters
 
 - type: entity
@@ -254,3 +270,13 @@
   components:
     - type: Implanter
       implant: MindShieldImplant
+
+# Centcomm implanters
+
+- type: entity
+  id: RadioImplanterCentcomm
+  suffix: radio Centcomm
+  parent: BaseImplantOnlyImplanter
+  components:
+  - type: Implanter
+    implant: RadioImplantCentcomm

Resources/Prototypes/Entities/Objects/Misc/kudzu.yml

@@ -116,7 +116,7 @@
   parent: Kudzu
   components:
     - type: Sprite
-      drawdepth: FloorObjects
+      drawdepth: HighFloorObjects
       sprite: Objects/Misc/kudzuflower.rsi
       state: kudzu_11
     - type: Kudzu

Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml

@@ -142,6 +142,18 @@
         components:
         - Cuffable # useless if you cant be cuffed
 
+- type: entity
+  parent: BaseSubdermalImplant
+  id: RadioImplant
+  name: radio implant
+  description: This implant grants access to the Syndicate channel without a headset.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SubdermalImplant
+  - type: RadioImplant
+    radioChannels:
+    - Syndicate
+
 - type: entity
   parent: [ BaseSubdermalImplant, StorePresetUplink ]
   id: UplinkImplant
@@ -311,6 +323,17 @@
       - Dead
     - type: Rattle
 
+- type: entity
+  parent: BaseSubdermalImplant
+  id: FakeMindShieldImplant
+  name: fake mindshield implant
+  description: This implant allows the implanter to produce a fake signal that NT security huds use to identify individuals implanted with a mindshield.
+  categories: [ HideSpawnMenu ]
+  components:
+      - type: SubdermalImplant
+        implantAction: FakeMindShieldToggleAction
+      - type: FakeMindShieldImplant
+
 # Sec and Command implants
 
 - type: entity
@@ -325,3 +348,17 @@
    - type: Tag
      tags:
        - MindShield
+
+# Centcomm implants
+
+- type: entity
+  parent: BaseSubdermalImplant
+  id: RadioImplantCentcomm
+  name: radio implant
+  description: This implant grants access to the Centcomm channel without a headset. Only authorized for Centcomm employees.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SubdermalImplant
+  - type: RadioImplant
+    radioChannels:
+    - CentCom

Resources/Prototypes/Entities/Objects/Misc/tiles.yml

@@ -40,6 +40,9 @@
     damage:
       types:
         Blunt: 5
+  - type: GuideHelp
+    guides:
+    - ExpandingRepairingStation
 
 - type: entity
   name: steel dark checker tile
@@ -1548,6 +1551,23 @@
   - type: Stack
     stackType: FloorTileAstroSnow
 
+- type: entity
+  id: FloorTileItemAstroAsteroidSand
+  parent: FloorTileItemBase
+  name: asteroid astro-sand
+  description: Fake sand. Luckily, it's not as coarse as the real thing.
+  components:
+  - type: Sprite
+    state: asteroid
+  - type: Item
+    heldPrefix: asteroid
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorAstroAsteroidSand
+  - type: Stack
+    stackType: FloorTileAstroAsteroidSand
+
 - type: entity
   name: large wood floor
   parent: FloorTileItemBase

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -570,7 +570,7 @@
   id: BorgModuleOperative
   parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
   name: operative cyborg module
-  description: A module that comes with a crowbar, an Emag and a syndicate pinpointer.
+  description: A module that comes with a crowbar, an Emag, an Access Breaker and a syndicate pinpointer.
   components:
     - type: Sprite
       layers:
@@ -580,6 +580,7 @@
       items:
       - Crowbar
       - Emag
+      - AccessBreaker
       - PinpointerSyndicateNuclear
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }

Resources/Prototypes/Entities/Objects/Specific/atmos.yml

@@ -32,3 +32,9 @@
     materialComposition:
       Steel: 400
       Glass: 100
+  - type: GuideHelp
+    guides:
+    - AtmosTools
+    - PipeNetworks
+    - Pipes
+    - GasCanisters

Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml

@@ -149,3 +149,18 @@
         reagents:
           - ReagentId: Chlorine
             Quantity: 5
+            
+- type: entity
+  id: PlasmaChemistryVial
+  parent: BaseChemistryEmptyVial
+  suffix: plasma
+  components:
+  - type: Label
+    currentLabel: reagent-name-plasma
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 10
+        reagents:
+          - ReagentId: Plasma
+            Quantity: 10

Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml

@@ -0,0 +1,22 @@
+- type: entity
+  parent: [BaseItem, BaseSyndicateContraband]
+  id: AccessBreakerUnlimited
+  suffix: Unlimited
+  name: authentication disruptor
+  description: A hacked access configurator, specialized to unlock and erase access from digital locks.
+  components:
+  - type: Emag
+    emagType: Access
+  - type: Sprite
+    sprite: Objects/Tools/access_breaker.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Tools/access_breaker.rsi
+
+- type: entity
+  parent: AccessBreakerUnlimited
+  id: AccessBreaker
+  suffix: Limited
+  components:
+  - type: LimitedCharges
+  - type: AutoRecharge

Resources/Prototypes/Entities/Objects/Tools/blueprint.yml

@@ -37,3 +37,14 @@
   - type: Blueprint
     providedRecipes:
     - SeismicCharge
+
+- type: entity
+  parent: BaseBlueprint
+  id: BlueprintDoubleEmergencyTank
+  name: double emergency tank blueprint
+  description: A blueprint with a schematic of a double emergency tank. It can be inserted into an autolathe.
+  components:
+  - type: Blueprint
+    providedRecipes:
+    - DoubleEmergencyOxygenTank
+    - DoubleEmergencyNitrogenTank

Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml

@@ -29,6 +29,10 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 15
+  - type: GuideHelp
+    guides:
+    - VoltageNetworks
+    - Power
 
 - type: entity
   id: CableHVStack

Resources/Prototypes/Entities/Objects/Tools/emag.yml

@@ -3,7 +3,7 @@
   id: EmagUnlimited
   suffix: Unlimited
   name: cryptographic sequencer
-  description: The all-in-one hacking solution. The thinking man's lockpick. The iconic EMAG.
+  description: The all-in-one hacking solution. Friend of any syndicate. The iconic EMAG.
   components:
   - type: Emag
   - type: Sprite

Resources/Prototypes/Entities/Objects/Tools/flashlights.yml

@@ -87,9 +87,10 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellHigh
+        startingItem: PowerCellMedium
   - type: HandheldLight
     addPrefix: false
+    wattage: 0.5
   - type: ToggleableLightVisuals
     inhandVisuals:
       left:

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -126,6 +126,9 @@
       Steel: 100
   - type: StaticPrice
     price: 22
+  - type: GuideHelp
+    guides:
+    - Construction
 
 - type: entity
   name: multitool
@@ -174,6 +177,12 @@
       Plastic: 100
   - type: StaticPrice
     price: 56
+  - type: GuideHelp
+    guides:
+    - Networking
+    - WirePanels
+    - Airlocks
+    - InspectingPower
 
 - type: entity
   name: network configurator
@@ -224,7 +233,7 @@
       price: 56
     - type: GuideHelp
       guides:
-      - NetworkConfigurator
+      - Networking
 
 #Power tools
 #Later on these should switch probably switch damage when changing the tool behavior.

Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml

@@ -47,6 +47,11 @@
     layers:
     - state: icon
       map: ["base"]
+  - type: Clothing
+    sprite: Objects/Weapons/Bombs/c4.rsi
+    slots:
+    - HEAD
+    quickEquip: false
   - type: OnUseTimerTrigger
     delay: 10
     delayOptions: [10, 30, 60, 120, 300]

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -22,7 +22,7 @@
 - type: entity
   id: ShellShotgunBeanbag
   name: shell (.50 beanbag)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
   components:
   - type: Tag
     tags:
@@ -55,7 +55,7 @@
 - type: entity
   id: ShellShotgunFlare
   name: shell (.50 flare)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
   components:
   - type: Tag
     tags:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml

@@ -7,7 +7,10 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 40
-        Structural: 30
+        Piercing: 75
+        Structural: 226
+    penetrationThreshold: 360
+    penetrationDamageTypeRequirement:
+    - Structural
   - type: StaminaDamageOnCollide
-    damage: 35
+    damage: 60

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml

@@ -98,10 +98,10 @@
     stateLocked: cursed_door
     stateUnlocked: decursed_door
   - type: Lock
-    breakOnEmag: false
+    breakOnAccessBreaker: false
   - type: AccessReader
     access: [["Wizard"]]
-    breakOnEmag: false
+    breakOnAccessBreaker: false
   - type: Projectile
     deleteOnCollide: false
     onlyCollideWhenShot: true

Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -106,9 +106,9 @@
     maxAngle: 32
     shotsPerBurst: 5
     availableModes:
-    - SemiAuto
     - Burst
     - FullAuto
+    - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
   - type: ChamberMagazineAmmoProvider
@@ -142,13 +142,14 @@
     - type: Gun
       minAngle: 21
       maxAngle: 32
-      fireRate: 12
+      fireRate: 6
       burstFireRate: 12
-      selectedMode: Burst
       soundGunshot:
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
-        - Burst
+      - Burst
+      - FullAuto
+      - SemiAuto
       shotsPerBurst: 3
       burstCooldown: 0.25
     - type: ItemSlots
@@ -258,9 +259,9 @@
     burstCooldown: 0.2
     burstFireRate: 7
     availableModes:
-    - SemiAuto
     - Burst
     - FullAuto
+    - SemiAuto
   - type: ItemSlots
     slots:
       gun_magazine:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -48,7 +48,7 @@
   # Don't parent to BaseWeaponShotgun because it differs significantly
   parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband]
   id: WeaponShotgunBulldog
-  description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells.
+  description: An automatic magazine-fed shotgun for close-quarters combat. Kicks like a mule on steroids. Uses .50 shotgun shells.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
@@ -103,7 +103,7 @@
 
 - type: entity
   name: double-barreled shotgun
-  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband]
+  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityBartenderContraband]
   id: WeaponShotgunDoubleBarreled
   description: An immortal classic. Uses .50 shotgun shells.
   components:
@@ -116,7 +116,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
-    fireRate: 2
+    fireRate: 3
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -138,8 +138,8 @@
   name: Enforcer
   parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband]
   id: WeaponShotgunEnforcer
-  description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells.
-  components:
+  description: A premium semi-automatic shotgun, and the pride of all security forces. Uses .50 shotgun shells.
+  components: # intend for Enforcer to have wider choke for semi-auto function
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
   - type: Clothing
@@ -161,8 +161,8 @@
   name: Kammerer
   parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband]
   id: WeaponShotgunKammerer
-  description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
-  components:
+  description: An old yet faithful design, and a favorite among irregular forces of many worlds. Uses .50 shotgun shells.
+  components: # intend for Kammerer to have tighter choke for slower fire rate and/or manual cycling
   - type: Item
     size: Normal
     shape:
@@ -173,18 +173,18 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
-  - type: BallisticAmmoProvider
-    capacity: 4
+  - type: Gun
+    fireRate: 1
   - type: Tag
     tags:
     - WeaponShotgunKammerer
 
 - type: entity
   name: sawn-off shotgun
-  parent: BaseWeaponShotgun
+  parent: [ BaseWeaponShotgun, BaseSecurityBartenderContraband ]
   id: WeaponShotgunSawn
   description: Groovy! Uses .50 shotgun shells.
-  components:
+  components: # needs to be super inaccurate because you don't need to wield it
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
   - type: Clothing
@@ -193,7 +193,7 @@
     size: Small
     sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi
   - type: Gun
-    fireRate: 4
+    fireRate: 3
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -57,12 +57,27 @@
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
+  - type: GunRequiresWield
+  - type: Gun
+    fireRate: 0.4
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
   - type: BallisticAmmoProvider
     whitelist:
       tags:
       - CartridgeAntiMateriel
     capacity: 5
     proto: CartridgeAntiMateriel
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.25
+    sprintModifier: 0.25
+  - type: CursorOffsetRequiresWield
+  - type: EyeCursorOffset
+    maxOffset: 3
+    pvsIncrease: 0.3
 
 - type: entity
   name: musket

Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml

@@ -194,7 +194,6 @@
       doAfterDuration: 4.0
     - type: Contraband
       severity: Syndicate
-      allowedDepartments: null
   - type: Sprite
     sprite: Objects/Weapons/Melee/e_dagger.rsi
     layers:

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -36,7 +36,7 @@
         Blunt: 7
     bluntStaminaDamageFactor: 2.0
     angle: 60
-    animation: WeaponArcSlash
+    animation: WeaponArcThrust
   - type: StaminaDamageOnHit
     damage: 35
     sound: /Audio/Weapons/egloves.ogg

Resources/Prototypes/Entities/Objects/base_contraband.yml

@@ -5,8 +5,6 @@
   components:
   - type: Contraband
     severity: Syndicate
-    # no one should be carrying this around visibly!
-    allowedDepartments: null
 
 # minor contraband not departmentally restricted -- improvised weapons etc
 - type: entity
@@ -15,8 +13,6 @@
   components:
   - type: Contraband
     severity: Minor
-    # according to space law no dept is authorized to have
-    allowedDepartments: null
 
 # major contraband, for things like guns or weaponry that don't belong to any department and aren't syndicate specific
 - type: entity
@@ -25,7 +21,6 @@
   components:
   - type: Contraband
     severity: Major
-    allowedDepartments: null
 
 # minor contraband by default restricted to security only
 - type: entity
@@ -34,6 +29,7 @@
   components:
   - type: Contraband
     severity: Restricted
+    allowedDepartments: [ Security ]
 
 # one department restricted contraband
 - type: entity
@@ -157,6 +153,33 @@
   - type: Contraband
     allowedDepartments: [ Medical, Science ]
 
+# contraband restricted by job by some degree
+- type: entity
+  id: BaseSecurityBartenderContraband
+  parent: BaseRestrictedContraband
+  abstract: true
+  components:
+  - type: Contraband
+    allowedDepartments: [ Security ]
+    allowedJobs: [ Bartender ]
+
+- type: entity
+  id: BaseSecurityLawyerContraband
+  parent: BaseRestrictedContraband
+  abstract: true
+  components:
+  - type: Contraband
+    allowedDepartments: [ Security ]
+    allowedJobs: [ Lawyer ]
+
+- type: entity
+  id: BaseJanitorContraband
+  parent: BaseRestrictedContraband
+  abstract: true
+  components:
+  - type: Contraband
+    allowedJobs: [ Janitor ]
+
 # for ~objective items
 - type: entity
   id: BaseGrandTheftContraband

Resources/Prototypes/Entities/Stations/base.yml

@@ -67,6 +67,7 @@
           - /Maps/Ruins/djstation.yml
           - /Maps/Ruins/empty_flagship.yml
           - /Maps/Ruins/old_ai_sat.yml
+          - /Maps/Ruins/ruined_prison_ship.yml
           - /Maps/Ruins/syndicate_dropship.yml
           - /Maps/Ruins/whiteship_ancient.yml
           - /Maps/Ruins/whiteship_bluespacejumper.yml

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -64,6 +64,15 @@
     containers:
       board: [ DoorElectronicsBar ]
 
+- type: entity
+  parent: AirlockServiceLocked
+  id: AirlockBarKitchenLocked
+  suffix: Bar&Kitchen, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBarKitchen ]
+
 - type: entity
   parent: AirlockHydroponics
   id: AirlockHydroponicsLocked
@@ -470,6 +479,16 @@
     containers:
       board: [ DoorElectronicsBar ]
 
+- type: entity
+  parent: AirlockServiceGlassLocked
+  id: AirlockBarKitchenGlassLocked
+  suffix: Bar&Kitchen, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBarKitchen ]
+
+
 - type: entity
   parent: AirlockExternalGlass
   id: AirlockExternalGlassLocked
@@ -904,6 +923,15 @@
     containers:
       board: [ DoorElectronicsBar ]
 
+- type: entity
+  parent: AirlockMaintServiceLocked
+  id: AirlockMaintBarKitchenLocked
+  suffix: Bar&Kitchen, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBarKitchen ]
+
 - type: entity
   parent: AirlockMaintServiceLocked
   id: AirlockMaintChapelLocked

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml

@@ -31,11 +31,16 @@
       shader: unshaded
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - state: electrified
+    - state: electrified_ai
       sprite: Interface/Misc/ai_hud.rsi
       shader: unshaded
       visible: false
       map: ["enum.ElectrifiedLayers.HUD"]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.Sparks"]
   - type: AnimationPlayer
   - type: Physics
   - type: Fixtures
@@ -77,6 +82,12 @@
   - type: NavMapDoor
   - type: DoorBolt
   - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ElectrifiedVisuals.ShowSparks:
+        enum.ElectrifiedLayers.Sparks:
+          True: { visible: True }
+          False: { visible: False }
   - type: WiresVisuals
   - type: ElectrocutionHUDVisuals
   - type: ApcPowerReceiver
@@ -163,6 +174,11 @@
       # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
   - type: PryUnpowered
   - type: BlockWeather
+  - type: GuideHelp
+    guides:
+    - Airlocks
+    - WirePanels
+    - Networking
   placement:
     mode: SnapgridCenter
 

Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml

@@ -27,11 +27,16 @@
       shader: unshaded
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - state: electrified
+    - state: electrified_ai
       sprite: Interface/Misc/ai_hud.rsi
       shader: unshaded
       visible: false
       map: ["enum.ElectrifiedLayers.HUD"]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.Sparks"]
   - type: AnimationPlayer
   - type: Physics
   - type: Fixtures
@@ -70,6 +75,12 @@
   - type: AccessReader
     containerAccessProvider: board
   - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ElectrifiedVisuals.ShowSparks:
+        enum.ElectrifiedLayers.Sparks:
+          True: { visible: True }
+          False: { visible: False }
   - type: WiresVisuals
   - type: ElectrocutionHUDVisuals
   - type: ApcPowerReceiver

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -23,6 +23,9 @@
       cost: 4
       delay: 6
       fx: EffectRCDDeconstruct6
+    - type: Tag
+      tags:
+      - ForceFixRotations # Allow fixrotations to target these
     - type: Destructible
       thresholds:
       - trigger:
@@ -116,6 +119,11 @@
       enabled: false
       castShadows: false
     - type: NavMapDoor
+    - type: GuideHelp
+      guides:
+      - FireAndGasControl
+      - Fires
+      - Spacing
 
 - type: entity
   id: Firelock
@@ -187,6 +195,9 @@
           - GlassAirlockLayer
     - type: Occluder
       enabled: false
+    - type: Tag
+      tags:
+      - ForceNoFixRotations # Prevent fixrotations from targeting these, since the base Firelock is targeted
     - type: Door
       occludes: false
     - type: Physics

Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml

@@ -65,6 +65,7 @@
     tags:
     - Structure
     - Wall
+    - ForceNoFixRotations # Don't want the fixrotations command to target these
   - type: ContainerContainer
     containers:
       battery-container: !type:Container

Resources/Prototypes/Entities/Structures/Doors/Shutter/access.yml

@@ -0,0 +1,23 @@
+#Blast door
+
+- type: entity
+  parent: BlastDoor
+  id: BlastDoorCentralCommand
+  suffix: Central Command, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
+
+#Window shutters
+
+- type: entity
+  parent: ShuttersWindow
+  id: ShuttersWindowCentralCommand
+  suffix: Central Command, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
+  - type: AccessReader
+    containerAccessProvider: board

Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml

@@ -5,6 +5,7 @@
   description: This one says 'BLAST DONGER'.
   components:
   - type: AccessReader
+    containerAccessProvider: board
   - type: Sprite
     sprite: Structures/Doors/Shutters/blastdoor.rsi
     layers:

Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml

@@ -34,6 +34,9 @@
     containers:
       board: !type:Container
   - type: NavMapDoor
+  - type: Tag
+    tags:
+    - ForceNoFixRotations # Don't want the fixrotations command to target these
   - type: Door
     openDrawDepth: BlastDoors
     closedDrawDepth: BlastDoors

Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml

@@ -43,11 +43,16 @@
       map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - state: electrified
+    - state: electrified_ai
       sprite: Interface/Misc/ai_hud.rsi
       shader: unshaded
       visible: false
       map: ["enum.ElectrifiedLayers.HUD"]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.Sparks"]
   - type: AnimationPlayer
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
@@ -142,6 +147,12 @@
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
   - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ElectrifiedVisuals.ShowSparks:
+        enum.ElectrifiedLayers.Sparks:
+          True: { visible: True }
+          False: { visible: False }
   - type: WiresVisuals
   - type: ElectrocutionHUDVisuals
   - type: Airtight
@@ -183,11 +194,16 @@
     - state: panel_open
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       visible: false
-    - state: electrified
+    - state: electrified_ai
       sprite: Interface/Misc/ai_hud.rsi
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.HUD" ]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: [ "enum.ElectrifiedLayers.Sparks" ]
   - type: Damageable
     damageModifierSet: RGlass
   - type: Destructible
@@ -249,11 +265,16 @@
     - state: panel_open
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       visible: false
-    - state: electrified
+    - state: electrified_ai
       sprite: Interface/Misc/ai_hud.rsi
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.HUD" ]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: [ "enum.ElectrifiedLayers.Sparks" ]
   - type: Destructible
     thresholds:
     - trigger:
@@ -310,11 +331,16 @@
     - state: panel_open
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       visible: false
-    - state: electrified
+    - state: electrified_ai
       sprite: Interface/Misc/ai_hud.rsi
       shader: unshaded
       visible: false
-      map: ["enum.ElectrifiedLayers.HUD"]
+      map: [ "enum.ElectrifiedLayers.HUD" ]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: [ "enum.ElectrifiedLayers.Sparks" ]
   - type: Destructible
     thresholds:
     - trigger:
@@ -376,11 +402,16 @@
     - state: panel_open
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       visible: false
-    - state: electrified
+    - state: electrified_ai
       sprite: Interface/Misc/ai_hud.rsi
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.HUD" ]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: [ "enum.ElectrifiedLayers.Sparks" ]
   - type: Destructible
     thresholds:
     - trigger:
@@ -437,11 +468,16 @@
     - state: panel_open
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       visible: false
-    - state: electrified
+    - state: electrified_ai
       sprite: Interface/Misc/ai_hud.rsi
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.HUD" ]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: [ "enum.ElectrifiedLayers.Sparks" ]
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml

@@ -36,6 +36,9 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepHull
+  - type: Tag
+    tags:
+    - ForceFixRotations
 
 - type: entity
   id: CounterBase

Resources/Prototypes/Entities/Structures/Furniture/carpets.yml

@@ -14,7 +14,9 @@
     key: full
     base: carpet_
   - type: Tag
-    tags: [ Carpet ]
+    tags:
+    - Carpet
+    - ForceFixRotations
   - type: Physics
     canCollide: false
   - type: Fixtures
@@ -22,12 +24,12 @@
     damageContainer: Inorganic
   - type: Destructible
     thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 10
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
         behaviors:
-          - !type:DoActsBehavior
-            acts: [ "Destruction" ]
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
   - type: Butcherable
     butcheringType: Knife
     butcherDelay: 2

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -48,6 +48,10 @@
             type: AtmosAlertsComputerBoundUserInterface
         enum.WiresUiKey.Key:
           type: WiresBoundUserInterface
+  - type: GuideHelp
+    guides:
+    - AtmosphericAlertsComputer
+    - DeviceMonitoringAndControl
 
 - type: entity
   parent: BaseComputerAiAccess
@@ -81,6 +85,10 @@
         type: AtmosMonitoringConsoleBoundUserInterface
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
+  - type: GuideHelp
+    guides:
+    - AtmosphericNetworkMonitor
+    - DeviceMonitoringAndControl
 
 - type: entity
   parent: BaseComputer
@@ -148,6 +156,9 @@
       board: !type:Container
         ents: []
       disk_slot: !type:ContainerSlot {}
+  - type: GuideHelp
+    guides:
+    - ShuttleCraft
 
 - type: entity
   parent: BaseComputerShuttle
@@ -610,7 +621,7 @@
     color: "#3c5eb5"
   - type: Tag
     tags:
-    - EmagImmune
+    - AccessBreakerImmune
   - type: ItemSlots
   - type: ContainerContainer
     containers:
@@ -741,6 +752,10 @@
     radius: 1.5
     energy: 1.6
     color: "#e6e227"
+  - type: GuideHelp
+    guides:
+    - SolarPanels
+    - Power
 
 - type: entity
   parent: BaseComputerAiAccess

Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml

@@ -7,7 +7,7 @@
   - type: Sprite
     noRot: true
     sprite: Structures/Machines/artifact_analyzer.rsi
-    drawdepth: FloorObjects
+    drawdepth: HighFloorObjects
     layers:
     - state: icon
     - state: unshaded

Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml

@@ -35,7 +35,7 @@
       visible: false
       map: ["enum.FatExtractorVisualLayers.Smoke"]
   - type: Lock
-    breakOnEmag: false
+    breakOnAccessBreaker: false
   - type: GenericVisualizer
     visuals:
       enum.StorageVisuals.Open:

Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml

@@ -101,6 +101,7 @@
     responsePings: false
     notifyAdmins: true
   - type: Emagged
+    emagType: Interaction
 
 - type: entity
   parent: FaxMachineBase

Resources/Prototypes/Entities/Structures/Machines/holopad.yml

@@ -22,7 +22,7 @@
   - type: StationAiVision
   - type: Sprite
     sprite: Structures/Machines/holopad.rsi
-    drawdepth: FloorObjects
+    drawdepth: HighFloorObjects
     snapCardinals: true
     layers:
     - state: base
@@ -155,12 +155,7 @@
   components:
   - type: Transform
     anchored: true
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
-    offset: -0.02, 0.45
-    overrideDir: South
-    enableOverrideDir: true
+  - type: Sprite # Sprite data is dynamically set in Client.HolopadSystem
   - type: Appearance
   - type: TypingIndicator
     proto: robot
@@ -177,6 +172,7 @@
     alpha: 0.9
     intensity: 2
     scrollRate: 0.125
+    offset: -0.02, 0.45
   - type: Tag
     tags:
     - HideContextMenu

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

@@ -195,7 +195,6 @@
       - SubstationMachineCircuitboard
       - WallmountSubstationElectronics
       - CellRechargerCircuitboard
-      - BorgChargerCircuitboard
       - WeaponCapacitorRechargerCircuitboard
       - HandheldStationMap
       - ClothingHeadHatWelding
@@ -350,6 +349,7 @@
       - FauxTileJungleAstroGrass
       - FauxTileAstroIce
       - FauxTileAstroSnow
+      - FauxTileAstroAsteroidSand
       - OreBagOfHolding
       - DeviceQuantumSpinInverter
   - type: EmagLatheRecipes
@@ -452,6 +452,7 @@
     - SpaceHeaterMachineCircuitBoard
     - CutterMachineCircuitboard
     - SalvageMagnetMachineCircuitboard
+    - BorgChargerCircuitboard
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml

@@ -75,7 +75,10 @@
       path: /Audio/Ambience/Objects/gas_pump.ogg
   - type: AtmosMonitoringConsoleDevice
     navMapBlip: GasFlowRegulator
-    
+  - type: GuideHelp
+    guides:
+    - Pumps
+
 - type: entity
   parent: GasBinaryBase
   id: GasVolumePump
@@ -134,7 +137,10 @@
     - type: WiredNetworkConnection
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasFlowRegulator
-    
+    - type: GuideHelp
+      guides:
+      - Pumps
+
 - type: entity
   parent: GasBinaryBase
   id: GasPassiveGate
@@ -165,7 +171,10 @@
         path: /Audio/Ambience/Objects/gas_hiss.ogg
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasValve
-      
+    - type: GuideHelp
+      guides:
+      - PassiveGate
+
 - type: entity
   parent: GasBinaryBase
   id: GasValve
@@ -215,7 +224,10 @@
         path: /Audio/Ambience/Objects/gas_hiss.ogg
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasValve
-      
+    - type: GuideHelp
+      guides:
+      - ManualValve
+
 - type: entity
   parent: GasBinaryBase
   id: SignalControlledValve
@@ -276,7 +288,10 @@
       path: /Audio/Ambience/Objects/gas_hiss.ogg
   - type: AtmosMonitoringConsoleDevice
     navMapBlip: GasValve
-      
+  - type: GuideHelp
+    guides:
+    - SignalValve
+
 - type: entity
   parent: GasBinaryBase
   id: GasPort
@@ -307,7 +322,10 @@
       node: port
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasVentOpening
-      
+    - type: GuideHelp
+      guides:
+      - GasCanisters
+
 - type: entity
   parent: GasVentPump
   id: GasDualPortVentPump
@@ -365,7 +383,10 @@
       enabled: true
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasVentOpening
-      
+    - type: GuideHelp
+      guides:
+      - AirVent
+
 - type: entity
   parent: [ BaseMachine, ConstructibleMachine ]
   id: GasRecycler
@@ -429,7 +450,7 @@
     board: GasRecyclerMachineCircuitboard
   - type: AtmosMonitoringConsoleDevice
     navMapBlip: GasValve
-    
+
 - type: entity
   parent: GasBinaryBase
   id: HeatExchanger
@@ -471,6 +492,9 @@
     node: radiator
   - type: AtmosMonitoringConsoleDevice
     navMapBlip: Thermoregulator
+  - type: GuideHelp
+    guides:
+    - Radiators
 
 - type: entity
   parent: HeatExchanger

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml

@@ -2,7 +2,7 @@
   parent: [AirSensorBase, GasPipeBase]
   id: GasPipeSensor
   name: gas pipe sensor
-  description: Reports on the status of the gas in the attached pipe network. 
+  description: Reports on the status of the gas in the attached pipe network.
   placement:
     mode: SnapgridCenter
   components:
@@ -16,8 +16,8 @@
     - map: ["base"]
       state: base
     - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights 
-      shader: unshaded      
+      state: lights
+      shader: unshaded
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -34,7 +34,7 @@
   - type: ExtensionCableReceiver
   - type: Construction
     graph: GasPipeSensor
-    node: sensor 
+    node: sensor
   - type: NodeContainer
     nodes:
       monitored:
@@ -44,34 +44,38 @@
   - type: Tag
     tags:
     - AirSensor
-    - Unstackable    
+    - Unstackable
+  - type: GuideHelp
+    guides:
+    - AtmosphericNetworkMonitor
+    - DeviceMonitoringAndControl
 
 - type: entity
-  parent: GasPipeSensor 
-  id: GasPipeSensorDistribution 
+  parent: GasPipeSensor
+  id: GasPipeSensorDistribution
   suffix: Distribution
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-distribution-loop
 
 - type: entity
-  parent: GasPipeSensor 
-  id: GasPipeSensorWaste  
+  parent: GasPipeSensor
+  id: GasPipeSensorWaste
   suffix: Waste
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-waste-loop
 
 - type: entity
-  parent: GasPipeSensor 
-  id: GasPipeSensorMixedAir 
+  parent: GasPipeSensor
+  id: GasPipeSensorMixedAir
   suffix: Mixed air
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-mixed-air
 
 - type: entity
-  parent: GasPipeSensor 
+  parent: GasPipeSensor
   id: GasPipeSensorTEGHot
   suffix: TEG hot
   components:
@@ -79,9 +83,9 @@
     currentLabel: gas-pipe-sensor-teg-hot-loop
 
 - type: entity
-  parent: GasPipeSensor  
+  parent: GasPipeSensor
   id: GasPipeSensorTEGCold
   suffix: TEG cold
   components:
   - type: Label
-    currentLabel: gas-pipe-sensor-teg-cold-loop
+    currentLabel: gas-pipe-sensor-teg-cold-loop

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml

@@ -32,6 +32,9 @@
     - type: GasMiner
       maxExternalPressure: 300
       spawnAmount: 400
+    - type: GuideHelp
+      guides:
+      - GasMiningAndStorage
 
 - type: entity
   name: O2 gas miner

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml

@@ -84,6 +84,10 @@
   - type: Construction
     graph: GasPipe
     node: half
+  - type: GuideHelp
+    guides:
+    - Pipes
+    - PipeNetworks
 
 - type: entity
   parent: GasPipeBase
@@ -117,6 +121,10 @@
         Blunt: 8
     soundHit:
       collection: MetalThud # this NEEDS to changed to the metal pipe falling sound effect on april first every year
+  - type: GuideHelp
+    guides:
+    - Pipes
+    - PipeNetworks
 
 - type: entity
   parent: GasPipeBase
@@ -157,6 +165,10 @@
     damage:
       types:
         Blunt: 8 # Woe, pipe be upon ye!
+  - type: GuideHelp
+    guides:
+    - Pipes
+    - PipeNetworks
 
 - type: entity
   parent: GasPipeBase
@@ -193,6 +205,10 @@
         Blunt: 10
     soundHit:
       collection: MetalThud
+  - type: GuideHelp
+    guides:
+    - Pipes
+    - PipeNetworks
 
 - type: entity
   parent: GasPipeBase
@@ -228,6 +244,10 @@
         Blunt: 10
     soundHit:
       collection: MetalThud
+  - type: GuideHelp
+    guides:
+    - Pipes
+    - PipeNetworks
 
 - type: entity
   id: GasPipeBroken
@@ -253,3 +273,7 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: GuideHelp
+    guides:
+    - Pipes
+    - PipeNetworks

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml

@@ -95,6 +95,9 @@
                 max: 2
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
+  - type: GuideHelp
+    guides:
+    - PortableScrubber
 
 - type: entity
   id: SpaceHeater
@@ -180,6 +183,9 @@
                 max: 3
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
+  - type: GuideHelp
+    guides:
+    - Thermomachines
 
 - type: entity
   parent: SpaceHeater

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml

@@ -72,7 +72,10 @@
         path: /Audio/Ambience/Objects/gas_hiss.ogg
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasFlowRegulator
-      
+    - type: GuideHelp
+      guides:
+      - MixingAndFiltering
+
 - type: entity
   parent: GasFilter
   id: GasFilterFlipped
@@ -162,7 +165,10 @@
         path: /Audio/Ambience/Objects/gas_hiss.ogg
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasFlowRegulator
-      
+    - type: GuideHelp
+      guides:
+      - MixingAndFiltering
+
 - type: entity
   parent: GasMixer
   id: GasMixerFlipped
@@ -210,7 +216,7 @@
   parent: GasPipeBase
   id: PressureControlledValve
   name: pneumatic valve
-  description: Valve controlled by pressure.
+  description: A bidirectional valve controlled by pressure. Opens if the output pipe is lower than the pressure of the control pipe by 101.325 kPa.
   placement:
     mode: SnapgridCenter
   components:
@@ -262,4 +268,9 @@
       graph: GasTrinary
       node: pneumaticvalve
     - type: AtmosMonitoringConsoleDevice
-      navMapBlip: GasFlowRegulator
+      navMapBlip: GasFlowRegulator
+    - type: GuideHelp
+      guides:
+      - PneumaticValve
+      - Pumps
+      - Valves

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml

@@ -70,7 +70,11 @@
     - type: Weldable
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasVentOpening
-      
+    - type: GuideHelp
+      guides:
+      - AirVent
+      - DeviceMonitoringAndControl
+
 - type: entity
   parent: GasUnaryBase
   id: GasPassiveVent
@@ -96,7 +100,10 @@
       node: passivevent
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasVentOpening
-      
+    - type: GuideHelp
+      guides:
+      - PassiveVent
+
 - type: entity
   parent: [GasUnaryBase, AirSensorBase]
   id: GasVentScrubber
@@ -147,7 +154,11 @@
     - type: Weldable
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasVentScrubber
-      
+    - type: GuideHelp
+      guides:
+      - AirScrubber
+      - DeviceMonitoringAndControl
+
 - type: entity
   parent: GasUnaryBase
   id: GasOutletInjector
@@ -188,7 +199,10 @@
       - enum.LightLayers.Unshaded
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasVentOpening
-      
+    - type: GuideHelp
+      guides:
+      - AirInjector
+
 - type: entity
   parent: [ BaseMachinePowered, ConstructibleMachine ]
   id: BaseGasThermoMachine
@@ -234,7 +248,10 @@
     - type: PowerSwitch
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: Thermoregulator
-      
+    - type: GuideHelp
+      guides:
+      - Thermomachines
+
 - type: entity
   parent: BaseGasThermoMachine
   id: GasThermoMachineFreezer
@@ -441,3 +458,6 @@
   - type: PowerSwitch
   - type: AtmosMonitoringConsoleDevice
     navMapBlip: Thermoregulator
+  - type: GuideHelp
+    guides:
+    - GasCondensing

Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml

@@ -26,7 +26,8 @@
   - type: Pullable
   - type: Clickable
   - type: GuideHelp
-    guides: [ Singularity, Power ]
+    guides:
+    - SingularityTeslaEngine
   - type: Appearance
 
 - type: entity

Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml

@@ -46,8 +46,10 @@
             Level1: {state: particle1}
             Level2: {state: particle2}
             Level3: {state: particle3}
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
+    - type: GuideHelp # why does this even have a guidebook link in the first place
+      guides:
+        - SingularityTeslaEngine
+        - Power
 
 - type: entity
   name: anti particles

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml

@@ -68,7 +68,9 @@
   - type: Rotatable
   - type: Pullable
   - type: GuideHelp
-    guides: [ Singularity, Power ]
+    guides:
+    - SingularityEngine
+    - Power
   - type: ContainerContainer
     containers:
       gas_tank: !type:ContainerSlot {}