From 0f2530a0b196d02b5ee798a0fb5cdf02294fe2d0 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Sun, 24 Mar 2024 06:21:27 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=9F=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=88=D0=BA=D0=B0=D1=84=D0=BE=D0=B2?= =?UTF-8?q?=20(#193)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: add unique paramedic`s belt to locker * tweak: medkits to medical lockers * tweak: add medical jumpsuits to lockers * tweak: hos locker rework * tweak: cmo locker rework * tweak: cmo hardsuit locker rework * tweak: ce locker rework * tweak: qm locker rework * tweak: captain locker rework + captain armor rebalance * tweak: hop locker rework + hop hardsuit locker * tweak: rd dresser rework * tweak: rework warden locker * warden locker part 2 * fix: fix implanter rotation * add: add mindshield implanters box * add: mindshield implants to hos and warden lockers * add: handheld crew monitor to paramedic locker * add: magboots and insulated gloves to atmos locker * add: pill and bottle boxes to medicine locker * add: funny mobs * fix: fix funny mobs * add: add filled version of clown and mime locker * add: translation for clown and mime lockers * fix: fix janitor closet naming * tweak: all bodycameras now has battery roundstart * tweak: change bodycameras box to single bodycamera at security locker * fix: fix bodycamera * add: add filled version of assault belt * tweak: change security belt to assault belt in hos locker * fix: fix translation for box mindshield * fix: fix filled assault belt contents --- .../ru-RU/_white/implants/mindshield.ftl | 2 + Resources/Locale/ru-RU/_white/mobs/angry.ftl | 3 + .../catalog/fills/lockers/service.ftl | 6 + .../storage/closets/lockers/lockers.ftl | 6 + .../structures/storage/closets/wardrobe.ftl | 4 +- .../Catalog/Fills/Lockers/dressers.yml | 45 +++- .../Catalog/Fills/Lockers/engineer.yml | 4 + .../Catalog/Fills/Lockers/heads.yml | 205 ++++++++---------- .../Catalog/Fills/Lockers/medical.yml | 13 +- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 62 +++++- .../Catalog/Fills/Lockers/security.yml | 23 +- .../Entities/Clothing/Belt/belts.yml | 15 ++ .../Entities/Clothing/OuterClothing/armor.yml | 15 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 17 +- .../Entities/Objects/Misc/implanters.yml | 1 + .../Objects/Specific/Security/body-camera.yml | 3 +- .../Entities/Structures/Furniture/dresser.yml | 5 +- .../Storage/Closets/Lockers/lockers.yml | 80 +++++++ .../_White/Entities/Boxes/mindshiled.yml | 14 ++ 19 files changed, 368 insertions(+), 155 deletions(-) create mode 100644 Resources/Locale/ru-RU/_white/implants/mindshield.ftl create mode 100644 Resources/Locale/ru-RU/_white/mobs/angry.ftl create mode 100644 Resources/Prototypes/_White/Entities/Boxes/mindshiled.yml diff --git a/Resources/Locale/ru-RU/_white/implants/mindshield.ftl b/Resources/Locale/ru-RU/_white/implants/mindshield.ftl new file mode 100644 index 0000000000..883602d583 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/implants/mindshield.ftl @@ -0,0 +1,2 @@ +ent-BoxMindshield = коробка имплантов + .desc = Хранит набор имплантов защиты разума. diff --git a/Resources/Locale/ru-RU/_white/mobs/angry.ftl b/Resources/Locale/ru-RU/_white/mobs/angry.ftl new file mode 100644 index 0000000000..73ead46448 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/mobs/angry.ftl @@ -0,0 +1,3 @@ +ent-MobMonkeyAngry = { ent-MobMonkey } +.desc = { ent-MobMonkey.desc } +.suffix = Агрессивная diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/service.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/service.ftl index cb93a112f5..cf19227ad5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/service.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/service.ftl @@ -16,3 +16,9 @@ ent-LockerBotanistFilled = { ent-LockerBotanist } ent-LockerBotanistLoot = { ent-LockerBotanist } .suffix = Лут .desc = { ent-LockerBotanist.desc } +ent-LockerClownFilled = { ent-LockerClown } + .suffix = Заполненный + .desc = { ent-LockerClown.desc } +ent-LockerMimeFilled = { ent-LockerMime } + .suffix = Заполненный + .desc = { ent-LockerMime.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl index 51e9379864..a9c29274d6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl @@ -73,3 +73,9 @@ ent-LockerSyndicatePersonal = оружейный шкаф ent-LockerInspector = шкаф инспектора .desc = Содержит уникальный гардероб по последнему слову моды. .suffix = { "" } +ent-LockerMime = шкаф клоуна + .desc = Содержит рабочую экипировку станционного клоуна. Для хранения смешного + .suffix = { "" } +ent-LockerClown = шкаф мима + .desc = Содержит рабочую экипировку станционного мима. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl index 95e6004281..577f774bf4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl @@ -34,8 +34,8 @@ ent-WardrobeSecurity = гардероб службы безопасности ent-WardrobeAtmospherics = гардероб атмосферного снаряжения .desc = { ent-WardrobeBase.desc } .suffix = { "" } -ent-ClosetJanitor = шкаф уборщика - .desc = Здесь хранится санитарно-технические одежда и оборудование . +ent-ClosetJanitor = шкаф оборудования уборщика + .desc = Здесь хранится санитарно-техническое оборудование. .suffix = { "" } ent-WardrobeFormal = официально-деловой гардероб .desc = Хранилище одежды строгого стиля. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 9e45d72f63..d7838745c7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -14,6 +14,11 @@ - id: ClothingHandsGlovesCaptain - id: ClothingNeckMantleCap - id: ClothingEyesGlassesSunglasses + - id: ClothingOuterArmorCaptainCarapace + - id: ClothingHeadsetAltCommand + - id: ClothingMaskGasCaptain + - id: ClothingUniformJumpskirtCaptain + - id: ClothingOuterWinterCap - type: entity id: DresserChiefEngineerFilled @@ -27,6 +32,11 @@ - id: ClothingUniformJumpskirtChiefEngineerTurtle - id: ClothingNeckCloakCe - id: ClothingHeadHatBeretEngineering + - id: ClothingEyesGlassesMeson + - id: ClothingHeadsetAltEngineering + - id: ClothingHeadHatHardhatWhite + - id: ClothingHandsGlovesColorYellow + - id: ClothingShoesBootsMagAdv - type: entity id: DresserChiefMedicalOfficerFilled @@ -35,10 +45,18 @@ components: - type: StorageFill contents: + - id: ClothingUniformJumpsuitCMO + - id: ClothingUniformJumpskirtCMO + - id: ClothingOuterWinterCMO + - id: ClothingOuterCoatLabCmo - id: ClothingNeckMantleCMO - id: ClothingCloakCmo - - id: ClothingOuterCoatLabCmo - id: ClothingHeadHatBeretCmo + - id: ClothingHandsGlovesNitrile + - id: ClothingEyesHudMedical + - id: ClothingHeadsetAltMedical + - id: ClothingMaskSterile + - id: ClothingEyesEyepatchHudMedical - type: entity id: DresserHeadOfPersonnelFilled @@ -52,6 +70,10 @@ - id: ClothingHeadHatHopcap - id: ClothingOuterWinterHoP - id: ClothingHandsGlovesHop + - id: ClothingNeckGoldmedal + - id: ClothingShoesLeather + - id: ClothingUniformJumpsuitHoP + - id: ClothingUniformJumpskirtHoP - type: entity id: DresserHeadOfSecurityFilled @@ -70,6 +92,10 @@ - id: ClothingUniformJumpsuitHosFormal - id: ClothingMaskNeckGaiter - id: ClothingHandsGlovesCombat + - id: ClothingShoesBootsJack + - id: ClothingEyesGlassesSecurity + - id: ClothingHeadsetAltSecurity + - id: ClothingMaskGasSwat - type: entity id: DresserQuarterMasterFilled @@ -86,6 +112,11 @@ - id: ClothingUniformJumpskirtQMTurtleneck - id: ClothingHandsGlovesColorBrown - id: ClothingNeckMantleQM + - id: ClothingHeadsetAltCargo + - id: ClothingOuterWinterQM + - id: ClothingUniformJumpsuitQM + - id: ClothingUniformJumpskirtQM + - id: ClothingHeadHatQMsoft - type: entity id: DresserResearchDirectorFilled @@ -99,6 +130,10 @@ - id: ClothingHeadHatBeretRND - id: ClothingHandsGlovesColorPurple - id: ClothingHeadsetAltScience + - id: ClothingUniformJumpskirtResearchDirector + - id: ClothingUniformJumpsuitResearchDirector + - id: ClothingOuterWinterRD + - id: ClothingOuterCoatRD - type: entity id: DresserWardenFilled @@ -109,3 +144,11 @@ contents: - id: ClothingHeadHatWarden - id: ClothingHeadHatBeretWarden + - id: ClothingEyesGlassesSecurity + - id: ClothingHeadsetAltSecurity + - id: ClothingHandsGlovesCombat + - id: ClothingShoesBootsJack + - id: ClothingOuterCoatWarden + - id: ClothingOuterWinterWarden + - id: ClothingUniformJumpsuitWarden + - id: ClothingUniformJumpskirtWarden diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index e685377234..b8f4e3f112 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -92,6 +92,8 @@ - id: DoorRemoteFirefight - id: ClothingBeltUtilityEngineering - id: ClothingEyesGlassesMeson + - id: ClothingShoesBootsMag + - id: ClothingHandsGlovesColorYellow - type: entity id: LockerAtmosphericsFilled @@ -109,6 +111,8 @@ - id: DoorRemoteFirefight - id: ClothingBeltUtilityEngineering - id: ClothingEyesGlassesMeson + - id: ClothingShoesBootsMag + - id: ClothingHandsGlovesColorYellow - type: entity id: LockerEngineerFilledHardsuit diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 550f0b8fdc..77cbaff856 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -11,12 +11,10 @@ - id: CargoShuttleConsoleCircuitboard - id: SalvageShuttleConsoleCircuitboard - id: CargoBountyComputerCircuitboard - - id: CigPackGreen - prob: 0.50 - id: DoorRemoteCargo - id: RubberStampQm - - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo + - id: BoxFolderClipboard - type: entity id: LockerCaptainFilledHardsuit @@ -25,19 +23,13 @@ components: - type: StorageFill contents: - - id: ClothingOuterArmorCaptainCarapace + - id: WeaponEgun - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard - - id: ClothingOuterHardsuitCap - - id: ClothingMaskGasCaptain - - id: WeaponEgun - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - id: PlushieNuke prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - id: ClothingBeltSheathFilled - id: DoorRemoteCommand - id: RubberStampCaptain @@ -46,6 +38,9 @@ - id: MedalCase - id: CommandBudgetCard - id: CommandBudgetPinPaper + - id: MedalCase + - id: ClothingOuterHardsuitCap + - id: OxygenTankFilled - type: entity id: LockerCaptainFilled @@ -54,25 +49,22 @@ components: - type: StorageFill contents: - - id: ClothingOuterArmorCaptainCarapace - - id: NukeDisk - - id: PinpointerNuclear - - id: CaptainIDCard - - id: WeaponDisabler - - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - - id: PlushieNuke - prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - - id: DoorRemoteCommand - - id: RubberStampCaptain - - id: WeaponAntiqueLaser - - id: JetpackCaptainFilled - - id: MedalCase - - id: CommandBudgetCard - - id: CommandBudgetPinPaper + - id: WeaponEgun + - id: NukeDisk + - id: PinpointerNuclear + - id: CaptainIDCard + - id: CommsComputerCircuitboard + - id: PlushieNuke + prob: 0.1 + - id: ClothingBeltSheathFilled + - id: DoorRemoteCommand + - id: RubberStampCaptain + - id: WeaponAntiqueLaser + - id: JetpackCaptainFilled + - id: MedalCase + - id: CommandBudgetCard + - id: CommandBudgetPinPaper + - id: MedalCase - type: entity id: LockerCaptainFilledNoLaser @@ -81,23 +73,22 @@ components: - type: StorageFill contents: - - id: ClothingOuterArmorCaptainCarapace - - id: NukeDisk - - id: PinpointerNuclear - - id: CaptainIDCard - - id: WeaponDisabler - - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - - id: PlushieNuke - prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - - id: DoorRemoteCommand - - id: RubberStampCaptain - - id: JetpackCaptainFilled - - id: MedalCase + - id: WeaponEgun + - id: NukeDisk + - id: PinpointerNuclear + - id: CaptainIDCard + - id: WeaponDisabler + - id: CommsComputerCircuitboard + - id: PlushieNuke + prob: 0.1 + - id: ClothingBeltSheathFilled + - id: DoorRemoteCommand + - id: RubberStampCaptain + - id: JetpackCaptainFilled + - id: MedalCase + - id: CommandBudgetCard + - id: CommandBudgetPinPaper + - id: MedalCase - type: entity id: LockerHeadOfPersonnelFilled @@ -113,18 +104,35 @@ - id: BoxHeadset - id: IDComputerCircuitboard - id: WeaponEgun - - id: CigarGoldCase - prob: 0.25 - # Fuck the HoP they don't deserve fucking cigars. - # Yes they do fuck you. - id: DoorRemoteService - id: ClothingNeckGoldmedal - id: RubberStampHop - id: BoxEncryptionKeyPassenger - id: BoxEncryptionKeyService - - id: ClothingBackpackIan - prob: 0.5 - - id: AccessConfigurator + - id: BoxFolderClipboard + +- type: entity + id: LockerHeadOfPersonnelFilledHardsuit + suffix: Filled, Hardsuit + parent: LockerHeadOfPersonnel + components: + - type: StorageFill + contents: + - id: HoPIDCard + - id: ClothingHeadsetCommand + - id: BoxPDA + - id: BoxID + - id: BoxHeadset + - id: IDComputerCircuitboard + - id: WeaponEgun + - id: DoorRemoteService + - id: ClothingNeckGoldmedal + - id: RubberStampHop + - id: BoxEncryptionKeyPassenger + - id: BoxEncryptionKeyService + - id: BoxFolderClipboard + - id: ClothingOuterHardsuitHOP + - id: OxygenTankFilled - type: entity id: LockerChiefEngineerFilledHardsuit @@ -133,24 +141,18 @@ components: - type: StorageFill contents: - - id: ClothingOuterHardsuitEngineeringWhite - - id: ClothingMaskBreath - - id: OxygenTankFilled - - id: NitrogenTankFilled - - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - - id: ClothingShoesBootsMagAdv - - id: ClothingHandsGlovesColorYellow - - id: CigarCase - prob: 0.15 - id: DoorRemoteEngineering - id: RubberStampCE - - id: JetpackVoidFilled - - id: ClothingHeadsetAltEngineering - id: BoxEncryptionKeyEngineering - id: AccessConfigurator - id: RCD - id: RCDAmmo + amount: 2 + - id: HolofanProjector + - id: ClothingOuterHardsuitEngineeringWhite + - id: ClothingMaskBreath + - id: OxygenTankFilled - type: entity id: LockerChiefEngineerFilled @@ -159,19 +161,15 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesMeson - - id: ClothingBeltChiefEngineerFilled - - id: ClothingHandsGlovesColorYellow - - id: CigarCase - prob: 0.15 - - id: DoorRemoteEngineering - - id: RubberStampCE - - id: ClothingHeadsetAltEngineering - - id: BoxEncryptionKeyEngineering - - id: AccessConfigurator - - id: RCD - - id: RCDAmmo - - id: ClothingHeadHatHardhatWhite + - id: ClothingBeltChiefEngineerFilled + - id: DoorRemoteEngineering + - id: RubberStampCE + - id: BoxEncryptionKeyEngineering + - id: AccessConfigurator + - id: RCD + - id: RCDAmmo + amount: 2 + - id: HolofanProjector - type: entity id: LockerChiefMedicalOfficerFilledHardsuit @@ -181,15 +179,6 @@ - type: StorageFill contents: - id: MedkitFilled - - id: ClothingHandsGlovesNitrile - - id: ClothingEyesHudMedical - - id: ClothingHeadsetAltMedical - - id: ClothingCloakCmo - - id: ClothingBackpackDuffelSurgeryFilled - - id: ClothingOuterCoatLabCmo - - id: ClothingMaskSterile - - id: ClothingHeadHatBeretCmo - - id: ClothingOuterHardsuitMedical - id: Hypospray - id: HandheldCrewMonitor - id: DoorRemoteMedical @@ -197,7 +186,10 @@ - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical - id: Eftpos - - id: ClothingBeltMedical + - id: ClothingBeltMedicalFilled + - id: MedkitFilled + - id: ClothingOuterHardsuitMedical + - id: OxygenTankFilled - type: entity id: LockerChiefMedicalOfficerFilled @@ -207,11 +199,6 @@ - type: StorageFill contents: - id: MedkitFilled - - id: ClothingHandsGlovesNitrile - - id: ClothingEyesHudMedical - - id: ClothingHeadsetAltMedical - - id: ClothingBackpackDuffelSurgeryFilled - - id: ClothingMaskSterile - id: Hypospray - id: HandheldCrewMonitor - id: DoorRemoteMedical @@ -219,7 +206,7 @@ - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical - id: Eftpos - - id: ClothingBeltMedical + - id: ClothingBeltMedicalFilled - type: entity id: LockerResearchDirectorFilledHardsuit @@ -261,28 +248,24 @@ - type: entity id: LockerHeadOfSecurityFilledHardsuit suffix: Filled, Hardsuit - parent: LockerHeadOfSecurity + parent: LockerHeadOfSecurityFilled components: - type: StorageFill contents: - - id: WeaponDisabler - - id: ClothingOuterCoatHoSTrench - - id: ClothingOuterHardsuitSecurityRed - - id: ClothingMaskGasSwat - - id: ClothingBeltSecurityFilled - - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSecurity - - id: ClothingShoesBootsJack - - id: CigarGoldCase - prob: 0.50 + - id: WeaponEgun + - id: ClothingBeltAssaultFilled - id: DoorRemoteSecurity - id: RubberStampHos - id: SecurityTechFabCircuitboard - - id: JetpackSecurityFilled - id: BoxEncryptionKeySecurity - id: HoloprojectorSecurity - id: BookSecretDocuments - id: WeaponPistolMk58Nonlethal + - id: MagazinePistol + - id: BoxMindshield + - id: ClothingOuterHardsuitSecurityRed + - id: JetpackSecurityFilled + - id: OxygenTankFilled - type: entity id: LockerHeadOfSecurityFilled @@ -292,16 +275,7 @@ - type: StorageFill contents: - id: WeaponEgun - - id: ClothingHeadHatBeretHoS - - id: ClothingHeadHatHoshat - - id: ClothingNeckCloakHos - - id: ClothingOuterCoatHoSTrench - - id: ClothingBeltSecurityFilled - - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSecurity - - id: ClothingShoesBootsJack - - id: CigarGoldCase - prob: 0.50 + - id: ClothingBeltAssaultFilled - id: DoorRemoteSecurity - id: RubberStampHos - id: SecurityTechFabCircuitboard @@ -310,6 +284,7 @@ - id: BookSecretDocuments - id: WeaponPistolMk58Nonlethal - id: MagazinePistol + - id: BoxMindshield - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 754eb95435..ce6c913669 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -15,6 +15,9 @@ - id: Bloodpack amount: 2 - id: Gauze + - id: MedkitFilled + - id: BoxPillCanister + - id: BoxBottle - type: entity id: LockerWallMedicalFilled @@ -34,6 +37,7 @@ - id: Bloodpack amount: 2 - id: Gauze + - id: MedkitFilled - type: entity @@ -44,7 +48,6 @@ - type: StorageFill contents: - id: HandheldHealthAnalyzer - prob: 0.6 - id: ClothingHandsGlovesLatex - id: ClothingHeadsetMedical - id: ClothingEyesHudMedical @@ -58,6 +61,8 @@ - id: ClothingHeadHatSurgcapBlue prob: 0.90 orGroup: Surgcaps + - id: ClothingUniformJumpsuitMedicalDoctor + - id: ClothingUniformJumpskirtMedicalDoctor - id: UniformScrubsColorBlue prob: 0.5 orGroup: Surgshrubs @@ -78,7 +83,6 @@ - type: StorageFill contents: - id: HandheldHealthAnalyzer - prob: 0.6 - id: ClothingHandsGlovesLatex - id: ClothingHeadsetMedical - id: ClothingEyesHudMedical @@ -92,6 +96,8 @@ - id: ClothingHeadHatSurgcapBlue prob: 0.90 orGroup: Surgcaps + - id: ClothingUniformJumpsuitMedicalDoctor + - id: ClothingUniformJumpskirtMedicalDoctor - id: UniformScrubsColorBlue prob: 0.5 orGroup: Surgshrubs @@ -149,5 +155,6 @@ - id: ClothingMaskSterile - id: HandheldGPSBasic - id: MedkitFilled - prob: 0.3 - id: Eftpos + - id: ClothingBeltMedicalEMTFilled + - id: HandheldCrewMonitor diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 8408d49cfe..5ce21d6abd 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -63,7 +63,7 @@ orGroup: EmergencyNitrogenOrRegularNitrogen - id: EmergencyNitrogenTankFilled prob: 0.20 - orGroup: EmergencyNitrogenOrRegularNitrogen + orGroup: EmergencyNitrogenOrRegularNitrogen - id: ToolboxEmergencyFilled prob: 0.4 - id: MedkitOxygenFilled @@ -191,8 +191,37 @@ prob: 0.005 orGroup: syndiemaintloot - id: WeaponSniperMosin - prob: 0.0010 + prob: 0.001 orGroup: syndiemaintloot + # Angry animals + - id: null + prob: 0.95 + orGroup: angryanimalsmaintloot + - id: MobCarp + prob: 0.05 + orGroup: angryanimalsmaintloot + - id: MobGiantSpiderAngry + prob: 0.05 + orGroup: angryanimalsmaintloot + - id: MobAngryBee + prob: 0.05 + orGroup: angryanimalsmaintloot + - id: MobMonkeyAngry + prob: 0.05 + orGroup: angryanimalsmaintloot + # Animals + - id: null + prob: 0.7 + orGroup: animalsmaintloot + - id: MobMouse + prob: 0.1 + orGroup: animalsmaintloot + - id: MobMouse1 + prob: 0.1 + orGroup: animalsmaintloot + - id: MobMouse2 + prob: 0.1 + orGroup: animalsmaintloot - type: entity id: ClosetWallMaintenanceFilledRandom @@ -284,3 +313,32 @@ - id: WeaponSniperMosin prob: 0.0010 orGroup: syndiemaintloot + # Angry animals + - id: null + prob: 0.95 + orGroup: angryanimalsmaintloot + - id: MobCarp + prob: 0.005 + orGroup: angryanimalsmaintloot + - id: MobGiantSpiderAngry + prob: 0.005 + orGroup: angryanimalsmaintloot + - id: MobAngryBee + prob: 0.005 + orGroup: angryanimalsmaintloot + - id: MobMonkeyAngry + prob: 0.005 + orGroup: angryanimalsmaintloot + # Animals + - id: null + prob: 0.7 + orGroup: animalsmaintloot + - id: MobMouse + prob: 0.1 + orGroup: animalsmaintloot + - id: MobMouse1 + prob: 0.1 + orGroup: animalsmaintloot + - id: MobMouse2 + prob: 0.1 + orGroup: animalsmaintloot diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 5fea75ab0e..0bca462d2a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -7,23 +7,17 @@ contents: - id: FlashlightSeclite - id: WeaponDisabler - prob: 0.3 - id: ClothingBeltSecurityFilled - id: Flash - - id: ClothingEyesGlassesSecurity - - id: ClothingHeadsetAltSecurity - - id: ClothingHandsGlovesCombat - - id: ClothingShoesBootsJack - - id: ClothingOuterCoatWarden - - id: ClothingHeadHatWarden - - id: ClothingOuterWinterWarden - id: RubberStampWarden - id: DoorRemoteArmory - - id: ClothingOuterHardsuitWarden - id: HoloprojectorSecurity - id: BoxBodyCamera - id: WeaponPistolMk58Nonlethal - id: MagazinePistol + - id: BoxMindshield + - id: ClothingOuterHardsuitWarden + - id: OxygenTankFilled - type: entity id: LockerWardenFilled @@ -34,22 +28,15 @@ contents: - id: FlashlightSeclite - id: WeaponDisabler - - id: ClothingHeadHatWarden - - id: ClothingHeadHatBeretWarden - id: ClothingBeltSecurityFilled - id: Flash - - id: ClothingEyesGlassesSecurity - - id: ClothingHeadsetAltSecurity - - id: ClothingHandsGlovesCombat - - id: ClothingShoesBootsJack - - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity - id: BoxBodyCamera - id: WeaponPistolMk58Nonlethal - id: MagazinePistol + - id: BoxMindshield - type: entity id: LockerSecurityFilled @@ -77,7 +64,7 @@ prob: 0.6 - id: WeaponTempGun - id: WeaponPistolMk58Nonlethal - - id: BoxBodyCamera + - id: SurveillanceBodyCamera - id: MagazinePistol - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 4e77d63987..192051c0c2 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -209,6 +209,21 @@ sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance +- type: entity + parent: ClothingBeltAssault # WD edit + id: ClothingBeltAssaultFilled + suffix: Filled + name: assault belt + description: A tactical assault belt. + components: + - type: StorageFill + contents: + - id: GrenadeFlashBang + - id: TearGasGrenade + - id: Stunbaton + - id: Handcuffs + - id: Handcuffs + - type: entity parent: ClothingBeltStorageBase id: ClothingBeltJanitor diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 1bc4fb5e98..65f9fc4d16 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -250,10 +250,10 @@ - WhitelistChameleon - type: entity - parent: ClothingOuterBaseLarge + parent: ClothingOuterBaseMedium id: ClothingOuterArmorCaptainCarapace - name: "captain's carapace" - description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest." + name: captain's carapace + description: An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest. components: - type: Sprite sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi @@ -262,14 +262,11 @@ - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.5 + Blunt: 0.6 + Slash: 0.6 Piercing: 0.6 - Heat: 0.5 + Heat: 0.6 Caustic: 0.9 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - type: HeldSpeedModifier - type: ExplosionResistance damageCoefficient: 0.65 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 639a24a41f..4f45453c3c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2188,6 +2188,21 @@ description: ghost-role-information-giant-spider-description - type: GhostTakeoverAvailable +- type: entity + name: angry monkey + parent: MobMonkey + id: MobMonkeyAngry + suffix: Angry + components: + - type: NpcFactionMember + factions: + - SimpleHostile + - type: InputMover + - type: MobMover + - type: HTN + rootTask: + task: SimpleHostileCompound + - type: entity name: clown spider parent: MobGiantSpiderAngry @@ -3205,4 +3220,4 @@ components: - type: ReplacementAccent accent: nymph - + diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index 16b7538423..528ecdc903 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -40,6 +40,7 @@ map: [ "implantFull" ] visible: false - type: Item + storedRotation: -90 sprite: Objects/Specific/Medical/implanter.rsi heldPrefix: 0 size: Small diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml index 0b2aa254c6..006cd7366f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml @@ -5,7 +5,7 @@ description: MP3 player sized pocket camera for security officers. components: - type: SurveillanceBodyCamera - - type: Sprite # Sprites section + - type: Sprite sprite: Objects/Specific/Security/body-camera.rsi layers: - state: unpowered @@ -66,6 +66,7 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default + startingItem: PowerCellMedium - type: UserInterface interfaces: - key: enum.SurveillanceCameraSetupUiKey.Camera diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index 68b94ef03b..ca7f5309f1 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -15,7 +15,6 @@ - trigger: !type:DamageTrigger damage: 50 - behaviors: - !type:SpawnEntitiesBehavior spawn: @@ -26,8 +25,8 @@ acts: [ "Destruction" ] - type: Storage grid: - - 0,0,6,3 - maxItemSize: Normal + - 0,0,8,5 + maxItemSize: Huge - type: ContainerContainer containers: storagebase: !type:Container diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index f760baae0d..2e1e610ba1 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -422,6 +422,47 @@ stateDoorOpen: clown_open stateDoorClosed: clown_door +- type: entity + id: LockerClownFilled + name: clown locker + parent: LockerClown + suffix: Filled + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitClown + - id: ClothingShoesClown + - id: ClothingMaskClown + - id: ClownRecorder + - id: RubberStampClown + - id: ClothingHeadsetService + - id: CrayonRainbow + - id: ClothingBackpackClown + prob: 0.33 + orGroup: clownbackpack + - id: ClothingBackpackSatchelClown + prob: 0.33 + orGroup: clownbackpack + - id: ClothingBackpackDuffelClown + prob: 0.33 + orGroup: clownbackpack + - id: ClothingShoesClownLarge + prob: 0.66 + - id: ClothingNeckClownmedal + prob: 0.33 + - id: ClothingOuterHardsuitClown + prob: 0.2 + - id: ClothingShoesClownBanana + prob: 0.05 + - id: ClothingUniformJumpsuitClownBanana + prob: 0.05 + - id: ClothingMaskClownBanana + prob: 0.05 + - id: BananiumHorn + prob: 0.1 + - id: GoldenBikeHorn + prob: 0.1 + # Mime - type: entity id: LockerMime @@ -436,6 +477,45 @@ stateDoorOpen: mime_open stateDoorClosed: mime_door +- type: entity + id: LockerMimeFilled + name: mime locker + parent: LockerMime + suffix: Filled + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitMime + - id: ClothingUniformJumpskirtMime + - id: ClothingMaskMime + prob: 0.25 + onGroup: mimemask + - id: ClothingMaskSadMime + prob: 0.25 + onGroup: mimemask + - id: ClothingMaskScaredMime + prob: 0.25 + onGroup: mimemask + - id: ClothingMaskSexyMime + prob: 0.25 + onGroup: mimemask + - id: ClothingShoesColorWhite + - id: ClothingHeadHatBeret + - id: ClothingHandsGlovesLatex + - id: ClothingHeadsetService + - id: RubberStampMime + - id: CrayonMime + - id: ClothingBackpackSatchelMime + prob: 0.5 + onGroup: mimebackpack + - id: ClothingBackpackMime + prob: 0.5 + onGroup: mimebackpack + - id: ClothingOuterWinterMime + prob: 0.5 + - id: ClothingOuterHardsuitMime + prob: 0.2 + # Representative - type: entity id: LockerRepresentative diff --git a/Resources/Prototypes/_White/Entities/Boxes/mindshiled.yml b/Resources/Prototypes/_White/Entities/Boxes/mindshiled.yml new file mode 100644 index 0000000000..53089cc893 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Boxes/mindshiled.yml @@ -0,0 +1,14 @@ +- type: entity + name: mindshield implanters box + parent: BoxCardboard + id: BoxMindshield + description: A box full of implants. + components: + - type: StorageFill + contents: + - id: MindShieldImplanter + amount: 4 + - type: Sprite + layers: + - state: box + - state: syringe