1984 Deathsquads

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -60,7 +60,7 @@
   parent: [BaseWeaponRifle, BaseGunWieldable]
   id: WeaponRifleJackdaw
   description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
-  suffix: Deathsquad
+  suffix: Admeme #1984 Deathsquad
   components:
   - type: Item
     size: Large
@@ -211,4 +211,4 @@
     graph: WeaponRifleMusketGraph
     node: musket
   - type: UseDelay
-    delay: 0 #Straight up doesn't work for guns
+    delay: 0 #Straight up doesn't work for guns

Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

@@ -258,15 +258,16 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertchaplain.rsi
 
-- type: entity
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackDeathSquad
-  name: death squad backpack
-  description: Holds the kit of CentComm's most feared agents.
-  components:
-    - type: Storage
-      grid:
-      - 0,0,7,6
+# DeltaV - 1984 Deathsquad
+#- type: entity
+  #parent: ClothingBackpackERTSecurity
+  #id: ClothingBackpackDeathSquad
+  #name: death squad backpack
+  #description: Holds the kit of CentComm's most feared agents.
+  #components:
+    #- type: Storage
+      #grid:
+      #- 0,0,7,6
 
 #Syndicate
 - type: entity

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -682,32 +682,33 @@
         Piercing: 0.9
         Heat: 0.9
 
+# DeltaV - 1984 Deathsquad
 #Deathsquad Hardsuit
-- type: entity
-  parent: [ BaseCentcommContraband, ClothingHeadHardsuitBase ]
-  id: ClothingHeadHelmetHardsuitDeathsquad
-  name: deathsquad hardsuit helmet
-  description: A robust helmet for special operations.
-  components:
-  - type: BreathMask
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/deathsquad.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/deathsquad.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.08
-    lowPressureMultiplier: 1000
-  - type: FireProtection
-    reduction: 0.2
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.80
-        Slash: 0.80
-        Piercing: 0.80
-        Heat: 0.80
-        Radiation: 0.80
-        Caustic: 0.95
+#- type: entity
+  #parent: [ BaseCentcommContraband, ClothingHeadHardsuitBase ]
+  #id: ClothingHeadHelmetHardsuitDeathsquad
+  #name: deathsquad hardsuit helmet
+  #description: A robust helmet for special operations.
+  #components:
+  #- type: BreathMask
+  #- type: Sprite
+    #sprite: Clothing/Head/Hardsuits/deathsquad.rsi
+  #- type: Clothing
+    #sprite: Clothing/Head/Hardsuits/deathsquad.rsi
+  #- type: PressureProtection
+    #highPressureMultiplier: 0.08
+    #lowPressureMultiplier: 1000
+  #- type: FireProtection
+    #reduction: 0.2
+  #- type: Armor
+    #modifiers:
+      #coefficients:
+        #Blunt: 0.80
+        #Slash: 0.80
+        #Piercing: 0.80
+        #Heat: 0.80
+        #Radiation: 0.80
+        #Caustic: 0.95
 
 #MISC. HARDSUITS
 #Clown Hardsuit

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -428,23 +428,24 @@
         Piercing: 0.95
         Heat: 0.95
 
-- type: entity
-  parent: ClothingMaskGasERT
-  id: ClothingMaskGasDeathSquad
-  name: death squad gas mask
-  description: A unique gas mask for the NT's most elite squad.
-  components:
-  - type: Sprite
-    sprite: Clothing/Mask/squadron.rsi
-  - type: Clothing
-    sprite: Clothing/Mask/squadron.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.80
-        Slash: 0.80
-        Piercing: 0.90
-        Heat: 0.90
+# DeltaV - 1984 Deathsquad
+#- type: entity
+  #parent: ClothingMaskGasERT
+  #id: ClothingMaskGasDeathSquad
+  #name: death squad gas mask
+  #description: A unique gas mask for the NT's most elite squad.
+  #components:
+  #- type: Sprite
+    #sprite: Clothing/Mask/squadron.rsi
+  #- type: Clothing
+    #sprite: Clothing/Mask/squadron.rsi
+  #- type: Armor
+    #modifiers:
+      #coefficients:
+        #Blunt: 0.80
+        #Slash: 0.80
+        #Piercing: 0.90
+        #Heat: 0.90
 
 - type: entity
   parent: ClothingMaskBase

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -873,42 +873,43 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTJanitor
 
+# DeltaV - 1984 Deathsquad
 #Deathsquad
-- type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ]
-  id: ClothingOuterHardsuitDeathsquad
-  name: death squad hardsuit
-  description: An advanced hardsuit favored by commandos for use in special operations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.02
-    lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.001
-    coolingCoefficient: 0.001
-  - type: ExplosionResistance
-    damageCoefficient: 0.2
-  - type: FireProtection
-    reduction: 0.8
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.1 #best armor in the game
-        Slash: 0.1
-        Piercing: 0.1
-        Heat: 0.1
-        Radiation: 0.1
-        Caustic: 0.1
-  - type: ClothingSpeedModifier
-    walkModifier: 1.0
-    sprintModifier: 1.0
-  - type: HeldSpeedModifier
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad
+#- type: entity
+  #parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ]
+  #id: ClothingOuterHardsuitDeathsquad
+  #name: death squad hardsuit
+  #description: An advanced hardsuit favored by commandos for use in special operations.
+  #components:
+  #- type: Sprite
+    #sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
+  #- type: Clothing
+    #sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
+  #- type: PressureProtection
+    #highPressureMultiplier: 0.02
+    #lowPressureMultiplier: 1000
+  #- type: TemperatureProtection
+    #heatingCoefficient: 0.001
+    #coolingCoefficient: 0.001
+  #- type: ExplosionResistance
+    #damageCoefficient: 0.2
+  #- type: FireProtection
+    #reduction: 0.8
+  #- type: Armor
+    #modifiers:
+      #coefficients:
+        #Blunt: 0.1 #best armor in the game
+        #Slash: 0.1
+        #Piercing: 0.1
+        #Heat: 0.1
+        #Radiation: 0.1
+        #Caustic: 0.1
+  #- type: ClothingSpeedModifier
+    #walkModifier: 1.0
+    #sprintModifier: 1.0
+  #- type: HeldSpeedModifier
+  #- type: ToggleableClothing
+    #clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad
 
 #CBURN Hardsuit
 - type: entity

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -1,13 +1,14 @@
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitDeathSquad
-  name: death squad uniform
-  description: Advanced armored jumpsuit used by special forces in special operations.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi
+# DeltaV - 1984 Deathsquad
+#- type: entity
+  #parent: ClothingUniformBase
+  #id: ClothingUniformJumpsuitDeathSquad
+  #name: death squad uniform
+  #description: Advanced armored jumpsuit used by special forces in special operations.
+  #components:
+  #- type: Sprite
+    #sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi
+  #- type: Clothing
+    #sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi
 
 - type: entity
   parent: ClothingUniformBase

Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

@@ -14,41 +14,42 @@
     - type: MindShield
     - type: AntagImmune
 
+# DeltaV - 1984 Deathsquad
 ## Death Squad
 
-- type: entity
-  id: RandomHumanoidSpawnerDeathSquad
-  name: Death Squad Agent
-  suffix: ERTRole, Death Squad
-  components:
-    - type: Sprite
-      sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
-      state: icon
-    - type: RandomMetadata
-      nameSegments:
-        - NamesFirstMilitaryLeader
-        - NamesLastMilitary
-    - type: RandomHumanoidSpawner
-      settings: DeathSquad
-
-- type: randomHumanoidSettings
-  id: DeathSquad
-  parent: EventHumanoidMindShielded
-  randomizeName: false
-  components:
-    - type: GhostRole
-      name: ghost-role-information-Death-Squad-name
-      description: ghost-role-information-Death-Squad-description
-      rules: ghost-role-information-Death-Squad-rules
-      raffle:
-        settings: short
-    - type: Loadout
-      prototypes: [ DeathSquadGear ]
-      roleLoadout: [ RoleSurvivalEVA ]
-    - type: RandomMetadata
-      nameSegments:
-        - NamesFirstMilitaryLeader
-        - NamesLastMilitary
+#- type: entity
+  #id: RandomHumanoidSpawnerDeathSquad
+  #name: Death Squad Agent
+  #suffix: ERTRole, Death Squad
+  #components:
+    #- type: Sprite
+      #sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
+      #state: icon
+    #- type: RandomMetadata
+      #nameSegments:
+        #- NamesFirstMilitaryLeader
+        #- NamesLastMilitary
+    #- type: RandomHumanoidSpawner
+      #settings: DeathSquad
+
+#- type: randomHumanoidSettings
+  #id: DeathSquad
+  #parent: EventHumanoidMindShielded
+  #randomizeName: false
+  #components:
+    #- type: GhostRole
+      #name: ghost-role-information-Death-Squad-name
+      #description: ghost-role-information-Death-Squad-description
+      #rules: ghost-role-information-Death-Squad-rules
+      #raffle:
+        #settings: short
+    #- type: Loadout
+      #prototypes: [ DeathSquadGear ]
+      #roleLoadout: [ RoleSurvivalEVA ]
+    #- type: RandomMetadata
+      #nameSegments:
+        #- NamesFirstMilitaryLeader
+        #- NamesLastMilitary
 
 
 ## ERT Leader

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -822,13 +822,14 @@
       - AstroNavCartridge
       - StockTradingCartridge # Delta-V
 
-- type: entity
-  parent: CentcomPDA
-  id: DeathsquadPDA
-  suffix: Death Squad
-  components:
-  - type: Pda
-    id: CentcomIDCardDeathsquad
+# DeltaV - 1984 Deathsquad
+#- type: entity
+  #parent: CentcomPDA
+  #id: DeathsquadPDA
+  #suffix: Death Squad
+  #components:
+  #- type: Pda
+    #id: CentcomIDCardDeathsquad
 
 - type: entity
   parent: BasePDA

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -564,18 +564,19 @@
     - type: PresetIdCard
       job: Musician
 
-- type: entity
-  parent: IDCardStandard
-  id: CentcomIDCardDeathsquad
-  name: death squad ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: centcom
-  - type: Item
-    heldPrefix: blue
-  - type: PresetIdCard
-    job: DeathSquad
+# DeltaV - 1984 Deathsquad
+#- type: entity
+  #parent: IDCardStandard
+  #id: CentcomIDCardDeathsquad
+  #name: death squad ID card
+  #components:
+  #- type: Sprite
+    #layers:
+    #- state: centcom
+  #- type: Item
+    #heldPrefix: blue
+  #- type: PresetIdCard
+    #job: DeathSquad
 
 - type: entity
   name: passenger ID card