From: RedBookcase Date: Fri, 6 Jun 2025 00:13:36 +0000 (-0700) Subject: Added Scrap Armor [Reupload]. (#37601) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=219015dcd882c0b06be768a991e0346c14a19d39;p=space-station-14.git Added Scrap Armor [Reupload]. (#37601) * Added Scrap Armor v2. * Added a note to scrap helmet about vision reduction. * Removed protection from step triggers. * The patient needs broken kneecaps to live. * Add in missing tag * Missing tags pt 2 --------- Co-authored-by: RedBookcase Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl index 819b1eb60b..74b58d9278 100644 --- a/Resources/Locale/en-US/recipes/tags.ftl +++ b/Resources/Locale/en-US/recipes/tags.ftl @@ -68,6 +68,8 @@ construction-graph-tag-match-stick = match stick construction-graph-tag-potato = a potato construction-graph-tag-wheat-bushel = wheat bushel construction-graph-tag-corgi-hide = corgi hide +construction-graph-tag-apron = an apron +construction-graph-tag-utility-belt = a utility belt soil-construction-graph-any-mushroom = any mushroom # toys diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index fa6b256c46..674ee2db4b 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -80,6 +80,10 @@ - Multitool sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance + - type: Tag + tags: + - UtilityBelt + - WhitelistChameleon - type: entity parent: ClothingBeltStorageBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml new file mode 100644 index 0000000000..25669d5d00 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml @@ -0,0 +1,85 @@ +# Separate yml file for scrap helmet since it has so many construction steps. +# Listed from first step of crafting to the final helmet + +- type: entity + name: wired bucket + parent: BaseItem + id: WiredBucketBase + description: A bucket with attached wiring to better serve as a chinstrap. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/scrap_helmet.rsi + state: construction-1 + - type: Item + size: Normal + sprite: Clothing/Head/Helmets/scrap_helmet.rsi + - type: Construction + graph: scraphelmet + node: wiredbucket + +- type: entity + name: sliced bucket + parent: BaseItem + id: SlicedBucketBase + description: A bucket with a vision slit cut into the side. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/scrap_helmet.rsi + state: construction-2 + - type: Item + size: Normal + sprite: Clothing/Head/Helmets/scrap_helmet.rsi + - type: Construction + graph: scraphelmet + node: slicedbucket + +- type: entity + name: steel bucket + parent: BaseItem + id: SteelBucketBase + description: A bucket that's had steel welded onto it's exterior. It requires better shaping before it can be worn comfortably. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/scrap_helmet.rsi + state: construction-3 + - type: Item + size: Normal + sprite: Clothing/Head/Helmets/scrap_helmet.rsi + - type: Construction + graph: scraphelmet + node: steelbucket + +# The helmet itself +- type: entity + parent: [ClothingHeadHelmetBase, BaseMajorContraband] + id: ClothingHeadHelmetScrap #When we get the tech for it this bad boy needs to be given a vision reduction when equipped. 1-2 tiles less than normal should be good. + name: scrap helmet + description: A cobbled-together helmet made from cabling, steel, and a bucket. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/scrap_helmet.rsi + - type: Item + size: Normal + - type: Clothing + sprite: Clothing/Head/Helmets/scrap_helmet.rsi + equipSound: /Audio/Effects/metal_scrape2.ogg + unequipSound: /Audio/Effects/metal_scrape1.ogg + equipDelay: 3 + unequipDelay: 3 #shorter on the helmet. + - type: IngestionBlocker + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + - type: HideLayerClothing + slots: + - Hair + - Snout + - HeadTop + - HeadSide + - type: Construction + graph: scraphelmet + node: scraphelmet diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 5376e2a99f..a3aa984415 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -8,6 +8,10 @@ sprite: Clothing/OuterClothing/Misc/apron.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/apron.rsi + - type: Tag + tags: + - Apron + - WhitelistChameleon - type: entity parent: ClothingOuterStorageBase @@ -20,6 +24,10 @@ sprite: Clothing/OuterClothing/Misc/apronbar.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/apronbar.rsi + - type: Tag + tags: + - Apron + - WhitelistChameleon - type: entity parent: ClothingOuterStorageBase @@ -32,6 +40,10 @@ sprite: Clothing/OuterClothing/Misc/apronbotanist.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/apronbotanist.rsi + - type: Tag + tags: + - Apron + - WhitelistChameleon - type: entity parent: ClothingOuterStorageBase @@ -44,6 +56,10 @@ sprite: Clothing/OuterClothing/Misc/apronchef.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/apronchef.rsi + - type: Tag + tags: + - Apron + - WhitelistChameleon - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml new file mode 100644 index 0000000000..adf4227595 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml @@ -0,0 +1,85 @@ +# Separate yml file for scrap armor since it has so many construction steps. +# Listed from first step of crafting to the final armor + +- type: entity + name: wired apron + parent: BaseItem + id: WiredApronBase + description: An apron threaded with cabling. It looks incomplete. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi + state: construction-1 + - type: Item + size: Ginormous + sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi + - type: Construction + graph: scraparmor + node: wiredapron + +- type: entity + name: steel-covered apron + parent: BaseItem + id: SteelApronBase + description: An apron with steel plating haphazardly affixed by spare cabling. In it's current state, it would fall apart immediately if worn. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi + state: construction-2 + - type: Item + size: Ginormous + sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi + - type: Construction + graph: scraparmor + node: steelapron + +- type: entity + name: welded steel apron + parent: BaseItem + id: WeldedSteelApronBase + description: An apron affixed with welded steel plating attached to spare cabling. The armor is no longer in danger of falling apart, but requires additional work to be worn securely. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi + state: construction-3 + - type: Item + size: Ginormous + sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi + - type: Construction + graph: scraparmor + node: weldedsteelapron + +# The armor itself +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseMajorContraband] + id: ClothingOuterArmorScrap + name: scrap armor + description: A tider's gleaming plate mail. Bail up, or you're a dead man. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi + - type: Item + size: Ginormous + - type: Clothing + sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi + equipSound: /Audio/Effects/metal_scrape2.ogg + unequipSound: /Audio/Effects/metal_scrape1.ogg + equipDelay: 5 + unequipDelay: 5 #Its insane more armor/hardsuits don't have equip times tbh? + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 #Some nukie tier physical protection... + Heat: 0.8 + Radiation: 0.8 #Hey, it's a bunch of solid steel. + - type: ExplosionResistance + damageCoefficient: 0.80 + - type: ClothingSpeedModifier #But that protection comes at a price. + walkModifier: 0.6 + sprintModifier: 0.6 + - type: GroupExamine + - type: Construction + graph: scraparmor + node: scraparmorfinished diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraparmor.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraparmor.yml new file mode 100644 index 0000000000..d935b751c3 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraparmor.yml @@ -0,0 +1,50 @@ +- type: constructionGraph + id: scraparmor + start: start + graph: + - node: start + edges: + - to: wiredapron + steps: + - tag: Apron + icon: + sprite: Clothing/OuterClothing/Misc/apronbotanist.rsi + state: icon + name: construction-graph-tag-apron + - material: Cable + amount: 15 + doAfter: 10 + + - node: wiredapron + entity: WiredApronBase + edges: + - to: steelapron + steps: + - material: Steel + amount: 30 + doAfter: 15 + + - node: steelapron + entity: SteelApronBase + edges: + - to: weldedsteelapron + steps: + - tool: Welding + doAfter: 20 + + - node: weldedsteelapron + entity: WeldedSteelApronBase + edges: + - to: scraparmorfinished + steps: + - tag: UtilityBelt + icon: + sprite: Clothing/Belt/utility.rsi + state: icon + name: construction-graph-tag-utility-belt + - material: Cable + amount: 15 + doAfter: 15 + + - node: scraparmorfinished + entity: ClothingOuterArmorScrap diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraphelmet.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraphelmet.yml new file mode 100644 index 0000000000..7752d15165 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraphelmet.yml @@ -0,0 +1,46 @@ +- type: constructionGraph + id: scraphelmet + start: start + graph: + - node: start + edges: + - to: wiredbucket + steps: + - tag: Bucket + icon: + sprite: Objects/Tools/bucket.rsi + state: icon + name: construction-graph-tag-bucket + - material: Cable + amount: 15 + doAfter: 3 + + - node: wiredbucket + entity: WiredBucketBase + edges: + - to: slicedbucket + steps: + - tool: Slicing + doAfter: 5 + + - node: slicedbucket + entity: SlicedBucketBase + edges: + - to: steelbucket + steps: + - material: Steel + amount: 10 + doAfter: 3 + - tool: Welding + doAfter: 10 + + - node: steelbucket + entity: SteelBucketBase + edges: + - to: scraphelmet + steps: + - tool: Anchoring + doAfter: 5 + + - node: scraphelmet + entity: ClothingHeadHelmetScrap diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 4c94fcb6ff..dd4393b77c 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -157,3 +157,19 @@ targetNode: hardsuitGoliath category: construction-category-clothing objectType: Item + +- type: construction + id: scraparmor + graph: scraparmor + startNode: start + targetNode: scraparmorfinished + category: construction-category-clothing + objectType: Item + +- type: construction + id: scraphelmet + graph: scraphelmet + startNode: start + targetNode: scraphelmet + category: construction-category-clothing + objectType: Item diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 69a4544486..ab2aebc490 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -30,6 +30,9 @@ - type: Tag id: AppraisalTool +- type: Tag + id: Apron + - type: Tag id: Arrow @@ -1404,6 +1407,9 @@ - type: Tag id: UraniumGlassShard +- type: Tag + id: UtilityBelt + - type: Tag id: Vegetable diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-1.png b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-1.png new file mode 100644 index 0000000000..b411f6edf0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-1.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-2.png b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-2.png new file mode 100644 index 0000000000..c23b461de4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-2.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-3.png b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-3.png new file mode 100644 index 0000000000..fc4290a65d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/construction-3.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..26cbda7e1d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..7736df796b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/icon.png new file mode 100644 index 0000000000..5e36ebacd8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/inhand-left.png new file mode 100644 index 0000000000..dcea8bb5c6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/inhand-right.png new file mode 100644 index 0000000000..7ac62c116a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/meta.json new file mode 100644 index 0000000000..d8b61975fb --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/scrap_helmet.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase on Github.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "construction-1" + }, + { + "name": "construction-2" + }, + { + "name": "construction-3" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-1.png b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-1.png new file mode 100644 index 0000000000..ea5ca17302 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-1.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-2.png b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-2.png new file mode 100644 index 0000000000..85620c6915 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-2.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-3.png b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-3.png new file mode 100644 index 0000000000..01e564171f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/construction-3.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..b6c255e3e9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..13450c0faa Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/icon.png new file mode 100644 index 0000000000..4b99650ab3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/inhand-left.png new file mode 100644 index 0000000000..ded723481e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/inhand-right.png new file mode 100644 index 0000000000..84f111fd4f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/meta.json new file mode 100644 index 0000000000..dd06ab1e7f --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/scrap_armor.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase on Github.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "construction-1" + }, + { + "name": "construction-2" + }, + { + "name": "construction-3" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}