]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Job contraband rework (#33385)
authorJohn <35928781+sporkyz@users.noreply.github.com>
Tue, 21 Jan 2025 09:51:27 +0000 (04:51 -0500)
committerGitHub <noreply@github.com>
Tue, 21 Jan 2025 09:51:27 +0000 (10:51 +0100)
commit796f59917283682a9671dcd68fc975f4245afb56
treecb3d9b0fddb797335d773583b0785eba2fcbd845
parentf092ddcb4393240c61921ee8cb68e38a8555d0a9
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>
16 files changed:
Content.Shared/Access/Components/IdCardComponent.cs
Content.Shared/Contraband/ContrabandComponent.cs
Content.Shared/Contraband/ContrabandSeverityPrototype.cs
Content.Shared/Contraband/ContrabandSystem.cs
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
Resources/Prototypes/Entities/Objects/base_contraband.yml
Resources/Prototypes/contraband_severities.yml