diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c1e47a839e..c58a9ed370 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -192,6 +192,17 @@ - id: C4 amount: 8 +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateEVABundle + name: syndicate EVA bundle + description: "Contains the Syndicate approved EVA suit." + components: + - type: StorageFill + contents: + - id: ClothingHeadHelmetSyndicate + - id: ClothingOuterHardsuitSyndicate + - type: entity parent: ClothingBackpackDuffelSyndicate id: ClothingBackpackDuffelSyndicateHardsuitBundle diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index c11b9e2bfe..32f1804f04 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -272,27 +272,4 @@ - state: writing - 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 + - DroneUsable \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index ca693866ba..8b06f9be33 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -346,7 +346,7 @@ - type: uplinkListing id: UplinkEVASyndie category: Armor - itemId: BoxSyndicateEVA + itemId: ClothingBackpackDuffelSyndicateEVABundle description: A simple EVA suit that offers no protection other than what's needed to survive in space. price: 4 diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index b764f9ef91..861a781d6a 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -127,6 +127,8 @@ sprite: Clothing/Back/Duffels/syndicate.rsi - type: Clothing sprite: Clothing/Back/Duffels/syndicate.rsi + - type: Storage + capacity: 131 - type: entity parent: ClothingBackpackDuffelSyndicate diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index b1dc4363bc..857047d7cf 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -37,7 +37,7 @@ Heat: 0.9 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterArmorCult name: acolyte armor description: An evil-looking piece of cult armor, made of bones. @@ -55,7 +55,7 @@ Heat: 0.5 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterArmorHeavy name: heavy armor suit description: A heavily armored suit that protects against excessive damage. @@ -118,7 +118,7 @@ sprite: Clothing/OuterClothing/Armor/magusred.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterArmorRiot name: riot suit description: An armored vest with heavy padding to protect against melee attacks, perfect for fighting delinquents around the station. @@ -138,7 +138,7 @@ damageCoefficient: 0.9 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterArmorScaf name: scaf suit description: A green and brown tactical suit for combat situations. @@ -158,7 +158,7 @@ damageCoefficient: 0.8 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterArmorCaptainCarapace name: "captain's carapace" description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest." @@ -178,7 +178,7 @@ damageCoefficient: 0.65 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterArmorChangeling name: chitinous armor description: Inflates the changeling's body into an all-consuming chitinous mass of armor. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 14ddc08051..ea67a74d23 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -9,6 +9,19 @@ - type: Sprite state: icon +- type: entity + abstract: true + parent: ClothingOuterBase + id: ClothingOuterBaseLarge + components: + - type: Clothing + Size: 80 + Slots: + - outerClothing + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: entity abstract: true parent: ClothingOuterBase @@ -36,7 +49,7 @@ walkModifier: 0.4 sprintModifier: 0.6 - type: Clothing - size: 50 + size: 121 - type: Armor modifiers: coefficients: @@ -64,6 +77,6 @@ walkModifier: 0.8 sprintModifier: 0.8 - type: Clothing - size: 30 + size: 80 - type: DiseaseProtection protection: 0.05 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml index 1d39959dbc..cb7214e86c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterBioGeneral name: bio suit suffix: Generic @@ -13,7 +13,7 @@ protection: 0.2 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterBioCmo name: bio suit suffix: CMO @@ -27,7 +27,7 @@ protection: 0.3 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBioGeneral id: ClothingOuterBioJanitor name: bio suit suffix: Janitor @@ -37,11 +37,9 @@ sprite: Clothing/OuterClothing/Bio/janitor.rsi - type: Clothing sprite: Clothing/OuterClothing/Bio/janitor.rsi - - type: DiseaseProtection - protection: 0.2 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBioGeneral id: ClothingOuterBioScientist name: bio suit suffix: Science @@ -51,11 +49,9 @@ sprite: Clothing/OuterClothing/Bio/scientist.rsi - type: Clothing sprite: Clothing/OuterClothing/Bio/scientist.rsi - - type: DiseaseProtection - protection: 0.2 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBioGeneral id: ClothingOuterBioSecurity name: bio suit suffix: Security @@ -65,11 +61,9 @@ sprite: Clothing/OuterClothing/Bio/security.rsi - type: Clothing sprite: Clothing/OuterClothing/Bio/security.rsi - - type: DiseaseProtection - protection: 0.2 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBioCmo id: ClothingOuterBioVirology name: bio suit suffix: Virology @@ -79,5 +73,3 @@ sprite: Clothing/OuterClothing/Bio/virology.rsi - type: Clothing sprite: Clothing/OuterClothing/Bio/virology.rsi - - type: DiseaseProtection - protection: 0.3 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index c3a06abb50..dff7513a64 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterSuitBomb name: bomb suit description: A heavy suit designed to withstand the pressure generated by a bomb and any fragments the bomb may produce. @@ -37,7 +37,7 @@ clothingPrototype: ClothingHeadHelmetEVA - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterSuitFire name: fire suit description: A suit that helps protect against fire and heat. @@ -61,7 +61,7 @@ coefficient: 0.01 - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterSuitRad name: radiation suit description: "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'" @@ -128,7 +128,7 @@ sprite: Clothing/OuterClothing/Suits/monkey.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseLarge id: ClothingOuterSuitAtmosFire name: atmos fire suit description: An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame.