diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index ab090da9bae..e37794c03dd 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 1900 # DeltaV + cost: 2000 # DeltaV category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 96a742d0b9e..6470a0437cb 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -70,11 +70,14 @@ - id: ClothingHeadHatBeretHoS - id: ClothingHeadHatHoshat - id: ClothingNeckCloakHos - - id: ClothingUniformJumpskirtHoSAlt - - id: ClothingUniformJumpsuitHoSAlt +# - id: ClothingUniformJumpskirtHoSAlt # DeltaV - removed for incongruence +# - id: ClothingUniformJumpsuitHoSAlt # DeltaV - removed for incongruence - id: ClothingUniformJumpskirtHosFormal - id: ClothingUniformJumpsuitHosFormal - - id: ClothingOuterWinterHoS +# - id: ClothingOuterWinterHoS # DeltaV - removed for incongruence + - id: ClothingOuterCoatStasecHoS # DeltaV - add winter coat + - id: ClothingOuterGreatcoatStasecHoS # DeltaV - add greatcoat + - id: ClothingShoesBootsWinterHeadOfSecurity # DeltaV - add HoS winter boots - type: entity id: DresserQuarterMasterFilled @@ -116,3 +119,6 @@ contents: - id: ClothingHeadHatWarden - id: ClothingHeadHatBeretWarden + - id: ClothingOuterCoatStasecWarden # DeltaV - add winter coat + - id: ClothingOuterGreatcoatStasecWarden # DeltaV - add greatcoat + - id: ClothingShoesBootsWinterWarden # DeltaV - add winter boots diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index d747de62bc6..5ed7b595ef6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -333,7 +333,7 @@ - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingMaskNeckGaiter - - id: ClothingOuterCoatHoSTrench +# - id: ClothingOuterCoatHoSTrench # DeltaV - removed for incongruence - id: ClothingShoesBootsJack - id: DoorRemoteSecurity - id: HoloprojectorSecurity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 1ceb86dd4e8..fff245e1f52 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -7,15 +7,15 @@ contents: - id: FlashlightSeclite - id: WeaponDisabler - prob: 0.3 +# prob: 0.3 # DeltaV - just give them the damn disabler - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden +# - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence +# - id: ClothingOuterWinterWarden # DeltaV - removed for incongruence - id: RubberStampWarden - id: DoorRemoteArmory - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. @@ -23,10 +23,10 @@ - id: BookSpaceLaw # Begin DeltaV additions - id: BoxPDAPrisoner - - id: ClothingShoesBootsWinterWarden - id: BoxEncryptionKeyPrisoner - id: LunchboxSecurityFilledRandom prob: 0.3 + - id: ClothingOuterVestPlateCarrierAdv # End DeltaV additions - id: ClothingNeckShockCollar amount: 2 @@ -42,25 +42,25 @@ contents: - id: FlashlightSeclite - id: WeaponDisabler - prob: 0.3 +# prob: 0.3 # DeltaV - just give them the damn disabler - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden +# - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence +# - id: ClothingOuterWinterWarden # DeltaV - removed for incongruence - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity - id: BookSpaceLaw # Begin DeltaV additions - id: BoxPDAPrisoner - - id: ClothingShoesBootsWinterWarden - id: BoxEncryptionKeyPrisoner - id: LunchboxSecurityFilledRandom prob: 0.3 + - id: ClothingOuterVestPlateCarrierAdv # End DeltaV additions - id: ClothingNeckShockCollar amount: 2 @@ -76,30 +76,16 @@ contents: - id: FlashlightSeclite prob: 0.8 - - id: ClothingUniformJumpsuitSecGrey - prob: 0.3 - - id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpsuitSec # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSec # DeltaV - consistency with other sec uniforms - prob: 0.3 +# - id: ClothingUniformJumpsuitSecGrey # DeltaV - remove uniforms from sec lockers +# prob: 0.3 - id: ClothingHeadHelmetBasic - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear prob: 0.4 - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest - id: ClothingOuterArmorDuraVest - - id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3 - prob: 0.75 - - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit - prob: 0.25 - id: ClothingBeltSecurityFilled - id: Flash - prob: 0.5 +# prob: 0.5 # DeltaV - standardise spare flash - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetSecurity - id: ClothingHandsGlovesColorBlack @@ -120,18 +106,20 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses +# - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked. - id: WeaponDisabler - id: TrackingImplanter amount: 2 -## - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker. +# - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker. - id: BoxSterileMask - id: ClothingHeadHatBeretCorpsman # DeltaV - ClothingHeadHatBeretBrigmedic replaced in favour of corpsman beret. -## - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it. + - id: ClothingHeadsetBrigmedic # DeltaV - add spare headset. +# - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it. - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic -## - id: ClothingUniformJumpskirtOfLife # DeltaV - nah -## prob: 0.1 +# - id: ClothingUniformJumpskirtOfLife # DeltaV - removed for incongruence +# prob: 0.1 + - id: ClothingBeltCorpsmanWebbing # DeltaV - added spare webbing - id: HandheldGPSBasic # Delta V - added it for tracking the implant tracker pop up. - id: MedkitFilled - id: MedkitCombatFilled @@ -146,8 +134,8 @@ prob: 0.3 - id: MedkitBurnFilled prob: 0.7 -## - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why -## prob: 0.15 +# - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - removed for incongruence +# prob: 0.15 - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 @@ -160,13 +148,17 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses +# - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked. - id: WeaponDisabler - id: TrackingImplanter amount: 2 - id: ClothingOuterHardsuitCombatCorpsman + - id: BoxSterileMask + - id: ClothingHeadHatBeretCorpsman # Add corpsman beret. + - id: ClothingHeadsetBrigmedic # Add spare headset. - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic + - id: ClothingBeltCorpsmanWebbing # Added spare webbing - id: HandheldGPSBasic # Added GPS because I just think it should be there tbh. - id: MedkitFilled - id: MedkitCombatFilled @@ -194,11 +186,13 @@ - type: StorageFill contents: - id: ClothingEyesGlassesSecurity - prob: 0.3 - - id: ClothingHeadHatFedoraBrown - - id: ClothingNeckTieDet - - id: ClothingOuterVestDetective - - id: ClothingOuterCoatDetective +# prob: 0.3 # DeltaV - standardise until HUD balance worked out +# - id: ClothingHeadHatFedoraBrown # DeltaV - removed for incongruence +# - id: ClothingNeckTieDet # DeltaV - removed for incongruence +# - id: ClothingOuterVestDetective # DeltaV - removed for incongruence +# - id: ClothingOuterCoatDetective # DeltaV - removed for incongruence + - id: ClothingHeadsetSecurity # DeltaV - add spare headset. + - id: FlippoEngravedLighter # DeltaV - add due to removal of trench coat - id: FlashlightSeclite - id: ForensicScanner - id: LogProbeCartridge diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index 91e45c83916..b6b1dc26be4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -1,16 +1,22 @@ - type: vendingMachineInventory id: DetDrobeInventory startingInventory: - ClothingUniformJumpsuitDetective: 2 - ClothingUniformJumpskirtDetective: 2 - ClothingShoesColorBrown: 2 - ClothingOuterCoatDetectiveLoadout: 2 - ClothingHeadHatFedoraBrown: 2 - ClothingUniformJumpsuitDetectiveGrey: 2 - ClothingUniformJumpskirtDetectiveGrey: 2 - ClothingOuterVestDetective: 2 - ClothingNeckTieDet: 2 - ClothingHeadHatFedoraGrey: 2 +# ClothingUniformJumpsuitDetective: 2 # DeltaV - removed for incongruence +# ClothingUniformJumpskirtDetective: 2 # DeltaV - removed for incongruence +# ClothingShoesColorBrown: 2 # DeltaV - removed for incongruence +# ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - removed for incongruence +# ClothingHeadHatFedoraBrown: 2 # DeltaV - removed for incongruence +# ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - removed for incongruence +# ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - removed for incongruence +# ClothingOuterVestDetective: 2 # DeltaV - removed for incongruence +# ClothingNeckTieDet: 2 # DeltaV - removed for incongruence +# ClothingHeadHatFedoraGrey: 2 # DeltaV - removed for incongruence + ClothingUniformJumpsuitForensicSpec: 2 # DeltaV + ClothingUniformJumpskirtForensicSpec: 2 # DeltaV ClothingHandsGlovesColorBlack: 2 ClothingHandsGlovesLatex: 2 ClothingHeadsetSecurity: 2 + ForensicPad: 10 # DeltaV + BoxFolderBlack: 2 # DeltaV + BoxEvidenceMarkers: 1 # DeltaV + HandLabeler: 1 # DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 65dacf75d19..20040d40681 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -28,6 +28,6 @@ BreachingCharge: 8 # DeltaV - added breaching charges # security officers need to follow a diet regimen! contrabandInventory: - FoodDonutHomer: 12 - FoodBoxDonut: 2 +# FoodDonutHomer: 12 # DeltaV - removed for incongruence at maintainer request +# FoodBoxDonut: 2 # DeltaV - removed for incongruence at maintainer request #box evidence diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 3bc8f7287bb..b19ed1da6c5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -4,21 +4,27 @@ ClothingBackpackSecurity: 3 ClothingBackpackSatchelSecurity: 3 ClothingBackpackDuffelSecurity: 3 - ClothingUniformJumpsuitSec: 3 +# ClothingUniformJumpsuitSec: 3 # DeltaV - moved* ClothingShoesBootsJack: 3 ClothingHeadHatBeretSecurity: 3 -## ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction - ClothingHeadBandRed: 3 + ClothingMaskNeckGaiter: 3 # DeltaV - add neck gaiters to secdrobe + ClothingMaskGasSecurity: 3 # DeltaV - add security gas masks to secdrobe +# ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction +# ClothingHeadBandRed: 3 # DeltaV - removed for incongruency # ClothingMaskNeckGaiterRed: 3 # DeltaV - removed ClothingHandsGlovesColorBlack: 3 ClothingHandsGlovesFingerless: 3 + ClothingUniformJumpsuitSec: 3 # DeltaV - *moved ClothingUniformJumpskirtSec: 3 ClothingUniformJumpsuitSecGrey: 3 ClothingUniformJumpskirtSecGrey: 3 ClothingUniformJumpsuitSecBlue: 3 ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe + ClothingUniformJumpsuitSecFormal: 1 # DeltaV - add formal uniform to secdrobe + ClothingUniformJumpskirtSecFormal: 1 # DeltaV - add formal uniform to secdrobe ClothingHeadsetSecurity: 3 ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe + ClothingOuterStasecSweater: 2 # DeltaV - add sweaters to secdrobe ClothingOuterCoatStasec: 2 # DeltaV - replace ClothingOuterWinterSec ClothingOuterGreatcoatStasec: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times. ## ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech @@ -26,11 +32,7 @@ ClothingNeckScarfStripedRed: 3 ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 - ClothingShoesBootsWinterSec: 2 +# ClothingShoesBootsWinterSec: 2 # DeltaV - removed for incongruency # ClothingHeadHelmetJustice: 1 # DeltaV - lrp - # Begin DeltaV additions - ClothingShoesBootsCowboyBlack: 1 - ClothingHeadHatCowboyBlack: 1 - # End DeltaV additions contrabandInventory: - ClothingMaskClownSecurity: 1 +# ClothingMaskClownSecurity: 1 # DeltaV - removed for incongruency diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index dd711b18926..151c9b5f9d0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -82,6 +82,14 @@ ClothingOuterSuitCarp: 2 # DeltaV - Move carp suit out of syndicate uplink into the AutoDrobe ClothingShoesBootsWinterClown: 2 #Delta V: Add departmental winter boots ClothingShoesBootsWinterMime: 2 #Delta V: Add departmental winter boots + ClothingUniformJumpsuitDetective: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetective: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpsuitDetectiveGrey: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetectiveGrey: 1 # DeltaV - moved from detdrobe + ClothingOuterCoatDetectiveLoadout: 1 # DeltaV - moved from detdrobe + ClothingNeckTieDet: 1 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraBrown: 1 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraGrey: 1 # DeltaV - moved from detdrobe ClothingHeadHatCowboyBrown: 1 ClothingHeadHatCowboyBlack: 1 ClothingHeadHatCowboyWhite: 1 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml index 31e231d0c09..2ffa4978b6e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml @@ -82,6 +82,6 @@ - id: BoxPDASecurity - id: WeaponEnergyGunMultiphase - id: HoSIDCard - - id: ClothingShoesBootsWinterHeadOfSecurity + - id: ClothingOuterVestPlateCarrierAdv - id: LunchboxCommandFilledRandom prob: 0.3 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 06e114c3d2e..40e5381b843 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -59,6 +59,19 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi +# Senior Officer uniform + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtSecSenior + name: senior officer's jumpskirt + description: A tight-fitting tactical jumpsuit, made of light and breathable yet durable material. This one seems to have a skirt stitched to the waist. Curious. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi + # Warden alt uniforms - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 9eaba81c7a8..93c3a597d73 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -222,7 +222,7 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi -# Detective uniform +# Senior Officer uniform - type: entity parent: ClothingUniformFoldableBase diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index b78f1c61e3b..0757fb27844 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -25,7 +25,7 @@ - SecurityShoes - SecurityOuterClothing - MedicalGloves - - SurvivalCorpsman + - SurvivalSecurity # DeltaV - replace SurvivalCorpsman for incongruence - Trinkets - GroupSpeciesBreathToolCorpsman diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index b1c10aaf51b..559e9d36686 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -23,13 +23,13 @@ contents: - id: SmokingPipeFilledTobacco - id: FlippoEngravedLighter - - type: Armor #same as regular sec armor - modifiers: - coefficients: - Blunt: 0.70 - Slash: 0.70 - Piercing: 0.70 - Heat: 0.80 +# - type: Armor #same as regular sec armor # DeltaV - remove armour as it is no longer security equipment. +# modifiers: +# coefficients: +# Blunt: 0.70 +# Slash: 0.70 +# Piercing: 0.70 +# Heat: 0.80 - type: entity parent: ClothingOuterCoatDetective diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 52c934c2287..cee5b039130 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -150,9 +150,9 @@ name: security winter boots components: - type: Sprite - sprite: Clothing/Shoes/Boots/winterbootssec.rsi + sprite: DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi # DeltaV - resprite boots to meet standards - type: Clothing - sprite: Clothing/Shoes/Boots/winterbootssec.rsi + sprite: DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi # DeltaV - resprite boots to meet standards - type: entity parent: [ClothingShoesBaseWinterBoots, BaseSyndicateContraband] diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index e8afa5a203c..d2cca17d281 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -36,6 +36,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtDetectiveGrey +- type: loadout # DeltaV + id: ForensicSpecJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitForensicSpec + +- type: loadout # DeltaV + id: ForensicSpecJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtForensicSpec + # OuterClothing - type: loadout id: DetectiveArmorVest diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 6f2d205be07..6e35e8ca032 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -9,6 +9,26 @@ equipment: jumpsuit: ClothingUniformJumpskirtHoS +- type: loadout # DeltaV + id: HeadofSecurityJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitHoSGrey + +- type: loadout # DeltaV + id: HeadofSecurityJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtHoSGrey + +- type: loadout # DeltaV + id: HeadofSecurityJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitHoSBlue + +- type: loadout # DeltaV + id: HeadofSecurityJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtHoSBlue + - type: loadout id: HeadofSecurityTurtleneck equipment: @@ -72,6 +92,16 @@ equipment: outerClothing: ClothingOuterWinterHoS +- type: loadout # DeltaV - security winter coat + id: StasecWinterCoatHoS + equipment: + outerClothing: ClothingOuterCoatStasecHoS + +- type: loadout # DeltaV - security greatcoat + id: StasecGreatcoatHoS + equipment: + outerClothing: ClothingOuterGreatcoatStasecHoS + # Shoes - DeltaV - type: loadout # DeltaV id: HeadOfSecurityWinterBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 0a1e8ced320..f55a23e17d6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -86,6 +86,22 @@ equipment: jumpsuit: ClothingUniformJumpskirtSeniorOfficer +- type: loadout # DeltaV + id: SeniorSecOfficerJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: SeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpsuitSecSenior + +- type: loadout # DeltaV + id: SeniorSecOfficerJumpskirt + effects: + - !type:GroupLoadoutEffect + proto: SeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpskirtSecSenior + # Back - type: loadout id: SecurityBackpack @@ -139,6 +155,21 @@ equipment: outerClothing: ClothingOuterWinterSec +- type: loadout + id: StasecSweater + equipment: + outerClothing: ClothingOuterStasecSweater + +- type: loadout # DeltaV - security winter coat + id: StasecWinterCoat + equipment: + outerClothing: ClothingOuterCoatStasec + +- type: loadout # DeltaV - security greatcoat + id: StasecGreatcoat + equipment: + outerClothing: ClothingOuterGreatcoatStasec + # Shoes - type: loadout id: CombatBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index 9c270e6d6fd..06cb118ec5d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -20,6 +20,26 @@ equipment: jumpsuit: ClothingUniformJumpskirtWarden +- type: loadout # DeltaV + id: WardenJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitWardenGrey + +- type: loadout # DeltaV + id: WardenJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtWardenGrey + +- type: loadout # DeltaV + id: WardenJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitWardenBlue + +- type: loadout # DeltaV + id: WardenJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtWardenBlue + # OuterClothing - type: loadout id: WardenCoat @@ -30,3 +50,13 @@ id: WardenArmoredWinterCoat equipment: outerClothing: ClothingOuterWinterWarden + +- type: loadout # DeltaV - security winter coat + id: StasecWinterCoatWarden + equipment: + outerClothing: ClothingOuterCoatStasecWarden + +- type: loadout # DeltaV - security greatcoat + id: StasecGreatcoatWarden + equipment: + outerClothing: ClothingOuterGreatcoatStasecWarden diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 2631b5cd3bd..8afbddd8f22 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1076,12 +1076,16 @@ loadouts: - HeadofSecurityJumpsuit - HeadofSecurityJumpskirt - - HeadofSecurityTurtleneck - - HeadofSecurityTurtleneckSkirt + - HeadofSecurityJumpsuitGrey # DeltaV + - HeadofSecurityJumpskirtGrey # DeltaV + - HeadofSecurityJumpsuitBlue # DeltaV + - HeadofSecurityJumpskirtBlue # DeltaV +# - HeadofSecurityTurtleneck # DeltaV - removed for incongruence +# - HeadofSecurityTurtleneckSkirt # DeltaV - removed for incongruence - HeadofSecurityFormalSuit - HeadofSecurityFormalSkirt - - HeadofSecurityParadeSuit - - HeadofSecurityParadeSkirt +# - HeadofSecurityParadeSuit # DeltaV - removed for incongruence +# - HeadofSecurityParadeSkirt # DeltaV - removed for incongruence - type: loadoutGroup id: HeadofSecurityNeck @@ -1096,14 +1100,18 @@ id: HeadofSecurityOuterClothing name: loadout-group-head-of-security-outerclothing loadouts: - - HeadofSecurityCoat - - HeadofSecurityWinterCoat +# - HeadofSecurityCoat # DeltaV - removed for incongruence +# - HeadofSecurityWinterCoat # DeltaV - removed for incongruence + - PlateCarrier # DeltaV + - DuraVest # DeltaV + - StasecWinterCoatHoS # DeltaV + - StasecGreatcoatHoS # DeltaV - type: loadoutGroup # DeltaV - id: HeadOfSecurityShoes + id: HeadofSecurityShoes name: loadout-group-head-of-security-shoes loadouts: - - CombatBoots +# - CombatBoots # DeltaV - removed for standardisation of equipment - JackBoots # DeltaV - SecurityWinterBoots - HeadOfSecurityWinterBoots # DeltaV @@ -1122,13 +1130,21 @@ loadouts: - WardenJumpsuit - WardenJumpskirt + - WardenJumpsuitGrey # DeltaV + - WardenJumpskirtGrey # DeltaV + - WardenJumpsuitBlue # DeltaV + - WardenJumpskirtBlue # DeltaV - type: loadoutGroup id: WardenOuterClothing name: loadout-group-warden-outerclothing loadouts: - - WardenCoat - - WardenArmoredWinterCoat +# - WardenCoat # DeltaV - removed for incongruence +# - WardenArmoredWinterCoat # DeltaV - removed for incongruence + - PlateCarrier # DeltaV + - DuraVest # DeltaV + - StasecWinterCoatWarden # DeltaV + - StasecGreatcoatWarden # DeltaV - type: loadoutGroup id: SecurityHead @@ -1137,8 +1153,8 @@ loadouts: - SecurityHelmet - SecurityBeret - - SecurityHat - - MimeHead # DeltaV - Red Beret +# - SecurityHat # DeltaV - removed for incongruence +# - MimeHead # DeltaV - Red Beret | removed for incongruence - type: loadoutGroup id: SecurityJumpsuit @@ -1150,8 +1166,10 @@ - SecurityJumpskirtGrey - SecurityJumpsuitBlue # DeltaV - SecurityJumpskirtBlue # DeltaV - - SeniorOfficerJumpsuit - - SeniorOfficerJumpskirt +# - SeniorOfficerJumpsuit # DeltaV - removed for incongruence +# - SeniorOfficerJumpskirt # DeltaV - removed for incongruence + - SeniorSecOfficerJumpsuit # DeltaV + - SeniorSecOfficerJumpskirt # DeltaV - type: loadoutGroup id: SecurityBackpack @@ -1172,11 +1190,14 @@ id: SecurityOuterClothing name: loadout-group-security-outerclothing loadouts: - - ArmorVest +# - ArmorVest # DeltaV - removed for incongruence - PlateCarrier # DeltaV - DuraVest # DeltaV - - ArmorVestSlim - - SecurityOfficerWintercoat +# - ArmorVestSlim - removed for incongruence +# - SecurityOfficerWintercoat - removed for incongruence + - StasecSweater # DeltaV + - StasecWinterCoat # DeltaV + - StasecGreatcoat # DeltaV - type: loadoutGroup id: SecurityShoes @@ -1219,10 +1240,12 @@ id: DetectiveJumpsuit name: loadout-group-detective-jumpsuit loadouts: - - DetectiveJumpsuit - - DetectiveJumpskirt - - NoirJumpsuit - - NoirJumpskirt +# - DetectiveJumpsuit # DeltaV - removed for incongruence +# - DetectiveJumpskirt # DeltaV - removed for incongruence +# - NoirJumpsuit # DeltaV - removed for incongruence +# - NoirJumpskirt # DeltaV - removed for incongruence + - ForensicSpecJumpsuit # DeltaV + - ForensicSpecJumpskirt # DeltaV - type: loadoutGroup id: DetectiveOuterClothing @@ -1249,12 +1272,12 @@ - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen -- type: loadoutGroup - id: SecurityStar - name: loadout-group-security-star - minLimit: 0 - loadouts: - - SecStar +#- type: loadoutGroup # DeltaV - removed for incongruence +# id: SecurityStar +# name: loadout-group-security-star +# minLimit: 0 +# loadouts: +# - SecStar # Medical - type: loadoutGroup diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 7f14e06effb..056ac9520c6 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -365,10 +365,10 @@ - SecurityBackpack - SecurityBelt - HeadofSecurityOuterClothing - - HeadOfSecurityShoes # DeltaV, replaces SecurityShoes + - HeadofSecurityShoes # DeltaV - winter boots - SurvivalSecurity - Trinkets - - SecurityStar +# - SecurityStar # DeltaV - removed for incongruence - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -383,7 +383,7 @@ - SecurityShoes - SurvivalSecurity - Trinkets - - SecurityStar +# - SecurityStar # DeltaV - removed for incongruence - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -399,28 +399,28 @@ - SecurityBelt - SurvivalSecurity - Trinkets - - SecurityStar +# - SecurityStar # DeltaV - removed for incongruence - GroupSpeciesBreathToolSecurity - type: roleLoadout id: JobDetective groups: - GroupTankHarness - - DetectiveHead - - DetectiveNeck + - SecurityHead # DeltaV - replace DetectiveHead for incongruence + - SecurityNeck # DeltaV - replace DetectiveNeck for incongruence - DetectiveJumpsuit - SecurityBackpack - - DetectiveOuterClothing + - SecurityOuterClothing # DeltaV - replace DetectiveOuterClothing for incongruence - SecurityShoes - SurvivalSecurity - Trinkets - - SecurityStar +# - SecurityStar # DeltaV - removed for incongruence - GroupSpeciesBreathToolSecurity - type: roleLoadout id: JobSecurityCadet groups: - - SecurityCadetHead # DeltaV + - SecurityHead # DeltaV - SecurityNeck # DeltaV - SecurityCadetJumpsuit - SecurityBackpack diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml index 349f819404e..3eaec9142ef 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml @@ -4,7 +4,16 @@ ClothingUniformJumpsuitReporter: 2 ClothingShoesColorBlack: 2 ClothingShoesColorWhite: 2 + ClothingShoesBootsLaceup: 2 # DeltaV - added for more shoe options + ClothingShoesLeather: 2 # DeltaV - added for more shoe options ClothingOuterVestFlakPress: 2 + ClothingUniformJumpsuitDetective: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetective: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - moved from detdrobe + ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - moved from detdrobe + ClothingNeckTieDet: 2 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraBrown: 2 # DeltaV - moved from detdrobe ClothingHeadHatFedoraGrey: 2 RadioHandheld: 2 ClothingHeadsetService: 2 diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png index fdd49ef9960..8241bbb4499 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png index cdd85d3b304..c95c7757a1d 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png index 52de63a3825..8abe5221b64 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png index 93d8d3da759..bc6e7de7ee5 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json index f0fd68e2074..4004890b236 100644 --- a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by TJohnson", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png new file mode 100644 index 00000000000..6f620dc580d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png new file mode 100644 index 00000000000..395c3a19039 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png new file mode 100644 index 00000000000..9eb52434a23 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png new file mode 100644 index 00000000000..c176c9ba3ba Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json new file mode 100644 index 00000000000..f20ba670cb0 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord). Further modified by TJohnson for DeltaV" , + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..3d750922b38 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/icon.png new file mode 100644 index 00000000000..95a1e8db127 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-left.png new file mode 100644 index 00000000000..8a40a279de3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-right.png new file mode 100644 index 00000000000..2db19a6e844 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..0727c404488 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/rolled-equipped-INNERCLOTHING.png differ