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	Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
	Mon, 9 Sep 2024 19:36:25 +0000 (22:36 +0300)
committer	GitHub <noreply@github.com>
	Mon, 9 Sep 2024 19:36:25 +0000 (13:36 -0600)
commit	2263311ce2899ec7fd2845f81736b70f787017bc
tree	303e1a8cb4d95958708ad2c99889e1d1a24271df	tree \| snapshot
parent	2452e4647652a09a968ebc1cc09e9ccd301720f4	commit \| diff

Fix some contraband issues (#31606)

* Fix some contraband issues

* Flaming fire axe to Syndie contraband

* Add Central Command department and contraband group

* Restricted encryption keys

* ERT gas mask

* Thieving beacon

* Bladed flatcaps

* Advanced circular saw and thief toolbox

* Acolyte armor

* Magazines and cartridges

* SMG magazines

* Grenades

* Mercenary clothing and combat gloves

* ERT, Deathsquad and Central Command Official items

* Update

* Who the fuck putted ERT into fun?!

* Fix

* Yeah

* I forgot

54 files changed:

Resources/Locale/en-US/job/department-desc.ftl		diff \| blob \| history
Resources/Locale/en-US/job/department.ftl		diff \| blob \| history
Resources/Locale/en-US/job/job-names.ftl		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Items/misc.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/Belt/belts.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Ears/headsets.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.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/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/wintercoats.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Shoes/boots.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/toolbox.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.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/Throwable/grenades.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/base_contraband.yml		diff \| blob \| history
Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml	[moved from Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml with 100% similarity]	blob \| history
Resources/Prototypes/Roles/Jobs/CentComm/official.yml	[moved from Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml with 100% similarity]	blob \| history
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml		diff \| blob \| history
Resources/Prototypes/Roles/Jobs/departments.yml		diff \| blob \| history
Resources/Prototypes/Roles/play_time_trackers.yml		diff \| blob \| history

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

RSS Atom