diff --git a/Resources/Prototypes/Catalog/Fills/lockers.yml b/Resources/Prototypes/Catalog/Fills/lockers.yml index f2b3c447b9..a86fedc413 100644 --- a/Resources/Prototypes/Catalog/Fills/lockers.yml +++ b/Resources/Prototypes/Catalog/Fills/lockers.yml @@ -56,21 +56,105 @@ id: LockerBoozeFilled suffix: Filled parent: LockerBooze + components: + - type: StorageFill + contents: + - name: ClothingOuterArmorBulletproof + prob: 0.5 + - name: ShotgunSawn + prob: 0.8 + - name: DrinkShaker + prob: 1 + - name: ClothingEyesGlassesBeer + prob: 1 + - name: DrinkBeer + prob: 0.5 + - name: DrinkBottleBeer + prob: 0.5 - type: entity id: LockerQuarterMasterFilled suffix: Filled parent: LockerQuarterMaster + components: + - type: StorageFill + contents: + - name: ClothingNeckCloakQm + prob: 1 + - name: ClothingHeadsetCargo + prob: 1 + - name: PlushieLizard + prob: 0.1 + - name: ClothingHandsGlovesColorBrown + prob: 1 + - name: ClothingOuterSuitFire + prob: 0.5 + - name: ClothingShoesColorBrown + prob: 0.7 + - name: ClothingHeadHatCargosoft + prob: 0.8 + - name: SupplyRequestComputerCircuitboard + prob: 1 + - name: SupplyComputerCircuitboard + prob: 1 - type: entity id: LockerCaptainFilled suffix: Filled parent: LockerCaptain - + components: + - type: StorageFill + contents: + - name: NukeDisk + prob: 1 + - name: CaptainIDCard + prob: 1 + - name: ClothingHeadHatCaptain + prob: 1 + - name: ClothingNeckCloakCap + prob: 1 + - name: ClothingHandsGlovesCaptain + prob: 1 + - name: ClothingOuterHardsuitCap + prob: 1 + - name: TaserGun + prob: 1 + - name: ClothingShoesColorBlack + prob: 0.7 + - name: ClothingHeadHelmetHardsuitCap + prob: 1 + - name: CommsComputerCircuitboard + prob: 1 + - name: ClothingHeadsetAltCommand + prob: 1 + - name: PlushieNuke + prob: 0.1 + - type: entity id: LockerHeadOfPersonnelFilled suffix: Filled parent: LockerHeadOfPersonnel + components: + - type: StorageFill + contents: + - name: ClothingNeckCloakHop + prob: 1 + - name: ClothingHeadHatHopcap + prob: 1 + - name: HoPIDCard + prob: 0.9 + - name: ClothingHeadsetCommand + prob: 1 + - name: BoxPDA + prob: 1 + - name: IDComputerCircuitboard + prob: 1 + - name: TaserGun + prob: 1 + - name: ClothingShoesColorBlack + prob: 0.7 + - name: PlushieLizard + prob: 0.1 - type: entity id: LockerChiefEngineerFilled @@ -83,16 +167,42 @@ - name: ClothingOuterHardsuitEngineeringWhite - name: ClothingMaskBreath - name: OxygenTankFilled + - name: ClothingNeckCloakCe + - name: ClothingEyesGlassesMeson + - name: ClothingBeltChiefEngineerFilled + - name: ClothingHeadHatBeretEngineering - type: entity id: LockerElectricalSuppliesFilled suffix: Filled parent: LockerElectricalSupplies - + components: + - type: StorageFill + contents: + - name: ToolboxElectricalFilled + prob: 0.7 + - name: FirelockElectronics + prob: 0.05 + - name: APCElectronics + prob: 0.1 + - name: MVWireStack + prob: 0.2 + - name: ApcExtensionCableStack + prob: 0.3 + - type: entity id: LockerWeldingSuppliesFilled suffix: Filled parent: LockerWeldingSupplies + components: + - type: StorageFill + contents: + - name: WelderMini + prob: 1 + - name: Welder + prob: 0.1 + - name: ClothingHeadHatWelding + prob: 0.5 - type: entity id: LockerAtmosphericsFilled @@ -122,6 +232,27 @@ id: LockerBotanistFilled suffix: Filled parent: LockerBotanist + components: + - type: StorageFill + contents: + - name: ClothingHandsGlovesLeather + prob: 1 + - name: ClothingHandsGlovesLeather + prob: 0.8 + - name: ClothingOuterApronBotanist + prob: 1 + - name: ClothingOuterApronBotanist + prob: 0.8 + - name: TowercapSeeds + prob: 1 + - name: BananaSeeds + prob: 0.8 + - name: EggySeeds + prob: 0.5 + - name: AppleSeeds + prob: 0.8 + - name: TomatoSeeds + prob: 1 - type: entity id: LockerMedicineFilled @@ -136,37 +267,185 @@ - type: StorageFill contents: - name: ClothingHandsGlovesLatex - prob: 0.4 + prob: 1 + - name: ClothingHeadsetMedical + prob: 1 + # - name: ClothingEyesHudMedical #Removed until working properly + # prob: 1 + - name: ClothingBeltMedical + prob: 1 + - name: ClothingHeadHatSurgcapBlue + prob: 1 + orGroup: Surgcaps + - name: ClothingHeadHatSurgcapGreen + prob: 0.1 + orGroup: Surgcaps + - name: ClothingHeadHatSurgcapPurple + prob: 0.05 + orGroup: Surgcaps + - name: UniformScrubsColorBlue + prob: 0.5 + orGroup: Surgshrubs + - name: UniformScrubsColorGreen + prob: 0.1 + orGroup: Surgshrubs + - name: UniformScrubsColorPurple + prob: 0.05 + orGroup: Surgshrubs + - name: ClothingMaskSterile + prob: 1 + - type: entity id: LockerChemistryFilled suffix: Filled parent: LockerChemistry + components: + - type: StorageFill + contents: + - name: BoxSyringe + prob: 1 + - name: BoxBeaker + prob: 1 - type: entity id: LockerChiefMedicalOfficerFilled suffix: Filled parent: LockerChiefMedicalOfficer + components: + - type: StorageFill + contents: + - name: MedkitFilled + prob: 1 + - name: ClothingHandsGlovesLatex + prob: 1 + #- name: ClothingEyesHudMedical #Removed until working properly + # prob: 1 + - name: ClothingHeadsetAltMedical + prob: 1 + - name: ClothingCloakCmo + prob: 1 + - name: ClothingBackpackDuffelSurgeryFilled + prob: 1 + - name: ClothingOuterCoatLabCmo + prob: 1 + - name: ClothingMaskSterile + prob: 1 - type: entity id: LockerResearchDirectorFilled suffix: Filled parent: LockerResearchDirector + components: + - type: StorageFill + contents: + - name: ResearchComputerCircuitboard + prob: 1 + - name: ProtolatheMachineCircuitboard + prob: 1 + - name: ClothingNeckCloakRd + prob: 1 + - name: ClothingHeadsetMedicalScience + prob: 1 + - name: PlushieSlime + prob: 0.1 - type: entity id: LockerHeadOfSecurityFilled suffix: Filled parent: LockerHeadOfSecurity + components: + - type: StorageFill + contents: + - name: TaserGun + prob: 1 + - name: ClothingHeadHatBeretHoS + prob: 1 + - name: ClothingHeadHatHoshat + prob: 1 + - name: ClothingNeckCloakHos + prob: 1 + - name: ClothingOuterCoatHoSTrench + prob: 1 + - name: ClothingUniformJumpskirtHoSAlt + prob: 1 + - name: ClothingUniformJumpsuitHoSAlt + prob: 1 + - name: ClothingUniformJumpsuitHoSBlue + prob: 0.5 + - name: ClothingUniformJumpsuitHoSGrey + prob: 0.5 + - name: ClothingUniformJumpsuitHoSParadeMale + prob: 0.1 + - name: ClothingUniformJumpskirtHoSParadeMale + prob: 0.1 + - name: ClothingHeadHelmetHardsuitSecurityRed + prob: 1 + - name: ClothingOuterHardsuitSecurityRed + prob: 1 + - name: DrinkVacuumFlask + prob: 0.8 + - name: ClothingBeltSecurityFilled + prob: 1 + - name: ClothingHeadsetAltSecurity + prob: 1 + - name: ClothingEyesGlassesSecurity + prob: 1 + - name: ClothingShoesBootsJack + prob: 1 + - type: entity id: LockerWardenFilled suffix: Filled parent: LockerWarden + components: + - type: StorageFill + contents: + - name: TaserGun + prob: 0.3 + - name: ClothingHeadHatWarden + prob: 1 + - name: ClothingHeadHatBeretWarden + prob: 1 + - name: ClothingBeltSecurityFilled + prob: 1 + - name: Flash + prob: 1 + - name: ClothingEyesGlassesSecurity + prob: 1 + - name: ClothingHeadsetAltSecurity + prob: 1 + - name: ClothingHandsGlovesCombat + prob: 1 + - name: ClothingShoesBootsJack + prob: 1 - type: entity id: LockerSecurityFilled suffix: Filled parent: LockerSecurity + components: + - type: StorageFill + contents: + - name: ClothingUniformJumpsuitSecGrey + prob: 0.3 + - name: ClothingHeadHelmetHelmet + prob: 1 + - name: ClothingOuterArmorBulletproof + prob: 1 + - name: ClothingBeltSecurityFilled + prob: 1 + - name: Flash + prob: 0.5 + - name: ClothingEyesGlassesSecurity + prob: 1 + - name: ClothingHeadsetSecurity + prob: 1 + - name: ClothingHandsGlovesColorBlack + prob: 1 + - name: ClothingShoesBootsJack + prob: 1 # Before adding to this - See https://github.com/space-wizards/space-station-14/pull/2427#issuecomment-718152557 - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index e7af7db6e1..46be688719 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -35,7 +35,7 @@ - type: Clothing sprite: Clothing/Belt/ce.rsi - type: Storage - capacity: 60 + capacity: 100 - type: entity parent: ClothingBeltBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 1de485dd3f..783c4e9186 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -23,7 +23,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretEngineering - name: beret engineering + name: engineering beret description: A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety. components: - type: Sprite @@ -34,7 +34,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretHoS - name: beret HoS + name: HoS beret description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety. components: - type: Sprite @@ -45,7 +45,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretWarden - name: beret warden + name: warden's hat description: A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety. components: - type: Sprite @@ -67,7 +67,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCaptain - name: captain + name: captain's hardhat description: It's good being the king. components: - type: Sprite @@ -78,7 +78,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCardborg - name: cardborg + name: cardborg helmet description: A hat made out of a box. components: - type: Sprite @@ -89,7 +89,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCentcom - name: centcom + name: centcom brand hat description: "It's good to be the emperor." components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 3f715de010..aeb39f43e1 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -2,7 +2,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakCap name: captain's cloak - description: A pompous and comfy blue cloak with a nice gold trim. + description: A pompous and comfy blue cloak with a nice gold trim, while not particularly valuable as your other posessions, it sure is fancy. components: - type: Sprite sprite: Clothing/Neck/Cloaks/cap.rsi @@ -13,7 +13,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakHos name: HoS's cloak - description: An exquisite dark and red cloak of a Head of Security. + description: An exquisite dark and red cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution! components: - type: Sprite sprite: Clothing/Neck/Cloaks/hos.rsi @@ -24,7 +24,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakCe name: CE's cloak - description: A dark green cloak with light blue ornaments. + description: A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering. components: - type: Sprite sprite: Clothing/Neck/Cloaks/ce.rsi @@ -34,9 +34,9 @@ - type: entity parent: ClothingNeckBase - id: CloathingCloakCmo + id: ClothingCloakCmo name: CMO's cloak - description: A sterile blue cloak with a green cross. + description: A sterile blue cloak with a green cross, radiating with a sense of duty and willingness to help others. components: - type: Sprite sprite: Clothing/Neck/Cloaks/cmo.rsi @@ -47,7 +47,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakRd name: RD's cloak - description: A white cloak with violet stripes. + description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology. components: - type: Sprite sprite: Clothing/Neck/Cloaks/rd.rsi @@ -58,7 +58,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakQm name: QM's cloak - description: A strong brown cloak with a reflective stripe. + description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills. components: - type: Sprite sprite: Clothing/Neck/Cloaks/qm.rsi @@ -69,7 +69,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakHop name: HoP's cloak - description: A blue cloak with red shoudlers and gold buttons. + description: A blue cloak with red shoudlers and gold buttons, proving you are the gatekeeper to any airlock on the station. components: - type: Sprite sprite: Clothing/Neck/Cloaks/hop.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index ff12784eb7..da84209ac2 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterArmorReflective - name: armor (reflective) + name: reflective vest description: An armored vest with advanced shielding to protect against energy weapons. components: - type: Sprite @@ -12,7 +12,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterArmorBulletproof - name: bulletproof + name: bulletproof vest description: An armored vest with heavy plates to protect against ballistic projectiles. components: - type: Sprite @@ -23,7 +23,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterArmorCult - name: cult armor + name: acolyte armor description: An evil-looking cult armor, made of bones. components: - type: Sprite @@ -34,7 +34,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterArmorHeavy - name: heavy + name: heavy armor suit description: A heavily armored suit that protects against excessive damage. components: - type: Sprite @@ -45,7 +45,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterArmorHeavyGreen - name: heavy + name: green heavy armor suit description: A heavily armored suit with green accents that protects against excessive damage. components: - type: Sprite @@ -56,7 +56,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterArmorHeavyRed - name: heavy + name: red heavy armor suit description: A heavily armored suit with red accents that protects against excessive damage. components: - type: Sprite @@ -89,8 +89,8 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterArmorRiot - name: riot - description: An armored vest with heavy padding to protect against melee attacks. + name: riot suit + description: An armored vest with heavy padding to protect against melee attacks, perfect for fighting delinquents around the station. components: - type: Sprite sprite: Clothing/OuterClothing/Armor/riot.rsi @@ -100,7 +100,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterArmorScaf - name: scaf + name: scaf suit description: A green and brown tactical suit for combat situations. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index b6212ddf61..244cc4e5e7 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -34,7 +34,7 @@ name: lizard plushie parent: BaseItem id: PlushieLizard - description: An adorable stuffed toy that resembles a lizardperson. + description: An adorable stuffed toy that resembles a lizardperson. Made by CentCom as a token initiative to combat speciesism in work environments. "Welcome your new colleges as you do this plush, with open arms!" components: - type: Toys - type: LoopingSound diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml index c1107f0d7f..62783ee50c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml @@ -2,7 +2,7 @@ name: nuclear authentication disk parent: BaseItem id: NukeDisk - description: GET DAT FUCKKEN DISK + description: A nuclear auth disk, capable of arming a nuke if used along with a code. Note from nanotrasen reads "THIS IS YOUR MOST IMPORTANT POSESSION, SECURE DAT FUKKEN DISK!" components: - type: Sprite netsync: false @@ -16,4 +16,4 @@ - type: entity parent: NukeDisk id: NukeDiskFake - description: GET DAT FUCK- wait a second... + description: A nuclear auth disk, capable of.. WAIT THIS IS JUST PAINTED PLASTIC, FUCK- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 362a32f6b2..44b3e66e5f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -1,8 +1,8 @@ - type: entity name: stun baton - description: A stun baton for incapacitating people with. parent: BaseItem id: Stunbaton + description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone. components: - type: Sprite sprite: Objects/Weapons/Melee/stunbaton.rsi @@ -28,6 +28,7 @@ name: flash parent: BaseItem id: Flash + description: An ultrabright flashbulb with a trigger, causes the victum to be dazed and lose their eyesight for a moment. Useless when burnt out. components: - type: Sprite sprite: Objects/Weapons/Melee/flash.rsi