From 3bc94dfcc7579339fa96bbf0b2010dce1a44f18f Mon Sep 17 00:00:00 2001 From: Unkn0wn_Gh0st Date: Fri, 6 Dec 2024 21:44:18 -0600 Subject: [PATCH] 1984 Deathsquads --- .../Objects/Weapons/Guns/Rifles/rifles.yml | 4 +- .../Entities/Clothing/Back/backpacks.yml | 19 ++-- .../Clothing/Head/hardsuit-helmets.yml | 51 +++++------ .../Entities/Clothing/Masks/masks.yml | 35 ++++---- .../Clothing/OuterClothing/hardsuits.yml | 71 +++++++-------- .../Entities/Clothing/Uniforms/jumpsuits.yml | 21 ++--- .../Entities/Mobs/Player/humanoid.yml | 67 +++++++------- .../Entities/Objects/Devices/pda.yml | 15 ++-- .../Objects/Misc/identification_cards.yml | 25 +++--- .../Weapons/Guns/Battery/battery_guns.yml | 53 +++++------ .../Weapons/Guns/Revolvers/revolvers.yml | 2 +- .../Roles/Jobs/CentComm/deathsquad.yml | 87 ++++++++++--------- .../Prototypes/Roles/Jobs/departments.yml | 4 +- .../Prototypes/Roles/play_time_trackers.yml | 5 +- 14 files changed, 235 insertions(+), 224 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index a93657a325b..4934da680a5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/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 \ No newline at end of file + delay: 0 #Straight up doesn't work for guns diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 9c6716ca758..957a7e6c797 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index ce8b437cdfc..f324a5a8ad3 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index a3e998748ca..eb988f2c084 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 04265c665dd..857cdd6c779 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index d3c46470af3..c8474229c32 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index c73a2e6f935..43139c40de4 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index df7de6418a2..f976aef95b2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 802b5c79b58..0e13517edb8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index d6269efcc0d..babdbc7dbbd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -298,32 +298,33 @@ maxCharge: 5000 startingCharge: 5000 -- type: entity - name: pulse rifle - parent: [BaseWeaponBattery, BaseGunWieldable] - id: WeaponPulseRifle - description: A weapon that is almost as infamous as its users. - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-unshaded-4 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Clothing - sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi - - type: Gun - fireRate: 1.5 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - - type: HitscanBatteryAmmoProvider - proto: Pulse - fireCost: 100 - - type: Battery - maxCharge: 40000 - startingCharge: 40000 +# DeltaV - 1984 Deathsquad +#- type: entity + #name: pulse rifle + #parent: [BaseWeaponBattery, BaseGunWieldable] + #id: WeaponPulseRifle + #description: A weapon that is almost as infamous as its users. + #components: + #- type: Sprite + #sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi + #layers: + #- state: base + #map: ["enum.GunVisualLayers.Base"] + #- state: mag-unshaded-4 + #map: ["enum.GunVisualLayers.MagUnshaded"] + #shader: unshaded + #- type: Clothing + #sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi + #- type: Gun + #fireRate: 1.5 + #soundGunshot: + #path: /Audio/Weapons/Guns/Gunshots/laser3.ogg + #- type: HitscanBatteryAmmoProvider + #proto: Pulse + #fireCost: 100 + #- type: Battery + #maxCharge: 40000 + #startingCharge: 40000 - type: entity name: laser cannon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 1de11c50474..bb5f79cde16 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -98,7 +98,7 @@ name: Mateba parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverMateba - description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. + description: The iconic sidearm of the that packes a powerful punch. Uses .45 magnum ammo. # DeltaV - 1984 Deathsquad components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml index 5f731fa582e..f16fa12d678 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -1,44 +1,45 @@ -- type: job - id: DeathSquad - name: job-name-deathsquad - description: job-description-deathsquad - playTimeTracker: JobDeathSquad - setPreference: false - startingGear: DeathSquadGear - icon: "JobIconNanotrasen" - supervisors: job-supervisors-centcom - canBeAntag: false - accessGroups: - - AllAccess - access: - - CentralCommand +# DeltaV - 1984 Deathsquad +#- type: job + #id: DeathSquad + #name: job-name-deathsquad + #description: job-description-deathsquad + #playTimeTracker: JobDeathSquad + #setPreference: false + #startingGear: DeathSquadGear + #icon: "JobIconNanotrasen" + #supervisors: job-supervisors-centcom + #canBeAntag: false + #accessGroups: + #- AllAccess + #access: + #- CentralCommand -- type: startingGear - id: DeathSquadGear - equipment: - jumpsuit: ClothingUniformJumpsuitDeathSquad - back: ClothingBackpackDeathSquad - mask: ClothingMaskGasDeathSquad - eyes: ClothingEyesHudSecurity - ears: ClothingHeadsetAltCentCom - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitDeathsquad - shoes: ClothingShoesBootsMagAdv - id: DeathsquadPDA - pocket1: EnergySword - pocket2: EnergyShield - belt: ClothingBeltMilitaryWebbingMedFilled - storage: - back: - - WeaponPulsePistol - - WeaponRevolverMateba - - SpeedLoaderMagnumAP - - SpeedLoaderMagnumAP - - BoxFlashbang - - ToolDebug # spanish army knife - - WelderExperimental - - Hypospray - - DeathAcidifierImplanter # crew will try to steal their amazing hardsuits - - FreedomImplanter - inhand: - - WeaponPulseRifle +#- type: startingGear + #id: DeathSquadGear + #equipment: + #jumpsuit: ClothingUniformJumpsuitDeathSquad + #back: ClothingBackpackDeathSquad + #mask: ClothingMaskGasDeathSquad + #eyes: ClothingEyesHudSecurity + #ears: ClothingHeadsetAltCentCom + #gloves: ClothingHandsGlovesCombat + #outerClothing: ClothingOuterHardsuitDeathsquad + #shoes: ClothingShoesBootsMagAdv + #id: DeathsquadPDA + #pocket1: EnergySword + #pocket2: EnergyShield + #belt: ClothingBeltMilitaryWebbingMedFilled + #storage: + #back: + #- WeaponPulsePistol + #- WeaponRevolverMateba + #- SpeedLoaderMagnumAP + #- SpeedLoaderMagnumAP + #- BoxFlashbang + #- ToolDebug # spanish army knife + #- WelderExperimental + #- Hypospray + #- DeathAcidifierImplanter # crew will try to steal their amazing hardsuits + #- FreedomImplanter + #inhand: + #- WeaponPulseRifle diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index c009181d6fd..7b88fafbb30 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -51,7 +51,7 @@ - ERTMedical - ERTSecurity - ERTEngineer - - DeathSquad + #- DeathSquad # DeltaV - 1984 Deathsquad editorHidden: true weight: 120 @@ -77,7 +77,7 @@ - ERTMedical - ERTSecurity - ERTEngineer - - DeathSquad + #- DeathSquad # DeltaV - 1984 Deathsquad - StationAi # DeltaV - added for playtime trackers primary: false weight: 100 diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 26647e79ae0..b3292f9d1a1 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -64,8 +64,9 @@ - type: playTimeTracker id: JobERTSecurity -- type: playTimeTracker - id: JobDeathSquad +# DeltaV - 1984 Deathsquad +#- type: playTimeTracker + #id: JobDeathSquad - type: playTimeTracker id: JobCBURN