diff --git a/Resources/Migrations/eeMigrations.yml b/Resources/Migrations/eeMigrations.yml new file mode 100644 index 00000000000..682c3c412bf --- /dev/null +++ b/Resources/Migrations/eeMigrations.yml @@ -0,0 +1,4 @@ +# 2024-03-08 +ClothingBackpackSatchelBrigmedicDeltaVFilled: ClothingBackpackSatchelBrigmedicFilled +ClothingBackpackDuffelBrigmedicDeltaVFilled: ClothingBackpackDuffelBrigmedicFilled +ClothingBackpackBrigmedicDeltaVFilled: ClothingBackpackBrigmedicFilled diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 4d33ec98a90..5faab3d7ad2 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -21,8 +21,23 @@ components: - type: StorageFill contents: - - id: Flash -# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag + - id: MagazinePistol + +- type: entity + noSpawn: true + parent: ClothingBackpackBrigmedic + id: ClothingBackpackBrigmedicFilled + components: + - type: StorageFill + contents: + - id: EmergencyRollerBedSpawnFolded + - id: BodyBagFolded + - id: Portafib + - id: BruteAutoInjector + amount: 2 + - id: BurnAutoInjector + amount: 2 + - id: MagazinePistol - type: entity noSpawn: true @@ -31,10 +46,11 @@ components: - type: StorageFill contents: - - id: Flash - id: ForensicPad - id: ForensicScanner + + - type: entity noSpawn: true parent: ClothingBackpackMedical diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 3cac13ab53e..0dfcf774584 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -14,33 +14,38 @@ - type: entity noSpawn: true - parent: ClothingBackpackDuffelSecurity - id: ClothingBackpackDuffelSecurityFilled + parent: ClothingBackpackDuffelBrigmedic + id: ClothingBackpackDuffelBrigmedicFilled components: - type: StorageFill contents: - - id: Flash -# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag + - id: EmergencyRollerBedSpawnFolded + - id: BodyBagFolded + - id: Portafib + # - id: Flash + - id: BruteAutoInjector + amount: 2 + - id: BurnAutoInjector + amount: 2 - type: entity noSpawn: true parent: ClothingBackpackDuffelSecurity - id: ClothingBackpackDuffelSecurityFilledDetective + id: ClothingBackpackDuffelSecurityFilled components: - type: StorageFill contents: - - id: Flash - - id: ForensicPad - - id: ForensicScanner + - id: MagazinePistol - type: entity noSpawn: true - parent: ClothingBackpackDuffelBrigmedic - id: ClothingBackpackDuffelBrigmedicFilled + parent: ClothingBackpackDuffelSecurity + id: ClothingBackpackDuffelSecurityFilledDetective components: - type: StorageFill contents: - - id: Flash + - id: ForensicPad + - id: ForensicScanner - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 89ae8fdf477..f74207ca18e 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -28,33 +28,37 @@ - type: entity noSpawn: true - parent: ClothingBackpackSatchelSecurity - id: ClothingBackpackSatchelSecurityFilled + parent: ClothingBackpackSatchelBrigmedic + id: ClothingBackpackSatchelBrigmedicFilled components: - type: StorageFill contents: - - id: Flash -# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag + - id: EmergencyRollerBedSpawnFolded + - id: BodyBagFolded + - id: Portafib + - id: BruteAutoInjector + amount: 2 + - id: BurnAutoInjector + amount: 2 - type: entity noSpawn: true parent: ClothingBackpackSatchelSecurity - id: ClothingBackpackSatchelSecurityFilledDetective + id: ClothingBackpackSatchelSecurityFilled components: - type: StorageFill contents: - - id: Flash - - id: ForensicPad - - id: ForensicScanner + - id: MagazinePistol - type: entity noSpawn: true - parent: ClothingBackpackSatchelBrigmedic - id: ClothingBackpackSatchelBrigmedicFilled + parent: ClothingBackpackSatchelSecurity + id: ClothingBackpackSatchelSecurityFilledDetective components: - type: StorageFill contents: - - id: Flash + - id: ForensicPad + - id: ForensicScanner - type: entity noSpawn: true diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml deleted file mode 100644 index 2fbc17d2585..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackBrigmedic - id: ClothingBackpackBrigmedicDeltaVFilled - components: - - type: StorageFill - contents: - - id: EmergencyRollerBedSpawnFolded - - id: BodyBagFolded - - id: Portafib - # - id: Flash - - id: BruteAutoInjector - amount: 2 - - id: BurnAutoInjector - amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml deleted file mode 100644 index bcd12b5e1b1..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelBrigmedic - id: ClothingBackpackDuffelBrigmedicDeltaVFilled - components: - - type: StorageFill - contents: - - id: EmergencyRollerBedSpawnFolded - - id: BodyBagFolded - - id: Portafib - # - id: Flash - - id: BruteAutoInjector - amount: 2 - - id: BurnAutoInjector - amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml deleted file mode 100644 index 31dc027a21e..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelBrigmedic - id: ClothingBackpackSatchelBrigmedicDeltaVFilled - components: - - type: StorageFill - contents: - - id: EmergencyRollerBedSpawnFolded - - id: BodyBagFolded - - id: Portafib - # - id: Flash - - id: BruteAutoInjector - amount: 2 - - id: BurnAutoInjector - amount: 2 diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index f4b2fe95e14..681cb95be71 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -35,7 +35,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitBrigmedic outerClothing: ClothingOuterArmorPlateCarrier - back: ClothingBackpackBrigmedicDeltaVFilled + back: ClothingBackpackBrigmedicFilled shoes: ClothingShoesBootsCombatFilled gloves: ClothingHandsGlovesNitrile eyes: ClothingEyesHudMedical @@ -45,5 +45,5 @@ belt: ClothingBeltCorpsmanWebbingFilled pocket1: WeaponPistolMk58Nonlethal innerClothingSkirt: ClothingUniformJumpskirtBrigmedic - satchel: ClothingBackpackSatchelBrigmedicDeltaVFilled - duffelbag: ClothingBackpackDuffelBrigmedicDeltaVFilled + satchel: ClothingBackpackSatchelBrigmedicFilled + duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index b62658270eb..eb580d64996 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -1,7 +1,6 @@ # Numbers for armor here largely taken from /tg/. # NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day. -#Basic armor vest - type: entity parent: ClothingOuterBaseMedium id: ClothingOuterArmorBasic diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index b867abfeed3..784084652c1 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -51,6 +51,15 @@ sprite: Clothing/OuterClothing/Vests/detvest.rsi - type: Clothing sprite: Clothing/OuterClothing/Vests/detvest.rsi + - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14. + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. + Heat: 0.80 + - type: ExplosionResistance + damageCoefficient: 0.90 #Hazard vest - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index aa4a7b50e65..160c606cc41 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -248,6 +248,7 @@ Slash: 0.75 Piercing: 0.75 Heat: 0.75 + Caustic: 0.75 #not the full 90% from ss13 because of the head - type: entity parent: ClothingOuterWinterCoatToggleable @@ -417,12 +418,12 @@ sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSec - - type: Armor # DeltaV - adds resists to coat + - type: Armor modifiers: coefficients: Blunt: 0.85 Slash: 0.85 - Piercing: 0.85 # DeltaV - not as resistant as pre-rebase, but still better than nothing + Piercing: 0.85 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. Heat: 0.75 - type: entity diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml index f1c64730378..527c9391c0a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/security.yml @@ -9,11 +9,9 @@ inverted: true species: - Harpy - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - SecurityCadet - - Warden + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingUniformJumpsuitSecBlue @@ -27,11 +25,9 @@ inverted: true species: - Harpy - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - SecurityCadet - - Warden + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingUniformJumpsuitSecGrey @@ -41,11 +37,9 @@ cost: 1 exclusive: true requirements: - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - SecurityCadet - - Warden + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingUniformJumpskirtSecGrey @@ -55,11 +49,9 @@ cost: 1 exclusive: true requirements: - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - SecurityCadet - - Warden + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingUniformJumpskirtSecBlue @@ -198,19 +190,16 @@ - type: loadout id: LoadoutUniformJumpsuitSecFormal category: Jobs - cost: 2 + cost: 1 exclusive: true requirements: - !type:CharacterSpeciesRequirement inverted: true species: - Harpy - - !type:CharacterJobRequirement - jobs: - - Detective - - SecurityOfficer - - Warden - - HeadOfSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingUniformJumpsuitSecFormal @@ -224,14 +213,12 @@ inverted: true species: - Harpy - - !type:CharacterJobRequirement - jobs: - - Detective - - SecurityOfficer - - Warden - - HeadOfSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingUniformJumpsuitSecSummer + # Mask - type: loadout id: LoadoutSecurityMaskGasSwat @@ -257,92 +244,176 @@ species: - Diona - Harpy - - !type:CharacterJobRequirement - jobs: - - Detective - - SecurityOfficer - - SecurityCadet - - Warden - - HeadOfSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingShoesBootsJack +- type: loadout + id: LoadoutClothingShoesBootsCombat + category: Jobs + cost: 1 + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Diona + - Harpy + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingShoesBootsCombat + # Eyes - type: loadout id: LoadoutSecurityEyesHudSecurity category: Jobs - cost: 2 + cost: 1 exclusive: true requirements: - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - Warden - - HeadOfSecurity - - Brigmedic + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingEyesHudSecurity +- type: loadout + id: ClothingEyesGlassesSunglasses + category: Jobs + cost: 1 + exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingEyesGlassesSunglasses + - type: loadout id: LoadoutSecurityEyesEyepatchHudSecurity category: Jobs - cost: 2 + cost: 1 exclusive: true requirements: - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - Warden - - HeadOfSecurity - - Brigmedic + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingEyesEyepatchHudSecurity - type: loadout id: LoadoutSecurityEyesHudSecurityPrescription category: Jobs - cost: 2 + cost: 1 exclusive: true requirements: - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - Warden - - HeadOfSecurity - - Brigmedic + - !type:CharacterDepartmentRequirement + departments: + - Security - !type:CharacterTraitRequirement traits: - Nearsighted items: - ClothingEyesPrescriptionHudSecurity +- type: loadout + id: LoadoutClothingEyesGlassesSecurity + category: Jobs + cost: 4 + exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingEyesGlassesSecurity + +#Backpack +#Will need to add a backpack category later on, that will be part of an starting inventory loadout refactor. + # Head - type: loadout id: LoadoutSecurityHeadHatBeret category: Jobs cost: 1 exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingHeadHatBeretSecurity + +- type: loadout + id: LoadoutClothingHeadHelmetBasic + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingHeadHelmetBasic + +- type: loadout + id: LoadoutClothingHeadHatBeretBrigmedic + category: Jobs + cost: 1 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - - SecurityOfficer - - Warden - - HeadOfSecurity - Brigmedic items: - - ClothingHeadHatBeretSecurity + - ClothingHeadHatBeretBrigmedic - type: loadout - id: LoadoutSecurityHeadHelmetInsulated + id: LoadoutClothingHeadHatBeretCorpsman category: Jobs - cost: 3 + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - ClothingHeadHatBeretCorpsman + +- type: loadout + id: LoadoutClothingHeadHatBeretWarden + category: Jobs + cost: 1 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - - SecurityOfficer - Warden + items: + - ClothingHeadHatBeretWarden + +- type: loadout + id: LoadoutClothingHeadHatBeretHoS + category: Jobs + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: - HeadOfSecurity - - Brigmedic + items: + - ClothingHeadHatBeretHoS + +- type: loadout + id: LoadoutSecurityHeadHelmetInsulated + category: Jobs + cost: 2 + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security items: - ClothingHeadHelmetInsulated @@ -352,33 +423,230 @@ category: Jobs cost: 1 exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingBeltSecurityWebbingFilled + +- type: loadout + id: LoadoutClothingBeltCorpsmanWebbing + category: Jobs + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - ClothingBeltCorpsmanWebbingFilled + +- type: loadout + id: LoadoutClothingBeltSecurity + category: Jobs + cost: 1 + exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingBeltSecurity + +#Gloves + +- type: loadout + id: LoadoutClothingHandsGlovesNitrile + category: Jobs + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - ClothingHandsGlovesNitrile + +- type: loadout + id: LoadoutClothingOuterArmorPlateCarrier + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingOuterArmorPlateCarrier + +- type: loadout + id: LoadoutClothingOuterArmorDuraVest + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingOuterArmorDuraVest + +- type: loadout + id: LoadoutClothingOuterCoatDetective + category: Jobs + cost: 2 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - Detective - - SecurityOfficer - - SecurityCadet + items: + - ClothingOuterCoatDetective + +- type: loadout + id: LoadoutOuterVestDetective + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Detective + items: + - ClothingOuterVestDetective + +- type: loadout + id: LoadoutClothingOuterCoatWarden + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: - Warden + items: + - ClothingOuterCoatWarden + +- type: loadout + id: LoadoutClothingOuterCoatHoSTrench + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: - HeadOfSecurity items: - - ClothingBeltSecurityWebbingFilled + - ClothingOuterCoatHoSTrench +- type: loadout + id: LoadoutClothingOuterWinterHoS + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - HeadOfSecurity + items: + - ClothingOuterWinterHoS + +# Neck +- type: loadout + id: LoadoutClothingNeckCloakHos + category: Jobs + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - HeadOfSecurity + items: + - ClothingNeckCloakHos + +- type: loadout + id: LoadoutClothingNeckMantleHOS + category: Jobs + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - HeadOfSecurity + items: + - ClothingNeckMantleHOS + +- type: loadout + id: LoadoutBedsheetBrigmedic + category: Jobs + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - BedsheetBrigmedic + + # Equipment - type: loadout id: LoadoutSecurityCombatKnife category: Jobs - cost: 1 + cost: 2 requirements: - - !type:CharacterSpeciesRequirement - species: - - Diona - - Harpy - !type:CharacterDepartmentRequirement departments: - Security items: - CombatKnife +- type: loadout + id: LoadoutSecurityFlash + category: Jobs + cost: 1 + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - Flash + +- type: loadout + id: LoadoutSecurityDisabler + category: Jobs + cost: 2 + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - WeaponDisabler + +- type: loadout + id: LoadoutMagazinePistolRubber + category: Jobs + cost: 2 + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - MagazinePistolRubber + +- type: loadout + id: LoadoutSpeedLoaderMagnumRubber + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Detective + items: + - SpeedLoaderMagnumRubber + # TODO: Make this replace the secoff handgun and make it cheaper # # Species # - type: loadout diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml index e09d02c463a..c7d540d676e 100644 --- a/Resources/Prototypes/Loadouts/items.yml +++ b/Resources/Prototypes/Loadouts/items.yml @@ -469,6 +469,20 @@ - Brigmedic #Misc Items +- type: loadout + id: LoadoutItemFlash + category: Items + cost: 1 + items: + - Flash + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + - !type:CharacterJobRequirement + jobs: + - Brigmedic + - type: loadout id: LoadoutItemPAI category: Items