git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	Kara <lunarautomaton6@gmail.com>
	Mon, 12 Aug 2024 03:57:49 +0000 (22:57 -0500)
committer	GitHub <noreply@github.com>
	Mon, 12 Aug 2024 03:57:49 +0000 (23:57 -0400)
commit	485caa4553f3f96ad8b67501edb80d2ff9d85a51
tree	2aedd001b77512c976726e30c1f7e17da3618f07	tree \| snapshot
parent	9f180e4f622768d1845477198ac86dde3fe94e03	commit \| diff

Contraband marking & examining (#28688)

* System & loc strings

* pass over syndie contraband

* fixes

* grand theft pass

* contrabandexamine -> contraband

* examine text generation update

* all composition parents necessary

* bring back minor contra so it has a less confusing message

* minor

* weapon pass

* jumpsuit pass

* feet pass

* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH

* head

* AUUUUGH

* ear

* belt

* back

* fix

* bro

* rename for more clarity

* do da review

* add cvar for contraband examine

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

105 files changed:

Content.Server/Medical/SuitSensors/SuitSensorSystem.cs		diff \| blob \| history
Content.Shared/Access/Components/IdCardComponent.cs		diff \| blob \| history
Content.Shared/Access/Systems/SharedIdCardSystem.cs		diff \| blob \| history
Content.Shared/CCVar/CCVars.cs		diff \| blob \| history
Content.Shared/Contraband/ContrabandComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Contraband/ContrabandSeverityPrototype.cs	[new file with mode: 0644]	blob
Content.Shared/Contraband/ContrabandSystem.cs	[new file with mode: 0644]	blob
Resources/Locale/en-US/contraband/contraband-severity.ftl	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/Fills/Boxes/general.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Items/briefcases.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Back/backpacks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Back/duffel.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Back/satchel.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Belt/belts.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Ears/headsets.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Eyes/hud.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/hats.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/helmets.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Masks/masks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Neck/mantles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Shoes/boots.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/briefcases.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/implanters.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/paper.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/pen.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Power/powersink.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Shields/shields.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/syndicate.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/emag.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/jammer.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/lantern.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/toolbox.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/security.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/base_contraband.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Structures/Machines/bombs.yml		diff \| blob \| history
Resources/Prototypes/contraband_severities.yml	[new file with mode: 0644]	blob

Форк Space Station 14 с переводами на русский

RSS Atom