From 59d4c027c7b6d5f72f72c30cc6ccf5905be559e2 Mon Sep 17 00:00:00 2001 From: Fishfish458 <47410468+Fishfish458@users.noreply.github.com> Date: Fri, 8 Apr 2022 16:19:38 -0500 Subject: [PATCH] Remove armor from EVA suit, add base syndie suit to uplink, surplus rifle (#7440) Co-authored-by: fishfish458 --- .../Catalog/Fills/Backpacks/duffelbag.yml | 17 ++++++++-- .../Catalog/Fills/Boxes/ammunition.yml | 11 ++++++ .../Catalog/Fills/Boxes/general.yml | 23 +++++++++++++ .../Prototypes/Catalog/uplink_catalog.yml | 34 +++++++++++++++---- .../Clothing/Head/base_clothinghead.yml | 20 +++++++++++ .../Entities/Clothing/Head/helmets.yml | 16 ++++----- .../OuterClothing/base_clothingouter.yml | 18 ++++++++++ .../Clothing/OuterClothing/hardsuits.yml | 29 ++++------------ 8 files changed, 128 insertions(+), 40 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index da6103f43f..54902f41c3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -58,7 +58,7 @@ parent: ClothingBackpackDuffelSyndicateAmmo id: ClothingBackpackDuffelSyndicateFilledRevolver name: Predator bundle - description: "Go loud and proud with a fully loaded Magnum Predator, bundled with two speed loaders." + description: "Go loud and proud with a fully loaded Magnum Predator, bundled with two speed loaders." components: - type: StorageFill contents: @@ -162,9 +162,20 @@ - id: ClothingHeadPyjamaSyndicateBlack - id: ClothingHeadPyjamaSyndicatePink - id: ClothingShoesSlippers - amount: 3 + amount: 3 - id: BedsheetSyndie - amount: 3 + amount: 3 - id: PlushieCarp - id: PlushieNuke - id: PlushieLizard + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateHardsuitBundle + name: syndicate hardsuit bundle + description: "Contains the Syndicate's signature blood red hardsuit." + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitSyndie + - id: ClothingHeadHelmetHardsuitSyndie diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index fe3e687846..924a5d6bc0 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -697,3 +697,14 @@ - type: Sprite layers: - state: box + +- type: entity + name: box of .30 rifle bullets + parent: BoxCardboard + id: BoxBulletLRifleSmall + description: A box full of individual .30 rifle bullets. + components: + - type: StorageFill + contents: + - id: CartridgeLRifle + amount: 20 diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 51eabce414..39cb18101d 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -241,3 +241,26 @@ - type: Tag tags: - DroneUsable + +- type: entity + name: syndicate EVA box + parent: BoxCardboard + id: BoxSyndicateEVA + description: A box containing one Syndicate approved EVA suit. + components: + - type: Item + size: 40 + - type: Storage + capacity: 40 + size: 10 + whitelist: + components: + - Clothing + - type: StorageFill + contents: + - id: ClothingHeadHelmetSyndicate + - id: ClothingOuterHardsuitSyndicate + - type: Sprite + layers: + - state: box_of_doom + - state: writing diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index d5046a9d75..3911d39500 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -25,6 +25,15 @@ description: A rugged, robust operator handgun with inbuilt silencer. Use pistol magazines (.25 caseless). price: 8 +# Poor accuracy, slow to fire, cheap option +- type: uplinkListing + id: UplinkRifleMosin + category: Weapons + itemId: SniperBoltGunWood + listingName: Surplus Rifle + description: A bolt action service rifle that has seen many wars. Not modern by any standard, hand loaded, and terrible recoil, but it is cheap. + price: 4 + #- type: uplinkListing # id: UplinkCrossbowEnergyMini # category: Weapons @@ -116,6 +125,15 @@ price: 2 icon: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/icon.png +# For the mosin +- type: uplinkListing + id: UplinkMosinAmmo + category: Ammo + itemId: BoxBulletLRifleSmall + description: A box of bullets for the surplus rifle. + price: 2 + + #Utility - type: uplinkListing @@ -203,7 +221,7 @@ id: UplinkCarpDehydrated category: Tools itemId: DehydratedSpaceCarp - price: 5 + price: 3 # Armor @@ -225,14 +243,16 @@ - type: uplinkListing id: UplinkHardsuitSyndie category: Armor - itemId: ClothingOuterHardsuitSyndie - price: 5 + itemId: ClothingBackpackDuffelSyndicateHardsuitBundle + description: The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. + price: 8 - type: uplinkListing - id: UplinkHardsuitSyndieHelmet + id: UplinkEVASyndie category: Armor - itemId: ClothingHeadHelmetHardsuitSyndie - price: 5 + itemId: BoxSyndicateEVA + description: A simple EVA suit that offers no protection other than what's needed to survive in space. + price: 4 # Misc @@ -306,7 +326,7 @@ listingName: Ultragigacancer Health Analyzer description: Works like a normal health analyzer, other than giving everyone it scans ultragigacancer. price: 5 - + - type: uplinkListing id: UplinkNocturineChemistryBottle category: Misc diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index dba182d8d1..d9abf97fef 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -23,6 +23,26 @@ - type: Sprite state: icon +- type: entity + abstract: true + parent: ClothingHeadBase + id: ClothingHeadEVAHelmetBase + name: base space helmet + components: + - type: Clothing + size: 10 + - type: PressureProtection + highPressureMultiplier: 0.6 + lowPressureMultiplier: 10 + - type: TemperatureProtection + coefficient: 0.2 + - type: IngestionBlocker + - type: Tag + tags: + - HidesHair + - type: DiseaseProtection + protection: 0.05 + - type: entity abstract: true parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 41726c91b5..787cff7793 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -13,7 +13,7 @@ resistance: 0.25 # +0.65 from body -> 90% - type: entity - parent: ClothingHeadBase + parent: ClothingHeadEVAHelmetBase id: ClothingHeadHelmetCosmonaut name: cosmonaut helmet description: A deceptively well armored space helmet. Ancient design, but advanced manufacturing. @@ -23,7 +23,7 @@ - type: Clothing sprite: Clothing/Head/Helmets/cosmonaut.rsi - type: IngestionBlocker - + - type: entity parent: ClothingHeadBase id: ClothingHeadHelmetCult @@ -37,7 +37,7 @@ - type: IngestionBlocker - type: entity - parent: ClothingHeadBase + parent: ClothingHeadEVAHelmetBase id: ClothingHeadHelmetEVA name: EVA helmet description: A basic helmet designed for extravehicular activies. @@ -114,7 +114,7 @@ - type: IngestionBlocker - type: entity - parent: ClothingHeadBase + parent: ClothingHeadEVAHelmetBase id: ClothingHeadHelmetSyndicate name: syndicate EVA helmet description: A stylish, robust syndicate helmet @@ -159,7 +159,7 @@ - type: Clothing sprite: Clothing/Head/Helmets/wizardhelm.rsi - type: IngestionBlocker - + - type: entity parent: ClothingHeadHardsuitWithLightBase # hardsuitlight base for light and protection id: ClothingHeadHelmetFire @@ -176,7 +176,7 @@ startingItem: PowerCellSmallHigh - type: TemperatureProtection coefficient: 0.01 - + - type: entity parent: ClothingHeadHardsuitWithLightBase # hardsuitlight base for light and protection id: ClothingHeadHelmetAtmosFire @@ -189,7 +189,7 @@ sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi - type: IngestionBlocker - type: TemperatureProtection - coefficient: 0.005 + coefficient: 0.005 - type: entity parent: ClothingHeadBase @@ -208,4 +208,4 @@ Slash: 0.5 Piercing: 0.5 Heat: 0.9 - + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index f5f7f90bc6..1700e67a1f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -34,3 +34,21 @@ Heat: 0.90 Radiation: 0.25 - type: DiseaseProtection + +- type: entity + abstract: true + parent: ClothingOuterBase + id: ClothingOuterEVASuitBase + name: base EVA Suit + components: + - type: PressureProtection + highPressureMultiplier: 1 + lowPressureMultiplier: 100 + - type: TemperatureProtection + coefficient: 0.01 # Not complete protection from fire + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: Clothing + size: 30 + - type: DiseaseProtection diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 2c0b24a24d..88648de2fd 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -92,11 +92,11 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 #higher physical protections than atmo but less enviro + Blunt: 0.9 #higher physical protections than atmo but less enviro Slash: 0.85 Piercing: 0.9 Heat: 0.85 - Radiation: 0.35 + Radiation: 0.35 - type: entity parent: ClothingOuterHardsuitBase @@ -140,7 +140,7 @@ sprintModifier: 0.8 - type: entity - parent: ClothingOuterHardsuitBase + parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitEVA name: EVA suit description: A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies. @@ -149,17 +149,11 @@ sprite: Clothing/OuterClothing/Hardsuits/eva.rsi - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/eva.rsi - - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 - - type: PressureProtection - highPressureMultiplier: 1 - lowPressureMultiplier: 100 # Moved to hardsuits because this is where EVA capable suits are apparently. # Same stats as normal EVA suit. - type: entity - parent: ClothingOuterHardsuitBase + parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitSyndicate name: syndicate EVA suit description: "Has a tag on it 'Totally not property of an enemy corporation, honest!'" @@ -168,15 +162,9 @@ sprite: Clothing/OuterClothing/Suits/syndicate.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/syndicate.rsi - - type: PressureProtection - highPressureMultiplier: 1 - lowPressureMultiplier: 100 - - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 - type: entity - parent: ClothingOuterHardsuitBase + parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitEVAPrisoner name: prisoner EVA suit description: A lightweight space suit for prisoners to protect them from the vacuum of space during emergencies. @@ -185,9 +173,6 @@ sprite: Clothing/OuterClothing/Hardsuits/evaprisoner.rsi - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/evaprisoner.rsi - - type: PressureProtection - highPressureMultiplier: 1 - lowPressureMultiplier: 100 - type: entity parent: ClothingOuterHardsuitBase @@ -302,9 +287,9 @@ Blunt: 0.7 #slightly higher than sec hardsuit Slash: 0.75 Piercing: 0.7 - Heat: 0.8 + Heat: 0.8 Radiation: 0.25 - + - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitSyndie