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

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
+    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

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

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

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

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
+        Asphyxiation: -0.5

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
 

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

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

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

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

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

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]

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"]]
-

Resources/Prototypes/Entities/Structures/Walls/walls.yml

@@ -966,7 +966,7 @@
     key: walls
     base: wall
   - type: Construction
-    graph: WallWeb
+    graph: WebStructures
     node: wall