From 74bd86af2f8fc8495b00ccbb7b37f53f2ef737b2 Mon Sep 17 00:00:00 2001 From: PixelTK <85175107+PixelTheKermit@users.noreply.github.com> Date: Mon, 4 Sep 2023 21:02:54 +0100 Subject: [PATCH] Arachnid RE-REWORK (#19138) * tasty silk and webby crates * winter coat * fuck * Move some files around and stuff * FUCK * Web closet finished * what the fuck * brain empty * loss * loss 2 * fuck * web typing indicators * minor spelling mistake, I lost. * hiss * changed * And they said "Let's remove pockets", funniest shit I've ever heard. * 2 seconds of stun * fuck it we pr * resprite * dummy * arachnid creampie sprite * different + more "natural" crate sprites * Webbing suits and webbing dresses. * and other stuff I forgot to commit. * and gone. * no * Cloth. * I forgot to commit this? What??? * Eyes. * Comment trimming * winter coat resprite --- .../Prototypes/Body/Prototypes/arachnid.yml | 6 - Resources/Prototypes/Damage/modifier_sets.yml | 6 - .../Entities/Clothing/Head/hoods.yml | 57 ++++--- .../Clothing/OuterClothing/wintercoats.yml | 32 +++- .../Entities/Clothing/Uniforms/jumpskirts.yml | 31 ++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 31 ++++ .../Entities/Mobs/Player/arachnid.yml | 4 +- .../Entities/Mobs/Species/arachnid.yml | 56 +++---- .../Entities/Objects/Materials/materials.yml | 22 +++ .../Entities/Objects/Misc/tiles.yml | 4 +- .../Doors/MaterialDoors/material_doors.yml | 37 ++++ .../Structures/Furniture/Tables/tables.yml | 6 +- .../Entities/Structures/Furniture/beds.yml | 5 +- .../Entities/Structures/Furniture/chairs.yml | 7 +- .../Structures/Storage/Crates/crates.yml | 42 ++++- .../Entities/Structures/Walls/walls.yml | 2 +- .../arachnid_inventory_template.yml | 122 -------------- .../Recipes/Construction/Graphs/web.yml | 158 ++++++++++++++---- .../Prototypes/Recipes/Construction/web.yml | 76 ++++++++- .../Recipes/Crafting/Graphs/web.yml | 62 +++++-- Resources/Prototypes/Recipes/Crafting/web.yml | 60 ++++++- Resources/Prototypes/typing_indicator.yml | 5 + .../Coat/hoodweb.rsi/equipped-HELMET.png | Bin 0 -> 1049 bytes .../Head/Hoods/Coat/hoodweb.rsi/icon.png | Bin 0 -> 397 bytes .../Head/Hoods/Coat/hoodweb.rsi/meta.json | 16 ++ .../coatweb.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1381 bytes .../WinterCoats/coatweb.rsi/icon.png | Bin 0 -> 567 bytes .../WinterCoats/coatweb.rsi/inhand-left.png | Bin 0 -> 529 bytes .../WinterCoats/coatweb.rsi/inhand-right.png | Bin 0 -> 530 bytes .../WinterCoats/coatweb.rsi/meta.json | 23 +++ .../web.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1223 bytes .../Uniforms/Jumpskirt/web.rsi/icon.png | Bin 0 -> 435 bytes .../Jumpskirt/web.rsi/inhand-left.png | Bin 0 -> 352 bytes .../Jumpskirt/web.rsi/inhand-right.png | Bin 0 -> 352 bytes .../Uniforms/Jumpskirt/web.rsi/meta.json | 23 +++ .../web.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1454 bytes .../Uniforms/Jumpsuit/web.rsi/icon.png | Bin 0 -> 465 bytes .../Uniforms/Jumpsuit/web.rsi/inhand-left.png | Bin 0 -> 352 bytes .../Jumpsuit/web.rsi/inhand-right.png | Bin 0 -> 352 bytes .../Uniforms/Jumpsuit/web.rsi/meta.json | 23 +++ .../creampie.rsi/creampie_arachnid.png | Bin 0 -> 437 bytes .../Textures/Effects/creampie.rsi/meta.json | 6 +- .../Textures/Effects/speech.rsi/meta.json | 19 ++- .../Textures/Effects/speech.rsi/spider0.png | Bin 0 -> 300 bytes .../Textures/Effects/speech.rsi/spider1.png | Bin 0 -> 209 bytes .../Textures/Effects/speech.rsi/spider2.png | Bin 0 -> 197 bytes .../Mobs/Species/Arachnid/parts.rsi/eyes.png | Bin 138 -> 138 bytes .../Structures/Doors/web_door.rsi/closed.png | Bin 0 -> 853 bytes .../Structures/Doors/web_door.rsi/closing.png | Bin 0 -> 1679 bytes .../Structures/Doors/web_door.rsi/meta.json | 46 +++++ .../Structures/Doors/web_door.rsi/open.png | Bin 0 -> 489 bytes .../Structures/Doors/web_door.rsi/opening.png | Bin 0 -> 1601 bytes .../table.rsi => Tables/web.rsi}/full.png | Bin .../table.rsi => Tables/web.rsi}/meta.json | 2 +- .../table.rsi => Tables/web.rsi}/state_0.png | Bin .../table.rsi => Tables/web.rsi}/state_1.png | Bin .../table.rsi => Tables/web.rsi}/state_2.png | Bin .../table.rsi => Tables/web.rsi}/state_3.png | Bin .../table.rsi => Tables/web.rsi}/state_4.png | Bin .../table.rsi => Tables/web.rsi}/state_5.png | Bin .../table.rsi => Tables/web.rsi}/state_6.png | Bin .../table.rsi => Tables/web.rsi}/state_7.png | Bin .../Structures/Furniture/Web/bed.rsi/icon.png | Bin 491 -> 0 bytes .../Furniture/Web/chair.rsi/icon.png | Bin 967 -> 0 bytes .../Storage/Crates/web.rsi/base.png | Bin 0 -> 666 bytes .../Storage/Crates/web.rsi/closed.png | Bin 0 -> 378 bytes .../Storage/Crates/web.rsi/icon.png | Bin 0 -> 600 bytes .../Storage/Crates/web.rsi/meta.json | 23 +++ .../Storage/Crates/web.rsi/open.png | Bin 0 -> 516 bytes .../Textures/Structures/Web/bed.rsi/icon.png | Bin 0 -> 384 bytes .../{Furniture => }/Web/bed.rsi/meta.json | 2 +- .../Structures/Web/chair.rsi/icon.png | Bin 0 -> 2090 bytes .../{Furniture => }/Web/chair.rsi/meta.json | 2 +- .../Textures/Tiles/Misc/Web/web_tile.png | Bin 1540 -> 1540 bytes 74 files changed, 759 insertions(+), 257 deletions(-) delete mode 100644 Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/web.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/web.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/web.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/web.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/web.rsi/meta.json create mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_arachnid.png create mode 100644 Resources/Textures/Effects/speech.rsi/spider0.png create mode 100644 Resources/Textures/Effects/speech.rsi/spider1.png create mode 100644 Resources/Textures/Effects/speech.rsi/spider2.png create mode 100644 Resources/Textures/Structures/Doors/web_door.rsi/closed.png create mode 100644 Resources/Textures/Structures/Doors/web_door.rsi/closing.png create mode 100644 Resources/Textures/Structures/Doors/web_door.rsi/meta.json create mode 100644 Resources/Textures/Structures/Doors/web_door.rsi/open.png create mode 100644 Resources/Textures/Structures/Doors/web_door.rsi/opening.png rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/full.png (100%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/meta.json (97%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/state_0.png (100%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/state_1.png (100%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/state_2.png (100%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/state_3.png (100%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/state_4.png (100%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/state_5.png (100%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/state_6.png (100%) rename Resources/Textures/Structures/Furniture/{Web/table.rsi => Tables/web.rsi}/state_7.png (100%) delete mode 100644 Resources/Textures/Structures/Furniture/Web/bed.rsi/icon.png delete mode 100644 Resources/Textures/Structures/Furniture/Web/chair.rsi/icon.png create mode 100644 Resources/Textures/Structures/Storage/Crates/web.rsi/base.png create mode 100644 Resources/Textures/Structures/Storage/Crates/web.rsi/closed.png create mode 100644 Resources/Textures/Structures/Storage/Crates/web.rsi/icon.png create mode 100644 Resources/Textures/Structures/Storage/Crates/web.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Crates/web.rsi/open.png create mode 100644 Resources/Textures/Structures/Web/bed.rsi/icon.png rename Resources/Textures/Structures/{Furniture => }/Web/bed.rsi/meta.json (70%) create mode 100644 Resources/Textures/Structures/Web/chair.rsi/icon.png rename Resources/Textures/Structures/{Furniture => }/Web/chair.rsi/meta.json (73%) diff --git a/Resources/Prototypes/Body/Prototypes/arachnid.yml b/Resources/Prototypes/Body/Prototypes/arachnid.yml index 60a83500af..0c57d3a199 100644 --- a/Resources/Prototypes/Body/Prototypes/arachnid.yml +++ b/Resources/Prototypes/Body/Prototypes/arachnid.yml @@ -27,20 +27,14 @@ part: RightArmArachnid connections: - right hand - - secondary right hand left arm: part: LeftArmArachnid connections: - left hand - - secondary left hand right hand: part: RightHandArachnid left hand: part: LeftHandArachnid - secondary right hand: - part: RightHandArachnid - secondary left hand: - part: LeftHandArachnid right leg: part: RightLegArachnid connections: diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 47fc03fb33..ca130f91da 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -138,12 +138,6 @@ Heat: 1.5 Shock: 1.2 -- type: damageModifierSet - id: Arachnid # Exo-skeleton, should have simillarities to skeleton resistances. - coefficients: - Blunt: 1.1 - Heat: 1.5 - - type: damageModifierSet id: Moth # Slightly worse at everything but cold coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 68ca524e0b..38bfcc879d 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -187,7 +187,7 @@ tags: - HidesHair - WhitelistChameleon - + #Winter Coat Hoods - type: entity parent: ClothingHeadHatHoodWinterBase @@ -198,8 +198,8 @@ - type: Sprite sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi - type: Clothing - sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi - + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterBartender @@ -222,7 +222,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodcaptain.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodcaptain.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCargo @@ -233,7 +233,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCE @@ -243,8 +243,8 @@ - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodce.rsi - type: Clothing - sprite: Clothing/Head/Hoods/Coat/hoodce.rsi - + sprite: Clothing/Head/Hoods/Coat/hoodce.rsi + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCentcom @@ -255,7 +255,7 @@ - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodcentcom.rsi - type: Clothing - sprite: Clothing/Head/Hoods/Coat/hoodcentcom.rsi + sprite: Clothing/Head/Hoods/Coat/hoodcentcom.rsi - type: entity parent: ClothingHeadHatHoodWinterBase @@ -266,8 +266,8 @@ - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodchemist.rsi - type: Clothing - sprite: Clothing/Head/Hoods/Coat/hoodchemist.rsi - + sprite: Clothing/Head/Hoods/Coat/hoodchemist.rsi + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCMO @@ -278,7 +278,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodcmo.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodcmo.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterEngineer @@ -289,7 +289,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodengi.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodengi.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOP @@ -300,7 +300,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodhop.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodhop.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOS @@ -311,7 +311,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodhos.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodhos.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHydro @@ -322,7 +322,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodhydro.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodhydro.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterJani @@ -344,7 +344,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodmed.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodmed.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMime @@ -355,7 +355,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodmime.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodmime.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMiner @@ -366,7 +366,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodminer.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodminer.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterPara @@ -377,7 +377,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodpara.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodpara.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM @@ -399,7 +399,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodrd.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodrd.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRobo @@ -410,7 +410,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodrobo.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodrobo.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSci @@ -432,7 +432,7 @@ sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi - + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSyndie @@ -453,4 +453,15 @@ - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi - type: Clothing - sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi \ No newline at end of file + sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterWeb + noSpawn: true + name: web coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 6757ac581e..9bc3d25fc4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -45,7 +45,7 @@ toggleable-clothing: !type:ContainerSlot {} storagebase: !type:Container ents: [] - + - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterAtmos @@ -228,7 +228,7 @@ sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterHOS - + - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterHydro @@ -481,4 +481,30 @@ - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/coatnomi.rsi - +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterWeb + name: web winter coat + description: Feels like the inside of a cocoon, not that this would make you less afraid of being in one. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi + - type: Construction + graph: WebObjects + node: coat + - type: FlavorProfile + flavors: + - cobwebs + ignoreReagents: + - Fiber + - type: SolutionContainerManager + solutions: # 15 (3 (fiber count of web) * 5 (to craft)) + 5 (magical crafting bonus) + food: + maxVol: 20 + reagents: + - ReagentId: Fiber + Quantity: 20 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterWeb diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 636c2f8093..3cd0f85a15 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -781,3 +781,34 @@ sprite: Clothing/Uniforms/Jumpskirt/security_grey.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/security_grey.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtWeb + name: web jumpskirt + description: Makes it clear that you are one with the webs. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/web.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/web.rsi + - type: Butcherable + butcheringType: Knife + spawned: + - id: MaterialWebSilk1 + amount: 8 + - type: FlavorProfile + flavors: + - cobwebs + ignoreReagents: + - Fiber + - type: SolutionContainerManager + solutions: # 24 (3 (fiber count of web) * 8 (to craft)) + 6 (magical crafting bonus) + food: + maxVol: 30 + reagents: + - ReagentId: Fiber + Quantity: 30 + - type: Construction + graph: WebObjects + node: jumpskirt diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 56f5efabbb..e7f8f1b511 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1259,3 +1259,34 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitWeb + name: web jumpsuit + description: Makes it clear that you are one with the webs. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/web.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/web.rsi + - type: Butcherable + butcheringType: Knife + spawned: + - id: MaterialWebSilk1 + amount: 8 + - type: FlavorProfile + flavors: + - cobwebs + ignoreReagents: + - Fiber + - type: SolutionContainerManager + solutions: # 24 (3 (fiber count of web) * 8 (to craft)) + 6 (magical crafting bonus) + food: + maxVol: 30 + reagents: + - ReagentId: Fiber + Quantity: 30 + - type: Construction + graph: WebObjects + node: jumpsuit diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml index dc6009c561..e303b4c4c7 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml @@ -7,7 +7,7 @@ - type: Respirator damage: types: - Asphyxiation: 1.5 # Make sure you have O2 on you at all times + Asphyxiation: 1.5 # This makes space and crit more lethal to arachnids. damageRecovery: types: - Asphyxiation: -0.5 # Recovery will suck without chems \ No newline at end of file + Asphyxiation: -0.5 diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 866ecaa548..87e3b8f738 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -1,56 +1,63 @@ - type: entity save: false - name: Urist McWeb + name: Urist McWebs parent: BaseMobOrganic id: BaseMobArachnid abstract: true components: - # The important nessessities - type: Body prototype: Arachnid - requiredLegs: 2 + requiredLegs: 2 # It would be funny if arachnids could use their little back limbs to move around once they lose their legs, but just something to consider post-woundmed - type: Perishable - type: HumanoidAppearance species: Arachnid - type: Hunger - baseDecayRate: 0.0125 - starvationDamage: # Not sure if this should be changed. + baseDecayRate: 0.0125 # Spiders have slow metabolisms all things considered, so I decided to just make their hunger drain slower. + starvationDamage: types: Cold: 0.5 Bloodloss: 0.5 - type: Thirst - baseDecayRate: 0.0125 + baseDecayRate: 0.0125 # Read comment in hunger # Damage (Self) - - type: Damageable - damageContainer: Biological - damageModifierSet: Arachnid - type: Bloodstream - bloodReagent: SpiderBlood + bloodReagent: SpiderBlood # would be cool if they had to drink copper instead of iron but that might just be more bloat to deal with. # Damage (Others) - type: MeleeWeapon animation: WeaponArcClaw soundHit: collection: AlienClaw damage: - types: # Realisically this is more like 5 slash + types: # Realisically this is more like 5 slash. You can figure out the logistics if slash is better than blunt/pierce yourself. Slash: 4 + # Fun + - type: Sericulture + actionProto: SericultureAction + productionLength: 3 + entityProduced: MaterialWebSilk1 + hungerCost: 9 # Should total to 12 total silk on full hunger + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatSpider + amount: 5 # Visual & Audio - type: DamageVisuals damageOverlayGroups: Brute: sprite: Mobs/Effects/brute_damage.rsi - color: "#162581" + color: "#162581" # Why so blue? - type: Speech speechVerb: Arachnid - speechSounds: Arachnid + speechSounds: Arachnid # TODO: Abuse my mic more. Do that in a later PR. - type: Vocal sounds: Male: UnisexArachnid Female: UnisexArachnid Unsexed: UnisexArachnid - - type: Sprite - noRot: true - drawdepth: Mobs + - type: TypingIndicator + proto: spider + - type: Sprite # I'd prefer if these maps were better. Insert map pun here. layers: - map: [ "enum.HumanoidVisualLayers.Chest" ] - map: [ "enum.HumanoidVisualLayers.Head" ] @@ -82,7 +89,7 @@ - map: [ "outerClothing" ] - map: [ "eyes" ] - map: [ "belt" ] - - map: [ "enum.HumanoidVisualLayers.Tail" ] # Better here? + - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol. - map: [ "neck" ] - map: [ "back" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] @@ -100,19 +107,8 @@ visible: false - map: [ "clownedon" ] # Dynamically generated sprite: "Effects/creampie.rsi" - state: "creampie_human" + state: "creampie_arachnid" visible: false - # Misc - - type: Sericulture - actionProto: SericultureAction - productionLength: 3 - entityProduced: MaterialWebSilk1 - hungerCost: 5 - - type: Butcherable - butcheringType: Spike - spawned: - - id: FoodMeatSpider - amount: 5 - type: entity save: false @@ -122,8 +118,6 @@ noSpawn: true description: A dummy arachnid meant to be used in character setup. # Hey! It's not dumb :( components: - - type: Inventory - templateId: arachnid - type: HumanoidAppearance species: Arachnid diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 1a242db1af..59bfb21373 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -131,6 +131,9 @@ - DroneUsable - Gauze - RawMaterial + - type: Construction + graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case. + node: cloth - type: entity parent: MaterialCloth @@ -471,6 +474,25 @@ stackType: WebSilk - type: Item size: 50 + - type: Food + requiresSpecialDigestion: true + - type: FlavorProfile + flavors: + - cobwebs + ignoreReagents: + - Fiber + - type: SolutionContainerManager + solutions: + food: + maxVol: 3 + reagents: + - ReagentId: Fiber + Quantity: 3 + - type: Tag + tags: + - ClothMade + - DroneUsable + - RawMaterial - type: entity parent: MaterialWebSilk diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 523a7cf7e9..6b5e17a211 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -873,5 +873,5 @@ - type: Stack stackType: FloorTileWeb - type: Construction - graph: TileWeb - node: webtile + graph: WebObjects + node: tile diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index c2cd34bd4c..176eaf7651 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -202,3 +202,40 @@ closeSound: path: /Audio/Items/bikehorn.ogg +- type: entity + id: WebDoor + name: web door + parent: BaseMaterialDoor + description: A door, leading to the lands of the spiders... or a spaced room. + components: + - type: Sprite + sprite: Structures/Doors/web_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Construction + graph: WebStructures + node: door + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/woodhit.ogg + - !type:SpawnEntitiesBehavior + spawn: + MaterialWebSilk: + min: 3 + max: 5 + - type: Damageable + damageModifierSet: Web + - type: Door + closeSound: + path: /Audio/Effects/rustle1.ogg + openSound: + path: /Audio/Effects/rustle2.ogg diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index 301b37205c..5036ab83c8 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -487,9 +487,9 @@ - type: Damageable damageModifierSet: Web - type: Sprite - sprite: Structures/Furniture/Web/table.rsi + sprite: Structures/Furniture/Tables/web.rsi - type: Icon - sprite: Structures/Furniture/Web/table.rsi + sprite: Structures/Furniture/Tables/web.rsi - type: Destructible thresholds: - trigger: @@ -504,7 +504,7 @@ path: "/Audio/Weapons/slash.ogg" - type: Construction - graph: TableWeb + graph: WebStructures node: table - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml index 3c578192bb..83e043334c 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml @@ -132,7 +132,7 @@ - type: Damageable damageModifierSet: Web - type: Sprite - sprite: Structures/Furniture/Web/bed.rsi + sprite: Structures/Web/bed.rsi state: icon - type: Destructible thresholds: @@ -150,3 +150,6 @@ MaterialWebSilk: min: 1 max: 1 + - type: Construction + graph: WebStructures + node: bed diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 581a826f3c..350d22ea49 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -249,7 +249,7 @@ - type: entity name: web chair - id: WebChair + id: ChairWeb description: For true web developers. parent: SeatBase components: @@ -260,7 +260,7 @@ - type: Anchorable - type: Rotatable - type: Sprite - sprite: Structures/Furniture/Web/chair.rsi + sprite: Structures/Web/chair.rsi state: icon - type: MeleeSound soundGroups: @@ -285,6 +285,9 @@ MaterialWebSilk: min: 1 max: 1 + - type: Construction + graph: WebStructures + node: chair - type: entity parent: [SeatBase, BaseFoldable] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 589c0cc7e1..0221b2b61a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -122,6 +122,47 @@ - type: Sprite sprite: Structures/Storage/Crates/surgery.rsi +- type: entity + parent: CrateGeneric + id: CrateWeb + name: web crate + components: + - type: Icon + sprite: Structures/Storage/Crates/web.rsi + - type: Sprite + sprite: Structures/Storage/Crates/web.rsi + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + - state: closed + map: ["enum.StorageVisualLayers.Door"] + - type: Construction + graph: WebStructures + node: crate + - type: Damageable + damageModifierSet: Web + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/woodhit.ogg + - !type:SpawnEntitiesBehavior + spawn: + MaterialWebSilk: + min: 3 + max: 5 + - type: EntityStorage + closeSound: + path: /Audio/Effects/rustle1.ogg + openSound: + path: /Audio/Effects/rustle2.ogg + # Secure Crates - type: entity @@ -518,4 +559,3 @@ sprite: Structures/Storage/Crates/trashcart_jani.rsi - type: AccessReader access: [["Janitor"]] - diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index aef2d6c3bf..6575e71c50 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -966,7 +966,7 @@ key: walls base: wall - type: Construction - graph: WallWeb + graph: WebStructures node: wall diff --git a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml deleted file mode 100644 index 17ab39abce..0000000000 --- a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml +++ /dev/null @@ -1,122 +0,0 @@ -- type: inventoryTemplate - id: arachnid - slots: - - name: shoes - slotTexture: shoes - slotFlags: FEET - stripTime: 3 - uiWindowPos: 1,3 - strippingWindowPos: 1,3 - displayName: Shoes - - name: jumpsuit - slotTexture: uniform - slotFlags: INNERCLOTHING - stripTime: 6 - uiWindowPos: 0,2 - strippingWindowPos: 0,2 - displayName: Jumpsuit - - name: outerClothing - slotTexture: suit - slotFlags: OUTERCLOTHING - slotGroup: MainHotbar - stripTime: 6 - uiWindowPos: 1,2 - strippingWindowPos: 1,2 - displayName: Suit - - name: gloves - slotTexture: gloves - slotFlags: GLOVES - uiWindowPos: 2,2 - strippingWindowPos: 2,2 - displayName: Gloves - - name: neck - slotTexture: neck - slotFlags: NECK - uiWindowPos: 0,1 - strippingWindowPos: 0,1 - displayName: Neck - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 1,1 - strippingWindowPos: 1,1 - displayName: Mask - - name: eyes - slotTexture: glasses - slotFlags: EYES - stripTime: 3 - uiWindowPos: 0,0 - strippingWindowPos: 0,0 - displayName: Eyes - - name: ears - slotTexture: ears - slotFlags: EARS - stripTime: 3 - uiWindowPos: 2,0 - strippingWindowPos: 2,0 - displayName: Ears - - name: head - slotTexture: head - slotFlags: HEAD - uiWindowPos: 1,0 - strippingWindowPos: 1,0 - displayName: Head - - name: pocket1 - slotTexture: pocket - slotFlags: POCKET - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,4 - dependsOn: jumpsuit - displayName: Pocket 1 - stripHidden: true - - name: pocket2 - slotTexture: pocket - slotFlags: POCKET - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,3 - strippingWindowPos: 1,4 - dependsOn: jumpsuit - displayName: Pocket 2 - stripHidden: true - - name: id - slotTexture: id - slotFlags: IDCARD - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 2,1 - strippingWindowPos: 2,4 - dependsOn: jumpsuit - displayName: ID - - name: belt - slotTexture: belt - slotFlags: BELT - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,1 - strippingWindowPos: 1,5 - displayName: Belt - - name: back - slotTexture: back - slotFlags: BACK - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,0 - strippingWindowPos: 0,5 - displayName: Back - - name: web1 - slotTexture: web - slotFlags: POCKET - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,3 - displayName: Left Web - - name: web2 - slotTexture: web - slotFlags: POCKET - stripTime: 3 - uiWindowPos: 6,3 - strippingWindowPos: 2,3 - displayName: Right Web diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/web.yml b/Resources/Prototypes/Recipes/Construction/Graphs/web.yml index 0a9186207e..4eb368f5ab 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/web.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/web.yml @@ -1,35 +1,135 @@ - type: constructionGraph - id: WallWeb + id: WebStructures start: start graph: - - node: start - edges: - - to: wall - completed: - - !type:SnapToGrid - southRotation: true - steps: - - material: WebSilk - amount: 4 - doAfter: 3 + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: wall + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WebSilk + amount: 4 + doAfter: 3 - - node: wall - entity: WallWeb + - to: table + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WebSilk + amount: 4 + doAfter: 3 -- type: constructionGraph - id: TableWeb - start: start - graph: - - node: start - edges: - - to: table - completed: - - !type:SnapToGrid - southRotation: true - steps: - - material: WebSilk - amount: 4 - doAfter: 3 + - to: bed + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WebSilk + amount: 6 + doAfter: 3 - - node: table - entity: TableWeb + - to: chair + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WebSilk + amount: 3 + doAfter: 3 + + - to: crate + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WebSilk + amount: 10 + doAfter: 6 + + - to: door + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WebSilk + amount: 8 + doAfter: 6 + + + # Deconstruction is down here + - node: wall + entity: WallWeb + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWebSilk1 + amount: 4 + steps: + - tool: Cutting + doAfter: 2 + + - node: table + entity: TableWeb + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWebSilk1 + amount: 4 + steps: + - tool: Cutting + doAfter: 2 + + - node: bed + entity: WebBed + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWebSilk1 + amount: 5 # One silk loss, cry + steps: + - tool: Cutting + doAfter: 2 + + - node: chair + entity: ChairWeb + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWebSilk1 + amount: 3 + steps: + - tool: Cutting + doAfter: 2 + + - node: crate + entity: CrateWeb + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWebSilk1 + amount: 7 + steps: + - tool: Cutting + doAfter: 3 + + - node: door + entity: WebDoor + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWebSilk1 + amount: 6 + steps: + - tool: Cutting + doAfter: 3 diff --git a/Resources/Prototypes/Recipes/Construction/web.yml b/Resources/Prototypes/Recipes/Construction/web.yml index 3d0f9cf484..2d61ac1515 100644 --- a/Resources/Prototypes/Recipes/Construction/web.yml +++ b/Resources/Prototypes/Recipes/Construction/web.yml @@ -1,13 +1,13 @@ - type: construction name: web wall id: WallWeb - graph: WallWeb + graph: WebStructures startNode: start targetNode: wall category: construction-category-structures description: A fairly weak yet silky smooth wall. icon: - sprite: /Textures/Structures/Walls/web.rsi + sprite: Structures/Walls/web.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -19,13 +19,13 @@ - type: construction name: web table id: TableWeb - graph: TableWeb + graph: WebStructures startNode: start targetNode: table - category: construction-category-structures + category: construction-category-furniture description: Essential for any serious web development. icon: - sprite: /Textures/Structures/Furniture/Web/table.rsi + sprite: Structures/Furniture/Tables/web.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -33,3 +33,69 @@ canBuildInImpassable: false conditions: - !type:TileNotBlocked + +- type: construction + name: web bed + id: WebBed + graph: WebStructures + startNode: start + targetNode: bed + category: construction-category-furniture + description: Fun fact, you eating spiders in your sleep is false. + icon: + sprite: Structures/Web/bed.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: web chair + id: ChairWeb + graph: WebStructures + startNode: start + targetNode: chair + category: construction-category-furniture + description: You want to get serious about web development? Get this chair! + icon: + sprite: Structures/Web/chair.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + +- type: construction + name: web crate + id: CrateWeb + graph: WebStructures + startNode: start + targetNode: crate + category: construction-category-storage + description: For containment of food and other things. Not as durable as a normal crate, and can't be welded shut. + icon: + sprite: Structures/Storage/Crates/web.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + canBuildInImpassable: false + +- type: construction + name: web door + id: WebDoor + graph: WebStructures + startNode: start + targetNode: door + category: construction-category-structures + description: A manual door made from web, normally placed right before a pit or trap. + icon: + sprite: Structures/Doors/web_door.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml index 13aa4eb6b4..2bde191cdb 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml @@ -1,15 +1,53 @@ - type: constructionGraph - id: TileWeb + id: WebObjects start: start graph: - - node: start - edges: - - to: webtile - completed: - - !type:SetStackCount - amount: 2 - steps: - - material: WebSilk - amount: 1 - - node: webtile - entity: FloorTileItemWeb + - node: start + edges: + - to: tile + completed: + - !type:SetStackCount + amount: 2 + steps: + - material: WebSilk + amount: 1 + + - to: coat + steps: + - material: WebSilk + amount: 5 + doAfter: 4 + + - to: jumpsuit + steps: + - material: WebSilk + amount: 8 + doAfter: 6 + + - to: jumpskirt + steps: + - material: WebSilk + amount: 8 + doAfter: 6 + + - to: cloth + steps: + - material: WebSilk + amount: 4 + doAfter: 6 + + # Deconstruction + - node: tile + entity: FloorTileItemWeb + + - node: coat + entity: ClothingOuterWinterWeb + + - node: jumpsuit + entity: ClothingUniformJumpsuitWeb + + - node: jumpskirt + entity: ClothingUniformJumpskirtWeb + + - node: cloth + entity: MaterialCloth1 diff --git a/Resources/Prototypes/Recipes/Crafting/web.yml b/Resources/Prototypes/Recipes/Crafting/web.yml index 0747806de2..0cd8b22c0a 100644 --- a/Resources/Prototypes/Recipes/Crafting/web.yml +++ b/Resources/Prototypes/Recipes/Crafting/web.yml @@ -1,10 +1,64 @@ - type: construction name: web tile id: TileWeb - graph: TileWeb + graph: WebObjects startNode: start - targetNode: webtile + targetNode: tile category: construction-category-tiles description: "Nice and smooth." - icon: { sprite: Objects/Tiles/web.rsi, state: icon } + icon: + sprite: Objects/Tiles/web.rsi + state: icon + objectType: Item + +- type: construction + name: web winter coat + id: ClothingOuterWinterWeb + graph: WebObjects + startNode: start + targetNode: coat + category: construction-category-clothing + description: "Surprisingly warm and durable." + icon: + sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi + state: icon + objectType: Item + +- type: construction + name: web jumpsuit + id: ClothingUniformJumpsuitWeb + graph: WebObjects + startNode: start + targetNode: jumpsuit + category: construction-category-clothing + description: "At least it's something." + icon: + sprite: Clothing/Uniforms/Jumpsuit/web.rsi + state: icon + objectType: Item + +- type: construction + name: web jumpskirt + id: ClothingUniformJumpskirtWeb + graph: WebObjects + startNode: start + targetNode: jumpskirt + category: construction-category-clothing + description: "At least it's something." + icon: + sprite: Clothing/Uniforms/Jumpskirt/web.rsi + state: icon + objectType: Item + +- type: construction + name: silk woven cloth + id: SilkWovenCloth + graph: WebObjects + startNode: start + targetNode: cloth + category: construction-category-materials + description: "Feels just like cloth, strangely enough." + icon: + sprite: Objects/Materials/materials.rsi + state: cloth_3 objectType: Item diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml index a459bf0308..8261f78b54 100644 --- a/Resources/Prototypes/typing_indicator.yml +++ b/Resources/Prototypes/typing_indicator.yml @@ -28,3 +28,8 @@ id: moth typingState: moth0 offset: 0, 0.125 + +- type: typingIndicator + id: spider + typingState: spider0 + offset: 0, 0.125 diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..44d6d0f9d4d58633c3ba0fa861a342fa4eae423a GIT binary patch literal 1049 zcmV+!1m^pRP)@;M^kE){;2YNwBaIAXZ%KzU(#Q|}uKq?n5Rh?uhY3$g0U~HAy?ySR7 zMlpZ`_7v&l7^rNaOt+m$c_4-X)Rh9nj^}iS0*ZykyK_Bs=DDe3Bh_-Ff zwynJuMG>MX!gxFe=N!Y~(0SaSt?$&)h~M1YAkTB0ot^#dzWe)oU6v&#lgWo0;d_0p zH5g+MLfAG40=!4xsgu@PbI!3^t#E#R{*U)877INZjZhQ?f*|-X1MKR@aSWvt7z+`G z6kR7FL*TxjoeW?GjiLz4<#KPTSuU44iXuDN zk7QSWFc?6H4qYeFG#eWO27>|Kqubi!Ma&I3gCF;69s0Y+_jk>NOgn$qo06>Ti zLI`{9ARaIr4g=0PCX)$-5PSOwAr6uP_vve`tr2#Q52f$%csw4D$K&yMJRXn7MWvHsE&yc+^g-^~o zD1BYKG(84mA%Z|7&vVS@^Ip3|oUJvR&GgC136doKR-JvV$vr(i;o{=LKKy6IfHY0* zYmnzT()1XF1W-z&uKz??md>w(^D96p1tA23K@6>dwrxOZ1WGBgEJM>Y2X%i#nx?h} zXo{tT1o-kL#q)D*i=?hNzXDQ9D5bF7HntY`^6~;HC90}I9LEQBe?wi@FdophEwPf2IeREMPW47!P=PdA1(V z2WJnMPNzXxmS~#R?#?pq_L&~Ay9vT9idhVkm9DO?oHJ4H524f3Q#&~4YfT8jYPCWX zMF&rT0FY%_P*s&)uh$rl#|Q$AuV4SLx_!R`JRXn7A#6h%+PrVLdBW88s*tVM7KF3=sgnHsnQ%Q#4g1xb2jVSoQ11^sCnawZQRmwO)< z5~x%vmH!RrT+TV?`~CjMbk5};5C0na-CXL~ED2XiF$@E%)rx7FXxnz4F-D9rSZmpC zx5d6iLg!rWx{hHO&{}gop8=3k5<&prbUHDPBgPoK_w;>VthFV!0Q@Quy-eG-MM^n0@P3Sx zlD2K4S4TSN)cm3YmE>BDJ5OkA*DnJ zf!3NBBT6Z}_kZ_*zV91rEyfteaU`Wg2m$XsAp}xN^Aohz7C%8)@DaVZUa$G_c(7it rc|M=>+-x@N_xr_ul}e>j`RDuwf&2Kme3}X(00000NkvXXu0mjfPN%L~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/meta.json new file mode 100644 index 0000000000..5fb578edf1 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/meta.json @@ -0,0 +1,16 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PixelTheKermit (github) for SS14", + "size": {"x": 32, "y": 32}, + "states": + [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..9da692ad05cf6cc5fb578652dc4a4fe35f8a6577 GIT binary patch literal 1381 zcmV-r1)BPaP)&s&ph8v%|)`t*6 zFvf)Ix*I~S>k7u$-r$^Ce|ymN_Rhpz*WD16LD<*cg}&!`;{N_#EEc~+7=|K_V-bd- zSS)^t`}=$0d0uOMt;v_B)2Vp*@+JCx3e&Ve2tkr0Filfqj0wXqP!t6ii;?FX4-XIc z@Zm$FYq!w{fGCPE91hX%Q(RmaSS}OfIj`CQw9@ZA_XXE=#rnbm%Vi42Vlc*F7zO~q zFbpupz*vkdO92QBheMny6YBb9St3ailx2xL&z}OGSM5TSt@WP`0HqYV-a}cg;QK!E zoFhpX7-Ikc#u$=>ASn| zux%Sb5LEi6X~JZGBYm>(gnYIcV;GOG@b>Ln&2?Rort379 z5vG))C<+us30>Fm>C-3eX;#L^j~~Gp6Q*glo)3f&LO$1{(Fmi_NPAjspzA$2j#J%f zUGHJtzN!D_&6{WS_hx_`ylI+My30WmLclo(0C3Jh2-!Ga|DBvG+L9y*hQr~;Bx*!EHfA@z%*z-qNZQ4}DA9IXHBDo{rbI*!>!2E;Mj zINud@eL_ez_+#{2WdNnLn(gZuAlpy1^fl3!g9fsr^jighbB@_;wz1AqO5yu{wO)70 zw*IbTXUI1%`O*=Fq4-<-IrQttuJr+|{~K(-dDTBN#yWi)+}6*sOq^3+p-?Ck3WY+U zP$(1%#s3WH#>!0yxfAnW_iNiK55w^EyF%OBPrHsM6>Px1`hd2@5{))RZ*FcdnY=<- zu5fd6gYkHbEK4ySUscY{p%&O7#BnU7^JAJO9v&7biW1+xeS>Y=$ny-}zt0+7t5E=6 zym$dXLl6Xb|Ni}x4Zb!hvMfWAB+^RjJP4d~A?p)Xs}+JEK)+8h8d(5%0f2*jz%~#2p1O@l{@_P>sP#c_pb9fU^1C#U%q@nQ4|0GUDuxsTD>wymdhosudh$v z7uR)nt^)J+C2M`RsjIkzP+Yt z+GsS=j#lj=9tU2r$NQ zb#=Aztaq9LyDlzkgwBbac=z?E4Xx*ZD2l2{WK(>}}s;%XeqVycXT?ZnlvD9!_# zG^v_ONIuJZHU5t8j6IN(laup5A%xIcYkgHuYpsP4SN3j=ETr9TuLQN*ZM{kER_Jv* z^AI6~?)Uo|px^JW)O+2|P7(*(h8w0q98U;>0M~V~Z5sgFwsBpTAP9)#35IE~i^R18 z?|bjGVH(uDIfky29g>KLZM+c&SblDJkNiXv)W9skrPj$&qMIu8Zr zGP5+rG)(+cpPE;vR4Q$gkGZLtjXs=&sIlVSVUhGA<@>kKC=~+m^K3*Mg@j>998Z}| z6T(Tzfl;8>?dWIEUleX6AcWA_o4T&c$;sowr;i_WdXZvT7Q>+rfRqx?bCKug96h+t z)0eLbT5FxH6GCXu^VUkN6<7|>#$7BPQnntFOcScr3INq=g=CsgsXQY5GnM6a*;(0H zAP52mg8_rVU|vg-DU)AkG#d@RjJ^Ue8vWo&xy;b_F^$W|{k`r+0_(=6#tNkrj^hB} zI1WlF)Ob;AwOSkZeJg==SoUK7;qnYfDY0y8*GKIxAf=?)Y~UOp&%Xl4aj>i-fEBU5 z2$aj^e?qbeWc|Id{J&qm`PS9%L;@B!C3Hid@aAQ397kXPK` z=RsanR%{wyI|AR&>7~i{_g+HZyZitmA|fIpA|fIpA`3)BhK;9{FY3`GiUvVT0N`MM zPr~pp9~aG=XT$JN%-GblP1!DZu)imN{$8S9e~OirCIDb}XB)on5QWz5p^F_P`-?b9D)FFanVPTCi%Eb z9srUwDU~nE`WFQNk<+0kwo;3Q=6h(Kh=_=Yh=_=Yh=_=YhNyI><+@q=E59z&IkMUu zohA{HljH9IfL`xB??aAjV$IQMF)wa9$m6Q)7Kp;OKmkszhD>WTn{O)nE~NxPOGHk^ zC|jqpXMpE=h@vwL^v?&?sq7h$qzUF62T7WgJ^(B2`tN_U1-`U9Gyi){L=|)ef(P!| THToLb00000NkvXXu0mjf9F_NY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..26866c6809535795335e830307597de49462bb3c GIT binary patch literal 530 zcmV+t0`2{YP)KVP!R`~sah#*0L(}W^2!enwNy6r{7fycu-e2zA6-}6Za>BPJ>aR>sOpZAHAIE%~3 z<{c;T)EXvM#F*3K)6%)S@Na;19cmB}5fKp)5fKp)5fS<8=I)e?c3tk2qGvcw<Yoe4j;XmW>2L@JTI(C7eFHAVWKPXR zcW=sK?lS=3V1EyQs$0!2Qk2!)X8`=(|8WvibKPrm7R>D6u)CDs0vBCI5Rp>&1r&(q UT`VdE4FCWD07*qoM6N<$f~l4E&Hw-a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json new file mode 100644 index 0000000000..5f1566a476 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PixelTheKermit (github) for SS14", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5ec4c37c60864e1e4b876a4be8a83e4f0fd6a4f4 GIT binary patch literal 1223 zcmV;&1UUPNP)1t^Ru#m~kA(#NAwp_Z2`M1B0K&4%EOHCICT_utUIMT$D7C~2i8zFSgp6Y+ z80g0KSs;(%o)$8u=9JTUHa5=8ystlICXT-k6bgkxp-?Cke4+KZ*T9n2EjDVczu1HQmKUNx)_E5z;HOEQmFvoI1bfnmGO8?r_-5Q|ItQ? zxaWDid-pD7px^KF_U+r0fz#7d%H^_@iO2Mt%_hU)kT49zO#(zw#LUbLfCx^pSfo;^ zO#M%onMOQ{B6__Z-ENm^wTkci_`VMy&a2fbuItk4^@yT~X0w@EvroBs+qSVRi(;|J zcsxee^;A1u*BOt;7>0pmS=hEcwf^j54Ti%ZmSq8Oc6LUwSfpOBivT1BY}*!_k!4vl z8V#wN{S{YNSE+Fg!@%=A>h(Iq;ZSJb+}zOVbb$L!aejV&s_`G30iNga;lqc5=Xt5= zl&p2Qzxl~vwA<~%WWT52c^)4>eoX0?N+s&`da7N$UZ+$lrSy}2k0Jdv*l0Aw#xuDG zBr_%Nufc_d1r`?<(RE#Hg1+x_adE-r<)yU#gEQb~j7B4D+fH4xZJW_(Bs)}Qq9_s` zY}+P^qReAS2jK4R4o%Zi1~g6M?(QzL2^lm^V=x#H1OeZ_ewE4q@DyJ_)Qx4%4|oSfwLB$$W3^b+{LF;xIe(~N7i8etd$Jb0|tYEOOudQN?*B>?w7Jm7vW z2!cQy0r3MRuO*O&zO>PYqMPS4z@MV8P$(1%g+ifFC=?2X;xA@rXXm%R_Ie6W@sjBc z%A{bqT&CS_7fjQPpX-fGqGg(9JemIb{Q0xAzI2D3ot?PVYKi>dmoHyZg%WuOA-U;9 z^G7eTL6FW3uCK2Hq*Bzr@3XtR%jV`L8yg$B2H^1UFg`dqV0(M}UmgJIx&-OWP$Igw zw+BG8*+kcMTCEoSeqVODOte}paX#rI3(^6YOob;k0F&3AgG5i)bsCKZmStu3ARU0+ z-CeQ%;66F}W5L98kQ7E}nuh0jbUGce56O@zHI^hN_xJY+!w|=DM43w7BqcJA;}C`+ z`}_MTPqIkQ0Dx+>np$(3rr|h_bo8@OE|*0?*6i$T=Cz+7Jp;D3ws2h+*L4AKU6*dR zD{6Q0#`8Q3!=T&kraZW=%huMG^mx(%2!eo0r9!b-B#vWIme%k0aU4h5fGm#V(C_zu z>LJMy%J5?91M>2q>I0@}^k3Hp?F+xe5cC=`m9#XnxkI@6TM{CEHW002ovPDHLkV1gtiWr_d* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/web.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4a6afb144c4ec4eb7c76469c3b3828c9dcc3d220 GIT binary patch literal 435 zcmV;k0ZjghP)=hpBf;`GU7OH=6RksA*7T|8vt<}lVw@!0R1+i&1Tbs zUuQuG@y`Zcuh*NlEnc?(z&VGt_HE5ti*wG`$}hlnyR8ALszM0Sgs|2kgrKUbH{GWP z_)QQ5TrL-iqM+aJQxpZ)>y;n~e64_%XW&nylne#~%CclU9#fX(hc<@~yaoT$_`U@l d9UUEC&QCA=nl_)F?oXaSW-L^Y)f)*P#HBwuj}% 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 ahRgGIE%Fne@V*}y9SokXelF{r5}E+33&F4e literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/creampie.rsi/meta.json b/Resources/Textures/Effects/creampie.rsi/meta.json index f5fe20f5d7..54e0cc73c2 100644 --- a/Resources/Textures/Effects/creampie.rsi/meta.json +++ b/Resources/Textures/Effects/creampie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0. creampie_moth by MilenVolf", + "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0. creampie_moth by MilenVolf, creampie_arachnid by PixelTheKermit (Github)", "size": { "x": 32, "y": 32 @@ -10,6 +10,10 @@ { "name": "creampie_ai" }, + { + "name": "creampie_arachnid", + "directions": 4 + }, { "name": "creampie_corgi", "directions": 4 diff --git a/Resources/Textures/Effects/speech.rsi/meta.json b/Resources/Textures/Effects/speech.rsi/meta.json index 3210aa6881..3f8f1d752a 100644 --- a/Resources/Textures/Effects/speech.rsi/meta.json +++ b/Resources/Textures/Effects/speech.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github)", "states": [ { "name": "alien0", @@ -377,6 +377,23 @@ }, { "name": "syndibot2" + }, + { + "name": "spider0", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "spider1" + }, + { + "name": "spider2" } ] } diff --git a/Resources/Textures/Effects/speech.rsi/spider0.png b/Resources/Textures/Effects/speech.rsi/spider0.png new file mode 100644 index 0000000000000000000000000000000000000000..1fbe784fb060abfe1aa542f756b19e92bca8affa GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=pFLe1Ln`LHz2(T)tRT?(@Zyfw zp;ZirSK4$fH+pk>b;^r&-`0*sWP tmYwnf7v`PMe!lwr^R1s5A^I7XZ)YmFwo>55Nvkf9h^MQc%Q~loCIG|0hy(xt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/speech.rsi/spider1.png b/Resources/Textures/Effects/speech.rsi/spider1.png new file mode 100644 index 0000000000000000000000000000000000000000..fa77a4316ee512246f5f32ea168e87613db54bef GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ8J;eVArY-_FB$S3R^Va1;6HV3 z_(?{k`CW^DgmmoP>-C-QsNljSNd~Vb{1*$@@S)%JfVN!7IATNiBq2b&6(9*2}sttwQn;ux)%KI$Ydv@*hKkXNH zCDzxsoc1(kxSyZ2?Ow&^4x3XmfB$f2x^jOxyMhuB>{@0Xc+KRZ`TgT_fo^2*boFyt I=akR{0MlGpga7~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/speech.rsi/spider2.png b/Resources/Textures/Effects/speech.rsi/spider2.png new file mode 100644 index 0000000000000000000000000000000000000000..10067b27b4cb06cd5af3f8b646ba696220041ad8 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9#0p?kcif|mkhZMDDbde(8$~C z#UD`Q<*)kA*84kOuWCnA>kYoY`GF=XimzTwO1*m}?)EAPV?UwkOJ>fTZl$rb|&f?#vELCYoevCh*iDiLC(3kM;L&>)78&qol`;+0K`BGA^-pY delta 34 ocmeBT>|&f?#>`&#cA}-Nh(wi{VchMtr3^se>FVdQ&MBb@0J*sevj6}9 diff --git a/Resources/Textures/Structures/Doors/web_door.rsi/closed.png b/Resources/Textures/Structures/Doors/web_door.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..b77d39c43adc275ff005707c6267dea059ce5470 GIT binary patch literal 853 zcmV-b1FHOqP)9UCwVTT+TF6BKwVydbl#`x_R@QJ`Y&j7r>zTO4hgFbu#KV%o$v3s2ku7hbK7AUm3d!{I=T5$9a? zdGA*{E=ee+V+9F-!{IszVBI;5&;@j&NKc^Kn@|uadGTEh9p8vUOr&D1#Tb(l#V_%zZdO$*83Ke5RyCxT=o%S; z(uA$jI;EgC-OcoO87noUW@&i=vLh`+V+;UwT~pWfN`@r@T80u2V2s(waQ7|{5|&*{ zit6LgZCFgp&=|AYaVf)1CzPiWe9Fi=UHBWy!~J; zBk5=%1X4=7axAUyds0eyQq3dDm$zbGfNn(6IK-r*=}uUppueRPN(a?-B!AP0G${n8 zloH06Os2AvX)E*P{aDv^t|5djb8;&dlS@amt9K!bDLGK)mpLJX6_+*-61}2-PKNnK z)O8(~%jK?rJxyBeyEk87=Z!dGjGWKs%`cgrP>=1|@8s{wP_D^RVtZqIGL(11G)*h1 feK%(Q_V4)zKJ^ySKqW}?00000NkvXXu0mjfz(JLE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/web_door.rsi/closing.png b/Resources/Textures/Structures/Doors/web_door.rsi/closing.png new file mode 100644 index 0000000000000000000000000000000000000000..2d649920a22a15a24a78516f3cb871334137f116 GIT binary patch literal 1679 zcmXw4dsNcd7XGE_RZ~f)Nfs&DI66Mb2l@Pw`6w(>laaErWrdcmG$BR77`=%%e1v2= zVrEn7NJdw@nO8}ySfX-Ad^DPI^N|80T8@oMD(YzW+*zHhHna4Z6E zW`Z(-Ajs@+SSS(f60mHI3_%R7$ovNc86H0z8Wc^hnybR4F2Xym|KVFO5@zgjT5<8h zL*2$*XaA4ir9bLC^39%C%=VB8viU>fP2UFuzwh(EisOYymZ`Q^8I0TRMN3(noKKqx z+6^bAYRtrmi_8$=%*#FaDeC?I^d5i;JVv>5_Np9n;ef?rZ$K z?{E?*8sB2w+8R+yp~{=`JPaX<|J`V~T$JWu^PN&Dt@DH;j^Dr=@p>}EHZ7xbq;f9a zRDoo1xrhojo4xx$!=!1pb{F~nJEaOmb}v?U9V}mtQ4w#?_C+ksD~WIReL+L6O-%T_ zNbRc!6)F@bPXDUarp;WnwoW*i>vg6Y6dIn-S0173uK3(Bdpj}F1qY9a-y}oKl>^W% zfP;>~fq~>ohxTXB7o>Rm8D>6(T*a>PcR=`~)d-vec9zc@DfRx9 zyx)Plkgpv4vo^6(Q)4kwdbY5}F}d~7=qWS?105a8)Ch&MyAv$YgxLPrhT}+CRIijR zKGonJKD2sh`5DWf}om>9Jg!9fQnRx+x-B)Ax*aGZPGIn^sw+P+sxan|ND z>u*$?a=)d>`Yt) zt5{v{k8qSP!mGN#Gs7zzTr97dU9?Sd!9XDBa5q%}S^b9oz4x`0O<1R|c?{d-$=_J{ z#OHx`p(9HTO#04k#})i-^1P*g=FMdawZM#-S%UftWS6(D)6uE1g`gYC15YxrR)$e} z!xmH!w|3DsC>*qpF|X^x0?FV8p9vnI&EBxl=W`KlRtWCAD4iMfaF6rkqxivdH=c%_ z*dlQ^wQAf4ntoRkfAT`BJ+55T*{ijNFw1pWx+{LHmhVB0=+r{+yk#g|pEytQd{?39 zds7KCo%}N_uUTfv^KuH&)28yfaJf;VK%WosN zaWBO}-d*^C(8F0{s@F75jpOeeyD6pIpx?)BBif_Ou8e@Yew+Wx?F)m&Eh%$_e?njWSQM{g+?viCu*Jsr7i4G}`uv=90<5^6dMf-=iwZ_Hh~mYgfxU(wr=j-j_k4OHLq}QN?*th0SZ%%Yf5N(7r@P{k z%T*Q~Q?h}9ZGZtiU_6{z)@Kjy0Ott;Yo~a;|M_I8MFUc1vA&VL5NNXx%q|L~H%7#L z$Ph0rYZr`?{(#LYRTe#Uh@i*gm-lX7|KOABbuEq6jMJplB}?F4d**;c~ zx!W;6x;MrI*enZZ4FWiC@CJ)EVRnzgLXE93z?ZkhIze!GV; V!<*bh1s@G`_+Uh+F!*fl{{YIVGz0(u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/web_door.rsi/meta.json b/Resources/Textures/Structures/Doors/web_door.rsi/meta.json new file mode 100644 index 0000000000..ac7ef06d4c --- /dev/null +++ b/Resources/Textures/Structures/Doors/web_door.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PixelTheKermit (github) for SS14", + "size": {"x": 32, "y": 32}, + "states": + [ + { + "name": "closed", + "directions": 1 + }, + { + "name": "closing", + "directions": 1, + "delays": + [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "open", + "directions": 1 + }, + { + "name": "opening", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Doors/web_door.rsi/open.png b/Resources/Textures/Structures/Doors/web_door.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..d12884de88f858570bc8d727dc79d7d2ba5ff673 GIT binary patch literal 489 zcmVAx{k6endh0Rs+gvU$K&xo-5XukZI0yBRaNceRaJ?|ft@2c z&E<003i`emlPAiuBzKy=?};&TyWPa)iMDMy91bX@&@o25_W;cEEG|zD?>#X_wD+F6 zu7R&Tk|IB2bzS4V$23i|E0R8h31bXR)1aMmEX%T6r4)JZWm#~}p{=!yF;#MKBd;Ef)-}^)7}0dR^CDQQ9L3UVE?WiY|&`7enbgkjJnnisvNEV<=4? z!)+28V*uIPpU7hfzbD~q6hDD;?tK#GE0iGb{p}=_Jbl*Xwn=7(x&~2O$K8VPF^r0LPEbB>zMV(|gA>O_=-r{#Mww ft;hoM?N0mxPJJP}X6H#200000NkvXXu0mjfTfyLJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/web_door.rsi/opening.png b/Resources/Textures/Structures/Doors/web_door.rsi/opening.png new file mode 100644 index 0000000000000000000000000000000000000000..305b329c0926a1be42b4b1dfecbd4578eedf7b5c GIT binary patch literal 1601 zcmZvdeKga19LImvH6;)29xZwJMaqqyaDGUaNrmhqn1Fnx`o|vAVHci~zKY^gUNbJ8MNO&R` zmP$>^AE1_0*YVOdKqOxS)Mk;>5WHqR#fysx83b(t8;em_*ps`yBt?vO{01-GuQ z4gg$TUB@(E8>X(t<>w=FT97t2<^2yuu(?2v61$!_y?fD{BS^F9IK=(s!?4;j5q2 zo={it_VIbzXJc)BohO>{;AF>qei&c#vl^O3rofi#VmtJ!*H`!N20^ehLWjvbcvBSA zj{rI$l@i?Zg@uK-_Oke_Z55I6gTnCrG?t`M=FZ{>=jJ@pxl#?XZQ+Wp1YWRE;HVTg zxDomo?nNoVwQ3zbzEND;1fj=kRqH!a{1m+;wW{3^jrIGn;|jpOLYJWYrpmqCuGVJ^ zY#9ZSE1|Wi%%(KX&Ze|I6o9C6_nzD$3AyQE2c2H(!xRT;9{HjFghrIj|&HrRgZPo|!Xk}Be zl_6<$Q)tD>wFlnyGLY0}I{VNrL!Jti0y`fmc0Bh{!N7uty9OZ(_i;t68uOrg8p;!nKBr3MK zhR}Cs_1L9xXFJDMh=}2g4a_)A_4ov&e~q|@>oilTEwSZ6`lm`mVM?+BtOC3Sw)kRUb*#`es9b0Fx?9>7OYX*-7 zOBqxkkIsnv(o6C3c^;80q%~xdf{2!&NsS(8!bXCY8!?!}Os3H`l>dNstSGacc(fR| z-+Aw~)I= zoU%rY7Hh&0DKCD|ANf$4TU7Nmqkg-wuE@uQ-nR>pN*40l)D&)ZOb~$$_VFq{(Kid&h94@N=%&8Wd5^lCfiq{V##+M;AA|@!z&f1?~XXQ_v ziY^9P&$}l^=ch)#C;Qby=(N8~E&8e&A@ta-;107g>qSHlB8w>3S$4yE;26xxXuiS0ZQV@Qs7x2o2Jao-|lfst;k`W?SzCAmtx716hD2ZQF9Zy?VZv2#+D zse_N5FFczQSfb`RE)XaG*SdN>e?vwdc8gk=dQy_=FK*P{rK%!})~C(_8D1-j#fD-+ zYyO$4d06id(dvEY@Hfc+g)VUgy{~OhX|(YPkDPtls@@&q%1v!Dvq71x{G?%2nM(?# z!;T*Jzvo6Vp{rE?oC~!CWpkT$<4YZPEr&399;|?N zEZXrM#O`mq4(7Cn-Rcl|FlVYw*L`z8OnW){-912xjSYyX5#aSgI-(N{2!f#)Cw94Y i9J>$1F3*reDBZLWvs=Nlnwuj38UU1oi#_Y0Z_?idARQtA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/full.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/full.png diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/web.rsi/meta.json similarity index 97% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/meta.json index 2c94685f9c..24ed806a88 100644 --- a/Resources/Textures/Structures/Furniture/Web/table.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/web.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "", + "copyright": "Made by PixelTheKermit (github) for SS14", "states": [ { "name": "full", diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/state_0.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/state_0.png diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/state_1.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/state_1.png diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/state_2.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/state_2.png diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/state_3.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/state_3.png diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/state_4.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/state_4.png diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/state_5.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/state_5.png diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/state_6.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/state_6.png diff --git a/Resources/Textures/Structures/Furniture/Web/table.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/web.rsi/state_7.png similarity index 100% rename from Resources/Textures/Structures/Furniture/Web/table.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/web.rsi/state_7.png diff --git a/Resources/Textures/Structures/Furniture/Web/bed.rsi/icon.png b/Resources/Textures/Structures/Furniture/Web/bed.rsi/icon.png deleted file mode 100644 index 18aef2ee51ab269a3640fd28d63135c686b22a93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmVP0#sJVkDu(Go-Ha0?NoMI?V#yFFhAX}`=f{wdc z7OLfKhIgKCe)#4OXw|A!t5&W4yR4=M5JF@{-|zQJV_K%5Iwhq9=N!K80|2_+ZfO#> z5F(4?7`NLEaU6pXf})pFq6!C~%Up~x5JE~nYzZMULWmAhO2Kg)?eF(HY}@`dPtz2H z5F;;U!3KaZ455@l7=~~hr{u5KYbBodYvM)OMU$^nUOuZXZkzyP42-dt@2dP+rZ&K1 z4@fC>MX%Sx<#PG6cU>1!N+VCxRPTWf0C3KAfaiH79|S=qJ|2(3IX80Gb+zvRUu#oL zQE|Ph@Vq{XA}FOa_dKr@W1AZ0`fg2s;)lZl>-GADE2WSmiS{q|K-F{q%%dm*@Ocv! zQ$8FHaXz0B1i|MXNRkBm{T{yWgE5BLY=-T2tNmm$!SQ&kjSmKcQl@O6`E&n{1As*- z&F1s@+khst*=(>}E-m2k8d6Fddksy>2L~R<5C9g71$Mg~PN!2Tpbk+=v(adT>2!+K hYV|&-$xOWK{{yNloh=B$cnAOh002ovPDHLkV1h=<)kFXQ diff --git a/Resources/Textures/Structures/Furniture/Web/chair.rsi/icon.png b/Resources/Textures/Structures/Furniture/Web/chair.rsi/icon.png deleted file mode 100644 index b1fb28b09d0760a26b589a5d4507881daa3ecdbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 967 zcmV;&133JNP)I*7;Yj3*N;v!~Ua zRv-ZzHas<6LK>Y;r*rI$UteE??!7kt&NVolPUpI=-TzfpU2S_f90tF81QBKh0EV6Z z{QSgjxBIV+F$NzWAISn+3bO)etpNZ{(*OW=yB)GD`>`!$Kv5Jh#-xgo6+s!$G|iw> zP16jrz!-y~C;(gpqV|t~AOV0&C#iEkWr5cEp+=q%EC4Xf1S$#OlJX?Zweq+JoGuh3 zK$c~0`Bv=%M8wsC4Yt8NgTrLzf2T*$Z=}*BCIb{L|I9zB} z0P5VB&_|YKuG1Wu!0AG>0_^wum*eqxCS}K?PZ+zve!oxpAjIWDK~IAKTxx}qq<$LY za-ly{U(zB(DdnyyrJ$68wbp&;n%}0b>zh_^V}9VftN;vL$p27DkPG?0pTcYgNGXx$ zIqJHGloDlG0>Gfd{-HWnfUq?At7!{Kn%g(wTEszTeg zkWvQSf6}IW|Gx!VYrMU^-E4(R@Xuzz_`xF-zBSzgZvNmoAZ8?w$Kzf8za;NbEdWy#h|sMrt`nj${NvcKA^4pj zky~p4T#lpAt7m^#NC?4lOg5H3bayDK1gy0XLb&(td7dNBb4V%Cwk?DZE%ZVNAjg2A?E3z!>Xhu=gOTL#t5Colbr4(6~p_C#FLjVSYflVb% zQwD-rn9=uh&*{pWYM*ArL}P6a`XBgb*Z2!fZA} zN=cF=6h*;wI_(^jBtc5aY&IiF5`+*)DJhD=YEGxquM@bxzwZ_OPppA7O&N_wcI7tI zb&cz~)OAf=*E~KxG8_&MiY*okZf4#Ybc7s>NL6^CIEDb0es)5swz9~c^;1AFdmPs zx#oTl1PCE`e}6|QMO9V!zK=1cquYEL4ZTGOptZ(zU8<_;j2mNYluf*jr zRTZx5_L_capzZt+jS=8r;|8S^#u$9x|2G3oOwF5r6x&zqKi8hdeLh_S``2w@r4)Id zb9#E(8*kSh(rMG#79SoSzGXYUy}j*k$47pO-@7Kv(0EZzp#T5?07*qoM6N<$f`t$+ A?*IS* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/web.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/web.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..780974b07ea6df171038d4d172f513a8b6bdbc78 GIT binary patch literal 378 zcmV-=0fqjFP)?F?T0+mXo^51E0 zCw<@NpSX0p-Riyi(f57cY&I~)Xd)3oL?9x_Im23u7$b-XDJ2+VbQBRVGeQVxng&Fq z`)5*00D#?Yr$z8>WvkWdVfEhoFU9Ynr?S6+!oc}_R!z=1Ow&~83?Zm?=bY-Frb*YW zwMEF7v5tv!m4u^vtzFaOb zjw1lza=Ac6(6+5UCWHV07>42F0=ll#O~x2BO@o{>*6X#tikTrI=(-L7uvjeASd0?$ht?X5F*HpB z&N+P=V<3cpQVO2ufiXt=t(v9*0BklJG9kLo27|#%_hA_R)%va2r=q_=4uQ+%LYRUe zKwZ}kPNfuK4}yU3*L6+vzVAD2vv~kG?d>%X$FZ{*1c5Vtg!eY?Gwc5rfz#>axYb&N zbB>}Yz!-xNg659LBPEwoqN*wY!1a2CF$QrQ(_xfS0Dz(>o*PJ#gf?-`;dvg~w#8^P zqEiVWV2nYMBmjUYiinuj8etd`E#LRS*q?iDV?RVdDFq<}nx=71mFGEx5U8q(2!vrs z#k;g@d#qj(*zI5XI^VfC@o&b7`*{nYbU-e zO9&zEioP_^b>1gy1VC?LEBn)wQhv;U#bi(Z2-_>&?(4SkR!{H1?YNsb2m<7Jjwp)m m=DV?ddAj=Xe?)KnxPAdzc8Q|!#`J#x0000bg0&V!QJ}7C5D^}a2Z#uDU85)pSZhHy z(r*8}&luTP5K0hGO2Ih?Yb}g1D2f8c7!XnH>Z+=+TCFm7IOoxcvSavs@PNz&j z_Af}$TKA#u>D~P+Xs!G8dX3xd_S<_*OiWBnOiWDt|NH>H#5p~4PS>aa0000#~= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Web/bed.rsi/icon.png b/Resources/Textures/Structures/Web/bed.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d0bc0674a199273238f6a2367ac1e8f33188163b GIT binary patch literal 384 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 U$PoqTdjJ3c07*qoM6N<$f*3#e@c;k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Furniture/Web/chair.rsi/meta.json b/Resources/Textures/Structures/Web/chair.rsi/meta.json similarity index 73% rename from Resources/Textures/Structures/Furniture/Web/chair.rsi/meta.json rename to Resources/Textures/Structures/Web/chair.rsi/meta.json index 3b193359ab..99f2dbf6d0 100644 --- a/Resources/Textures/Structures/Furniture/Web/chair.rsi/meta.json +++ b/Resources/Textures/Structures/Web/chair.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "", + "copyright": "Made by PixelTheKermit (github) for SS14", "states": [ { "name": "icon", diff --git a/Resources/Textures/Tiles/Misc/Web/web_tile.png b/Resources/Textures/Tiles/Misc/Web/web_tile.png index c40431140c25bac14e22abc7cec03ccddf65913b..257cd44a0143314119de74d2d023024600ab3dd8 100644 GIT binary patch delta 1513 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 P00000NkvXXu0mjf;6w3M