Things (#325)

* Cables Resprite

* Katana Sheath Tweaks

* remove folder with nukecodes

* cryo animation fix

* DS neon boot fix

* remove Guan-Yu hardsuit from cargo

* Vulcan smoll buff

* wtf is this

* meta

* maybe sheath fix

* fix

* meta fix 2

* maybe fix?

* бля хули Йамл тест про рси говорит

* да как дупликаты заебали

---------

Co-authored-by: BL02DL <[email protected]>

Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml

@@ -47,10 +47,20 @@
     sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
     state: icon
   product: CrateSecurityShanlinTacsuit
-  cost: 30000
+  cost: 17500
   category: cargoproduct-category-name-hardsuits
   group: market
 
+#- type: cargoProduct
+#  id: SecurityGuanYuTacsuit
+#  icon:
+#    sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
+#    state: icon
+#  product: CrateSecurityGuanYuTacsuit
+#  cost: 30000
+#  category: cargoproduct-category-name-hardsuits
+#  group: market
+
 - type: cargoProduct
   id: SecurityBaghaturTacsuit
   icon:

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -52,10 +52,6 @@
       - id: RubberStampCaptain
 #     - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box
       - id: JetpackCaptainFilled
-      # - < DarkSide
-      - id: LPPBoxFolderSecretCap
-      - id: LPPBoxFolderCap
-      # - >
       - id: MedalCase
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
@@ -75,11 +71,6 @@
       - id: WeaponDisabler
       - id: CommsComputerCircuitboard
       - id: ClothingHeadsetAltCommand
-      - id: SpaceCash1000
-      # - < DarkSide
-      - id: LPPBoxFolderSecretCap
-      - id: LPPBoxFolderCap
-      # - >
       - id: PlushieNuke
         prob: 0.1
       - id: CigarGoldCase
@@ -104,10 +95,6 @@
     contents:
       - id: ClothingOuterArmorCaptainCarapace
       - id: NukeDisk
-      # - < DarkSide
-      - id: LPPBoxFolderSecretCap
-      - id: LPPBoxFolderCap
-      # - >
       - id: PinpointerNuclear
 #      - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat.
       - id: WeaponDisabler

Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml

@@ -3,10 +3,12 @@
   parent: ClothingBeltKatanaSheath
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: Wakizashi
-      - id: Katana
+  - type: ContainerFill
+    containers:
+      katana:
+      - Katana
+      wakizashi:
+      - Wakizashi
 
 - type: entity
   id: ClothingBeltKatanaSheathFilledHoS

Resources/Prototypes/Entities/Structures/Power/cables.yml

@@ -69,6 +69,12 @@
   - type: Cable
     cableDroppedOnCutPrototype: CableHVStack1
     cableType: HighVoltage
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 3.333
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Power/Cables/hv_cable_damage.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -105,11 +111,9 @@
   description: A medium voltage power cable.
   components:
   - type: Sprite
-    color: Yellow
     sprite: Structures/Power/Cables/mv_cable.rsi
     state: mvcable_0
   - type: Icon
-    color: Yellow
     sprite: Structures/Power/Cables/mv_cable.rsi
     state: mvcable_4
   - type: NodeContainer
@@ -149,11 +153,9 @@
   description: A cable used to connect machines to an APC. #APCs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future.
   components:
   - type: Sprite
-    color: Green
     sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_0
   - type: Icon
-    color: Green
     sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_4
   - type: NodeContainer

Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml

@@ -37,7 +37,7 @@
     sprite: Nyanotrasen/Clothing/Belt/Martial/black.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltBase, ClothingSlotBase]
   id: ClothingBeltKatanaSheath
   name: katana sheaths
   description: An ornate belt designed to hold a pair of samurai's blades, or daisho.
@@ -47,18 +47,42 @@
     state: sheath
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Belt/katanasheath.rsi
-  - type: Storage
-    grid:
-      - 0,0,3,1
-    whitelist:
-      tags:
-        - Katana
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      katana: !type:ContainerSlot
+      wakizashi: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      katana:
+        name: Katana
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        insertSound: /Audio/SimpleStation14/Items/Handling/sword_sheath.ogg
+        ejectSound: /Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg
+        whitelist:
+          tags:
+          - Katana
+      wakizashi:
+        name: Wakizashi
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        insertSound: /Audio/SimpleStation14/Items/Handling/sword_sheath.ogg
+        ejectSound: /Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg
+        whitelist:
+          tags:
+          - Wakizashi
   - type: ItemMapper
     mapLayers:
-      sheath-sabre:
+      sheath-katana:
         whitelist:
           tags:
           - Katana
+      sheath-wakizashi:
+        whitelist:
+          tags:
+          - Wakizashi
   - type: Appearance
   - type: Tag
     tags:

Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml

@@ -6,7 +6,7 @@
   components:
   - type: Tag
     tags:
-    - Katana
+    - Wakizashi
   - type: Sharp
   - type: Utensil
     types:

Resources/Prototypes/tags.yml

@@ -788,6 +788,9 @@
 - type: Tag
   id: Katana
 
+- type: Tag
+  id: Wakizashi
+
 - type: Tag
   id: Kangaroo
 

Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json

@@ -34,6 +34,10 @@
             "name": "equipped-MASK-vox",
             "directions": 4
         },
+        {
+            "name": "up-equipped-MASK-vox",
+            "directions": 4
+        },
         {
             "name": "up-equipped-MASK",
             "directions": 4

Resources/Textures/Clothing/Mask/medical.rsi/meta.json

@@ -14,10 +14,6 @@
             "name": "equipped-MASK",
             "directions": 4
         },
-        {
-            "name": "equipped-MASK-vox",
-            "directions": 4
-        },
         {
             "name": "equipped-MASK-vulpkanin",
             "directions": 4
@@ -38,6 +34,10 @@
             "name": "up-equipped-MASK-vox",
             "directions": 4
         },
+        {
+            "name": "equipped-MASK-vox",
+            "directions": 4
+        },
         {
             "name": "equipped-MASK-dog",
             "directions": 4
@@ -65,12 +65,22 @@
         {
             "name": "equipped-MASK-hamster",
             "directions": 4,
-            "delays": [[1.0], [1.0], [1.0], [1.0]]
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
         },
         {
             "name": "equipped-MASK-kangaroo",
             "directions": 4,
-            "delays": [[1.0], [1.0], [1.0], [1.0]]
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
         },
         {
             "name": "equipped-MASK-possum",

Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/meta.json

@@ -6,20 +6,23 @@
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-        "name": "equipped-BELT",
-        "directions": 4
-    },
-    {
-        "name": "sheath-sabre-equipped-BELT",
-        "directions": 4
-    },
-    {
-        "name": "sheath-sabre"
-    },
-    {
-        "name": "sheath"
-    }
-  ]
+    "states": [
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "sheath-sabre-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "sheath-katana"
+        },
+        {
+            "name": "sheath-wakizashi"
+        },
+        {
+            "name": "sheath"
+        }
+    ]
 }

Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+	"license": "CC-BY-SA-4.0",
+	"copyright": "Made by PJB3005",
+    "states": [
+        {
+            "name": "DamageOverlay_4"
+
+        },
+        {
+            "name": "DamageOverlay_8"
+
+        },
+        {
+            "name": "DamageOverlay_12"
+
+        }
+    ]
+}

Resources/Textures/Structures/cryostorage.rsi/meta.json

@@ -16,30 +16,62 @@
       "directions": 4,
       "delays": [
         [
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
             0.2,
             0.2,
             0.2,
             0.2
-          ],
-          [
+        ],
+        [
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
             0.2,
             0.2,
             0.2,
             0.2
-          ],
-          [
+        ],
+        [
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
             0.2,
             0.2,
             0.2,
             0.2
-          ],
-          [
+        ],
+        [
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
             0.2,
             0.2,
             0.2,
             0.2
-          ]
+        ]
         ]
       }
     ]
-  }
+  }