Merge branch 'DeltaV-Station:master' into GravGauntlet

Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs

@@ -59,8 +59,6 @@ public sealed class ShipyardConsoleSystem : SharedShipyardConsoleSystem
                 Audio.PlayPvs(ent.Comp.DenySound, ent);
                 return;
             }
-
-            purchasingGrid = bankAccount.Value.Owner;
         }
 
         if (purchasingGrid is not { } grid

Content.Shared/SubFloor/SharedTrayScannerSystem.cs

@@ -5,6 +5,7 @@ using Content.Shared.Inventory.Events;
 using Robust.Shared.GameStates;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
+using Content.Shared._DV.Clothing.Events; //DeltaV - ToggleTrayScanner event
 
 namespace Content.Shared.SubFloor;
 
@@ -30,6 +31,7 @@ public abstract class SharedTrayScannerSystem : EntitySystem
         SubscribeLocalEvent<TrayScannerComponent, GotUnequippedEvent>(OnTrayUnequipped);
 
         SubscribeLocalEvent<TrayScannerUserComponent, GetVisMaskEvent>(OnUserGetVis);
+        SubscribeLocalEvent<TrayScannerComponent, ToggleTrayScannerEvent>(OnToggleAction); //DeltaV - Listening to Tray toggle event
     }
 
     private void OnUserGetVis(Entity<TrayScannerUserComponent> ent, ref GetVisMaskEvent args)
@@ -127,6 +129,19 @@ public abstract class SharedTrayScannerSystem : EntitySystem
         scanner.Range = state.Range;
         SetScannerEnabled(uid, state.Enabled, scanner);
     }
+
+    /// DeltaV additions begin
+    private void OnToggleAction(Entity<TrayScannerComponent> scanner, ref ToggleTrayScannerEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // Toggle Logic
+        SetScannerEnabled(scanner, !scanner.Comp.Enabled, scanner);
+
+        args.Handled = true;
+    }
+    /// DeltaV additions end
 }
 
 [Serializable, NetSerializable]

Content.Shared/_DV/Abilities/Kitsune/SharedKitsuneSystem.cs

@@ -4,6 +4,7 @@ using Content.Shared.Charges.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Popups;
+using Content.Shared.Zombies;
 
 namespace Content.Shared._DV.Abilities.Kitsune;
 
@@ -23,6 +24,8 @@ public abstract class SharedKitsuneSystem : EntitySystem
         SubscribeLocalEvent<FoxfireComponent, ComponentShutdown>(OnFoxfireShutdown);
         SubscribeLocalEvent<KitsuneComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<KitsuneComponent, AppearanceLoadedEvent>(OnProfileLoadFinished);
+
+        SubscribeLocalEvent<KitsuneComponent, EntityZombifiedEvent>(OnKitsuneZombified);
     }
 
     private void OnProfileLoadFinished(Entity<KitsuneComponent> ent, ref AppearanceLoadedEvent args)
@@ -58,6 +61,17 @@ public abstract class SharedKitsuneSystem : EntitySystem
         ent.Comp.FoxfireAction = _actions.AddAction(ent, ent.Comp.FoxfireActionId);
     }
 
+    /// <summary>
+    /// Handles when a Kitsune becomes a zombie, removing their abilities.
+    /// </summary>
+    /// <param name="kitsune">The Kitsune zombie that has just spawned.</param>
+    /// <param name="args">Args for the event.</param>
+    private void OnKitsuneZombified(Entity<KitsuneComponent> kitsune, ref EntityZombifiedEvent args)
+    {
+        _actions.RemoveAction(kitsune.Comp.KitsuneActionEntity);
+        _actions.RemoveAction(kitsune.Comp.FoxfireAction);
+    }
+
     private void OnCreateFoxfire(Entity<KitsuneComponent> ent, ref CreateFoxfireActionEvent args)
     {
         // Kitsune fox can make fox fires from their mouth otherwise they need hands.

Content.Shared/_DV/Clothing/Events/ToggleTrayEvent.cs

@@ -0,0 +1,6 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared._DV.Clothing.Events;
+
+[ByRefEvent]
+public sealed partial class ToggleTrayScannerEvent : InstantActionEvent { }

Resources/Changelog/DeltaVChangelog.yml

@@ -1,123 +1,4 @@
 Entries:
-- author: AeraAuling
-  changes:
-  - message: Harbingers have increased the budget for accursed scythe fabrication.
-      It should be a bit more effective now.
-    type: Tweak
-  id: 1759
-  time: '2025-10-21T18:39:12.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4543
-- author: Niomi0
-  changes:
-  - message: Roboticists/Borgs now have access to a new generic borg module containing
-      a spray painter, magic crayon and hand labeler. To allow restoration, pipe spraying
-      and other artistic endeavors.
-    type: Add
-  id: 1760
-  time: '2025-10-22T10:00:50.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4532
-- author: Toby222
-  changes:
-  - message: All winter clothing now properly protects against zombies
-    type: Fix
-  id: 1761
-  time: '2025-10-22T15:28:22.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4560
-- author: Cepelinas1
-  changes:
-  - message: De-metashielded Code Epsilon. DeathSquads or DAP are still metashielded
-      however.
-    type: Add
-  - message: Added Alert Procedure entry for Code Epsilon.
-    type: Add
-  id: 1762
-  time: '2025-10-22T20:26:56.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/3867
-- author: EmberAstra
-  changes:
-  - message: The syndicate has now weaponized mothroaches. Available in convenient
-      grenade form!
-    type: Add
-  id: 1763
-  time: '2025-10-23T23:59:55.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4558
-- author: Proxysseia
-  changes:
-  - message: 'guns are now cheaper, write a proper CL later :godo:'
-    type: Tweak
-  id: 1764
-  time: '2025-10-24T01:36:03.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4555
-- author: AeraAuling
-  changes:
-  - message: Now people with jobs can wear cute dresses too.
-    type: Tweak
-  id: 1765
-  time: '2025-10-24T01:37:55.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4542
-- author: Eternally-Confused
-  changes:
-  - message: Chemist winter boots are now available in the chemdrobe.
-    type: Fix
-  id: 1766
-  time: '2025-10-24T02:02:17.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4533
-- author: CheddaCheez
-  changes:
-  - message: Added a new jumpskirt for Clowns, ported from Starlight!
-    type: Add
-  - message: Added blushing masks to Clown and Mime loadouts.
-    type: Add
-  id: 1767
-  time: '2025-10-25T00:57:02.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4561
-- author: AeraAuling
-  changes:
-  - message: Added appropriate interactions with shadow damage to some relevant creatures
-    type: Tweak
-  id: 1768
-  time: '2025-10-25T15:41:57.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4541
-- author: BriBrooo
-  changes:
-  - message: Surgery room reorganized
-    type: Tweak
-  - message: Detective room has its own bedroom to fit an evidence locker
-    type: Tweak
-  - message: Library now has a display case
-    type: Tweak
-  - message: Prison intercoms now are the right ones
-    type: Fix
-  - message: Departmental lock boxes are now available
-    type: Fix
-  id: 1769
-  time: '2025-10-25T22:45:52.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4489
-- author: SirWarock
-  changes:
-  - message: Cryotubes are now smart - They'll evenly inject 0.5u of every chemical
-      present in the beaker! No overloading anymore!
-    type: Tweak
-  - message: Trinoxadone's metabolism has been nerfed to 0.5u/s to accommodate the
-      above change.
-    type: Tweak
-  id: 1770
-  time: '2025-10-25T23:47:19.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4456
-- author: EmberAstra
-  changes:
-  - message: Fixed Space Adders being attacked by other salvage mobs.
-    type: Fix
-  id: 1771
-  time: '2025-10-26T00:09:23.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4503
-- author: MantasDab360
-  changes:
-  - message: Fixed IPC's not being able to polymorph.
-    type: Fix
-  id: 1772
-  time: '2025-10-26T18:35:48.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4545
 - author: EmberAstra
   changes:
   - message: Added scar markings for Vox!
@@ -4428,4 +4309,114 @@
   id: 2259
   time: '2026-05-01T18:00:31.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/5730
+- author: SalDragonsNOA
+  changes:
+  - message: Added sprites for four new outfits for the Boxer, inspired by the ancient
+      Terran art known as "rasslin"!
+    type: Add
+  - message: Added sprites for three masks for Boxers, inspired by the fearless masked
+      wrestlers of antiquity!
+    type: Add
+  - message: Added new uniforms and masks to the Boxing Drobe!
+    type: Add
+  - message: Added new uniforms and masks to Loadout options for Boxer!
+    type: Add
+  id: 2260
+  time: '2026-05-02T19:46:39.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5687
+- author: rebe83
+  changes:
+  - message: Advanced engineering goggles with integrated t-ray scanner and robotic
+      diagnostic HUD and flash protection are now available with advanced tools research!
+    type: Add
+  id: 2261
+  time: '2026-05-03T08:48:21.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5688
+- author: rebe83
+  changes:
+  - message: NT armory has added radio holsters to sec webbings and belts!
+    type: Tweak
+  id: 2262
+  time: '2026-05-03T09:00:41.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5587
+- author: DuskyJay
+  changes:
+  - message: Fixed Plasma and Uranium fuel rods not registering properly.
+    type: Fix
+  id: 2263
+  time: '2026-05-03T12:04:58.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5771
+- author: Sugarcane
+  changes:
+  - message: Fixed Techfabs not following the camera's rotation.
+    type: Fix
+  id: 2264
+  time: '2026-05-03T12:56:20.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5736
+- author: Stxcking
+  changes:
+  - message: Station can buy shuttles using the shipyard console again!
+    type: Fix
+  id: 2265
+  time: '2026-05-03T13:08:08.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5524
+- author: BarryNorfolk
+  changes:
+  - message: Kitsunes can no longer polymorph as Zombies
+    type: Fix
+  id: 2266
+  time: '2026-05-03T13:20:07.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5376
+- author: Eternally-Confused
+  changes:
+  - message: The CMO's long lab coat now protects as well as the CMO's normal lab
+      coat.
+    type: Tweak
+  id: 2267
+  time: '2026-05-03T17:59:41.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5744
+- author: Eternally-Confused
+  changes:
+  - message: The new medical clothing is now available in the uniform printer!
+    type: Add
+  id: 2268
+  time: '2026-05-03T19:45:41.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5741
+- author: Velcroboy
+  changes:
+  - message: Added Poppy the engineer possum.
+    type: Add
+  id: 2269
+  time: '2026-05-03T19:46:59.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5770
+- author: Stxcking
+  changes:
+  - message: Added an Avali Plushie !
+    type: Add
+  id: 2270
+  time: '2026-05-04T07:49:19.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5761
+- author: Sugarcane
+  changes:
+  - message: Paper can no longer be attached to nuclear reactor flatpacks
+    type: Fix
+  id: 2271
+  time: '2026-05-04T08:55:22.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5747
+- author: Velcroboy
+  changes:
+  - message: 'The Hive: Removed superweapon fun!'
+    type: Remove
+  - message: 'The Hive: Reinforced Logi a little'
+    type: Tweak
+  id: 2272
+  time: '2026-05-04T09:16:40.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5733
+- author: Sugarcane, ErrorByte
+  changes:
+  - message: A beret for the virology department, obtainable from the Virodrobe!
+    type: Add
+  id: 2273
+  time: '2026-05-04T09:44:02.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5729
 Order: 1

Resources/Changelog/Maps.yml

@@ -1004,4 +1004,13 @@
   id: 116
   time: '2026-05-01T18:18:08.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/5709
+- author: Colin-Tel
+  changes:
+  - message: 'Division: Replaced the TEG with a nuclear reactor.'
+    type: Add
+  - message: 'Division: Enhanced camera coverage for AI players.'
+    type: Tweak
+  id: 117
+  time: '2026-05-02T12:10:29.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5749
 Order: 3

Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl

@@ -169,6 +169,7 @@ loadout-group-gladiator-outerclothing = Gladiator outer clothing
 
 loadout-group-boxer-jumpsuit = Boxer jumpsuit
 loadout-group-boxer-gloves = Boxer gloves
+loadout-group-boxer-mask = Wrestling mask
 
 # Species
 loadout-group-humanoid-silicon = Silicon-friendly survival box

Resources/Locale/en-US/_DV/prototypes/entities/clothing/belts.ftl

@@ -1,6 +1,8 @@
 # Add sidearm and medkit slots to security belts + webbing, medical webbing respectively
 clothing-belt-sidearm = Sidearm
 clothing-belt-medkit = Medkit
+# Add radio slot to sec belt + webbing
+clothing-belt-radio = Radio
 
 # Add slots to the daishou
 clothing-belt-katana = Katana

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

@@ -160,7 +160,7 @@
     - id: CigarCase
       prob: 0.15
     - id: ClothingBeltChiefEngineerFilled
-    - id: ClothingEyesGlassesMeson
+    - id: ClothingEyesGlassesMesonTray # DeltaV- replace normal meson goggles
     #- id: ClothingHandsGlovesColorYellow # DeltaV - Moved to dresser
     - id: ClothingHeadsetAltEngineering
     - id: DoorRemoteEngineering

Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml

@@ -3,6 +3,7 @@
   startingInventory:
     ClothingUniformJumpsuitVirology: 2
     ClothingUniformJumpskirtVirology: 2
+    ClothingHeadHatBeretViro: 2 #Delta V: Add virology department beret
     ClothingShoesColorWhite: 2
     ClothingOuterCoatLabViro: 2
     ClothingOuterWinterViro: 2

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

@@ -154,7 +154,7 @@
     sprite: _DV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite
   - type: Clothing
     sprite: _DV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite
-  - type: ItemSlots # DeltaV - add sidearm slot
+  - type: ItemSlots # DeltaV - add sidearm and radio slot
     slots:
       holster:
         name: clothing-belt-sidearm
@@ -162,6 +162,12 @@
           tags:
           - Sidearm
         insertOnInteract: false
+      radio:
+        name: clothing-belt-radio
+        whitelist:
+          tags:
+          - Radio
+        insertOnInteract: false
   - type: Storage # DeltaV - Split Inventory
     grid:
     - 0,0,2,1
@@ -178,6 +184,7 @@
       storagebase: !type:Container
         ents: []
       holster: !type:ContainerSlot {}
+      radio: !type:ContainerSlot {} # DeltaV - add radio holster
   - type: Appearance # DeltaV
 
 - type: entity

Resources/Prototypes/Entities/Clothing/Belt/job.yml

@@ -437,7 +437,8 @@
       storagebase: !type:Container
         ents: []
       holster: !type:ContainerSlot {}
-  - type: ItemSlots # DeltaV - add sidearm slot
+      radio: !type:ContainerSlot {}
+  - type: ItemSlots # DeltaV - add sidearm and radio slot
     slots:
       holster:
         name: clothing-belt-sidearm
@@ -445,4 +446,10 @@
           tags:
           - Sidearm
         insertOnInteract: false
+      radio:
+        name: clothing-belt-radio
+        whitelist:
+          tags:
+          - Radio
+        insertOnInteract: false
   - type: Appearance

Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml

@@ -51,6 +51,7 @@
     - id: PlushieChitinid
     - id: PlushieKitsune
     - id: PlushieThaven # IMP port
+    - id: PlushieAvali
     # End DeltaV
     - !type:GroupSelector
       children:

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -425,6 +425,7 @@
   components:
   - type: Sprite
     sprite: _DV/Structures/Machines/techfab.rsi # DeltaV - resprite armoury fabs
+    snapCardinals: true #DeltaV - Follow Camera Rotation
     layers:
     - state: icon
       map: ["enum.LatheVisualLayers.IsRunning"]
@@ -497,6 +498,7 @@
   components:
     - type: Sprite
       sprite: _DV/Structures/Machines/techfab.rsi # DeltaV - resprite armoury fabs
+      snapCardinals: true #DeltaV - Follow Camera Rotation
       layers:
         - state: icon
           map: ["enum.LatheVisualLayers.IsRunning"]

Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml

@@ -7,5 +7,13 @@
     ClothingHandsGlovesBoxingBlue: 2
     ClothingHandsGlovesBoxingGreen: 2
     ClothingHandsGlovesBoxingYellow: 2
+# Delta-V: Wrestling regalia
+    ClothingUniformJumpsuitWrestlerCostumeGreen: 2
+    ClothingUniformJumpsuitWrestlerCostumeRed: 2
+    ClothingUniformJumpsuitWrestlerCostumeYellow: 2
+    ClothingUniformJumpsuitWrestlerCostumeBlue: 2
+    ClothingEyesWrestlerMaskDomino: 2
+    ClothingHeadHatWrestlingMaskLuchaRed: 2
+    ClothingHeadHatWrestlingMaskLuchaBlue: 2
   emaggedInventory:
-    UniformJabroni: 2
+    UniformJabroni: 2

Resources/Prototypes/Reagents/Materials/materials.yml

@@ -6,6 +6,9 @@
   icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
   color: "#8A9A5B"
   price: 0.1
+  properties: # FH edit
+    electrical: 4
+    flammable: 3
 
 - type: material
   id: Cardboard
@@ -14,6 +17,11 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
   color: "#70736c"
   price: 0.025
+  properties: # FH edit
+    electrical: 4
+    hard: 1
+    density: 2
+    flammable: 4
 
 - type: material
   id: Cloth
@@ -23,6 +31,11 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
   color: "#e7e7de"
   price: 0.05
+  properties: # FH edit
+    electrical: 4
+    hard: 1
+    density: 1
+    flammable: 2
 
 - type: material
   id: Durathread
@@ -33,6 +46,13 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
   color: "#8291a1"
   price: 0.35 # 1-1 mix of plastic and cloth.
+  properties: # FH edit
+    electrical: 8
+    thermal: 9
+    hard: 4
+    density: 5
+    flammable: 2
+    chemical: 7
 
 - type: material
   id: Paper
@@ -41,6 +61,11 @@
   icon: { sprite: Objects/Materials/Sheets/other.rsi, state: paper }
   color: "#d9d9d9"
   price: 0.01 # it's paper bro what do you expect?
+  properties: # FH edit
+    electrical: 2
+    hard: 1
+    density: 1
+    flammable: 6
 
 - type: material
   id: Plasma
@@ -49,6 +74,15 @@
   icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plasma }
   color: "#7e009e"
   price: 0.35 # $35 for 1 unit
+  properties: # FH edit
+    electrical: 5
+    thermal: 3
+    hard: 2
+    density: 1
+    flammable: 8
+    chemical: 5
+    radioactive: 2
+    plasma_offgas: 10
 
 - type: material
   id: Plastic
@@ -57,6 +91,12 @@
   icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plastic }
   color: "#d9d9d9"
   price: 0.20 # $20 for 1 unit
+  properties: # FH edit
+    electrical: 2
+    thermal: 3
+    hard: 1
+    density: 3
+    chemical: 5
 
 - type: material
   id: Wood
@@ -66,6 +106,11 @@
   icon: { sprite: Objects/Materials/materials.rsi, state: wood }
   color: "#966F33"
   price: 0.10 # $10 for 1 unit
+  properties: # FH edit
+    electrical: 4
+    hard: 3
+    density: 5
+    flammable: 4
 
 - type: material
   id: Uranium
@@ -74,6 +119,14 @@
   icon: { sprite: Objects/Materials/Sheets/other.rsi, state: uranium }
   color: "#32a852"
   price: 0.85 # $85 for 1 unit
+  properties: # FH edit
+    electrical: 4
+    thermal: 3
+    hard: 5
+    density: 7
+    chemical: 6
+    radioactive: 4
+    n_radioactive: 3
 
 - type: material
   id: Bananium
@@ -83,6 +136,16 @@
   icon: { sprite: Objects/Materials/materials.rsi, state: bananium }
   color: "#32a852"
   price: 1.0 # $100 for 1 unit
+  # Interpolated properties, 50/50 biomass/uranium
+  properties: # FH edit
+    electrical: 4
+    thermal: 4
+    hard: 4
+    density: 5
+    flammable: 1.5
+    chemical: 4.5
+    radioactive: 7 # Not interpolated, PRAISE THE HONKMOTHER
+    n_radioactive: 1.5
 
 - type: material
   id: Meaterial # you can't take this pun from me
@@ -91,6 +154,11 @@
   icon: { sprite: Objects/Materials/Sheets/meaterial.rsi, state: meat }
   color: "#c53648"
   price: 0.05
+  properties: # FH edit
+    electrical: 4
+    hard: 1
+    density: 3
+    flammable: 3
 
 - type: material
   id: WebSilk
@@ -99,6 +167,12 @@
   icon: { sprite: Objects/Materials/silk.rsi, state: icon }
   color: "#eeeeee" #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
   price: 0 # Maybe better for it to be priceless, knowing how greedy cargo is.
+  properties: # FH edit
+    electrical: 4
+    thermal: 4
+    hard: 1
+    density: 6
+    flammable: 5
 
 - type: material
   id: Cotton
@@ -107,6 +181,12 @@
   icon: { sprite: Objects/Materials/materials.rsi, state: cotton }
   color: "#cccccc"
   price: 0.01 #Who knew cotton was infinitely more valuable than silk
+  properties: # FH edit
+    electrical: 4
+    thermal: 4
+    hard: 1
+    density: 1
+    flammable: 4
 
 - type: material
   id: Bones
@@ -115,6 +195,11 @@
   icon: { sprite: Objects/Materials/materials.rsi, state: bones }
   color: "#896f5e"
   price: 0
+  properties: # FH edit
+    electrical: 4
+    hard: 5
+    density: 3
+    flammable: 2
 
 - type: material
   id: Coal
@@ -124,6 +209,11 @@
   icon: { sprite: Objects/Materials/ore.rsi, state: coal }
   color: "#404040"
   price: 0.1 # $10 for 1 unit
+  properties: # FH edit
+    electrical: 4
+    hard: 3
+    density: 2
+    flammable: 5
 
 - type: material
   id: Gunpowder
@@ -132,6 +222,9 @@
   icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile }
   color: "#A9A9A9"
   price: 0
+  properties: # FH edit
+    electrical: 3
+    flammable: 8
 
 - type: material
   id: Diamond
@@ -141,3 +234,9 @@
   icon: { sprite: Objects/Materials/materials.rsi, state: diamond }
   color: "#80ffff"
   price: 20 # big diamond gaslit us so hard diamonds actually became extremely rare
+  properties: # FH edit
+    electrical: 3
+    thermal: 3
+    hard: 7
+    density: 6
+    chemical: 5

Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml

@@ -62,6 +62,7 @@
   - PowerDrill
   - WelderExperimental
   - JawsOfLife
+  - TrayGoggles # DeltaV
   #- Fulton # DeltaV - moved to MiningDeltaV
   #- FultonBeacon # DeltaV - moved to MiningDeltaV
 

Resources/Prototypes/Research/industrial.yml

@@ -182,6 +182,7 @@
     - PowerDrill
     - JawsOfLife
     - BorgModuleAdvancedTool
+    - TrayGoggles # DeltaV
     #- Fulton # DeltaV - seperate tech Aerial Extraction
     #- FultonBeacon # DeltaV - seperate tech Aerial Extraction
 

Resources/Prototypes/_DV/Actions/clothing.yml

@@ -6,3 +6,12 @@
   components:
   - type: InstantAction
     event: !type:ToggleActionEvent
+
+- type: entity
+  parent: BaseAction
+  id: ActionToggleTray
+  name: Toggle T-ray
+  description: Toggles T-ray hud on and off.
+  components:
+  - type: InstantAction
+    event: !type:ToggleTrayScannerEvent

Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml

@@ -102,3 +102,36 @@
   description: Do the impossible, see the invisible!
   components:
   - type: EyeProtection
+
+- type: entity
+  parent: [ClothingEyesGlassesMeson, BaseToggleClothing]
+  id: ClothingEyesGlassesMesonTray
+  name: advanced engineering goggles
+  description: Protective meson goggles that have an integrated T-ray scanner and diagnostic HUD. The multilayer laminate protects from any intense flash.
+  components:
+  - type: ToggleClothing
+    action: ActionToggleTray
+  - type: TrayScanner
+    enabled: false
+  - type: FlashImmunity
+  - type: ShowHealthBars
+    damageContainers:
+    - Inorganic
+    - Silicon
+    - HumanoidSilicon # DeltaV - IPCs
+  - type: Sprite
+    sprite: _DV/Clothing/Eyes/Glasses/traymeson.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Eyes/Glasses/traymeson.rsi
+
+# Wrestling gear--Domino mask, which we're treating like glasses that don't actually cover your eyes
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesWrestlerMaskDomino
+  name: Domino Mask
+  description: No CGI here.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Eyes/Glasses/WrestlerMaskDomino.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Eyes/Glasses/WrestlerMaskDomino.rsi

Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml

@@ -432,3 +432,48 @@
       head:
       - state: equipped-HELMET
         offset: "0, 0.12"
+
+
+# Wrestling masks
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatWrestlingMaskLuchaRed
+  name: Red Lucha Libre Mask
+  description: The luchador never removes his mask.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Head/Hats/WrestlerMaskLuchaRed.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Head/Hats/WrestlerMaskLuchaRed.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatWrestlingMaskLuchaBlue
+  name: Blue Lucha Libre Mask
+  description: Don't touch the mask.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Head/Hats/WrestlerMaskLuchaBlue.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Head/Hats/WrestlerMaskLuchaBlue.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretViro
+  name: virology beret
+  description: A white beret with a green stripe that reminds you to wash your hands.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Head/Hats/beret_viro.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Head/Hats/beret_viro.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable

Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml

@@ -342,7 +342,9 @@
   - type: Armor
     modifiers:
       coefficients:
-        Caustic: 0.75
+        Slash: 0.95
+        Heat: 0.95
+        Caustic: 0.65
 
 - type: entity
   parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabLongCMO]

Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -690,3 +690,49 @@
     sprite: _DV/Clothing/Uniforms/Jumpsuit/chemistry_senior.rsi
   - type: Clothing
     sprite: _DV/Clothing/Uniforms/Jumpsuit/chemistry_senior.rsi
+
+# Wrestling gear--collegiate, prowrestling, lucha libre
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitWrestlerCostumeGreen
+  name: Plain Wrestler Leotard
+  description: When you wanta show off your muscles, but don't wanta show off too much skin.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeGreen.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeGreen.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitWrestlerCostumeRed
+  name: Bold Wrestler Trunks
+  description: OOHHH YEAH, SNAP INTO A SUS JERKY, BROTHER!
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeRed.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeRed.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitWrestlerCostumeYellow
+  name: Striped Wrestler Leotard
+  description: Punching tiger, hidden dragon.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeYellow.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeYellow.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitWrestlerCostumeBlue
+  name: Glamorous Wrestler Leotard
+  description: Power, Technique, and Beauty! Master the basics!
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeBlue.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeBlue.rsi

Resources/Prototypes/_DV/Entities/Markers/Spawners/mobs.yml

@@ -78,3 +78,17 @@
   - type: ConditionalSpawner
     prototypes:
       - MobCobraSilvia
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobEngiPossumPoppy
+  name: Poppy Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: poppy
+      sprite: Mobs/Animals/possum.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobPossumPoppy

Resources/Prototypes/_DV/Entities/Objects/Devices/flatpack.yml

@@ -72,3 +72,41 @@
   components:
   - type: Flatpack
     entity: OperatingTable
+
+- type: entity
+  abstract: true
+  parent: BaseStructureDynamic
+  id: HeavyFlatpackBase
+  name: heavy flatpack
+  description: A large flatpack used to store a worryingly large machine.
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/flatpack.rsi
+    layers:
+    - state: large
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.29"
+        density: 100
+        mask:
+        - CrateMask
+        layer:
+        - MachineLayer
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 75
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+  - type: InteractionOutline

Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml

@@ -309,3 +309,40 @@
     requiresSpecialDigestion: true
     useSound:
       collection: KitsuneSqueal
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieAvali
+  name: avali plushie
+  description: A stuffed toy that resembles an avali. The arms are lined with soft feathers.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Fun/Toys/avaliplush.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: _DV/Objects/Fun/Toys/avaliplush.rsi
+  - type: Clothing
+    quickEquip: false
+    sprite: _DV/Objects/Fun/Toys/avaliplush.rsi
+    slots:
+    - HEAD
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/_RMC14/Voice/Avali/avali_1.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/_RMC14/Voice/Avali/avali_scream.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/_RMC14/Voice/Avali/avali_1_exclaim.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/_RMC14/Voice/Avali/avali_2.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/_RMC14/Voice/Avali/avali_1_exclaim.ogg
+  - type: Edible
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/_RMC14/Voice/Avali/avali_2_ask.ogg

Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml

@@ -714,6 +714,8 @@
       orGroup: Plushie
     - id: PlushieThaven
       orGroup: Plushie
+    - id: PlushieAvali
+      orGroup: Plushie
 
 # Random snacks, replaces MailChocolate (lousy animal organs)
 - type: entity

Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml

@@ -24,6 +24,7 @@
   components:
   - type: Sprite
     sprite: Structures/Machines/techfab.rsi
+    snapCardinals: true
   - type: Lathe
     idleState: icon
     runningState: icon

Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/boxer.yml

@@ -0,0 +1,37 @@
+# Wrestling costumes
+- type: loadout
+  id: WrestlerCostumeGreen
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitWrestlerCostumeGreen
+
+- type: loadout
+  id: WrestlerCostumeRed
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitWrestlerCostumeRed
+
+- type: loadout
+  id: WrestlerCostumeYellow
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitWrestlerCostumeYellow
+
+- type: loadout
+  id: WrestlerCostumeBlue
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitWrestlerCostumeBlue
+
+# Eye-mask (aka Domino Mask)
+- type: loadout
+  id: BoxerDominoMask
+  equipment:
+    eyes: ClothingEyesWrestlerMaskDomino
+
+# Lucha Libre Masks (which are technically hats but sssshhhhuuushshsuushsush nobody asked you)
+- type: loadout
+  id: WrestlingMaskLuchaRed
+  equipment:
+    head: ClothingHeadHatWrestlingMaskLuchaRed
+
+- type: loadout
+  id: WrestlingMaskLuchaBlue
+  equipment:
+    head: ClothingHeadHatWrestlingMaskLuchaBlue

Resources/Prototypes/_DV/Loadouts/loadout_groups.yml

@@ -1033,6 +1033,10 @@
   loadouts:
   - BoxerShorts
   - BoxerShortsWithTop
+  - WrestlerCostumeGreen
+  - WrestlerCostumeRed
+  - WrestlerCostumeBlue
+  - WrestlerCostumeYellow
 
 - type: loadoutGroup
   id: BoxerGloves
@@ -1043,6 +1047,15 @@
   - GreenBoxingGloves
   - YellowBoxingGloves
 
+- type: loadoutGroup
+  id: BoxerMask
+  name: loadout-group-boxer-mask
+  minLimit: 0
+  loadouts:
+  - BoxerDominoMask
+  - WrestlingMaskLuchaRed
+  - WrestlingMaskLuchaBlue
+
 - type: loadoutGroup
   id: BoxerJobTrinkets
   name: loadout-group-jobtrinkets

Resources/Prototypes/_DV/Loadouts/role_loadouts.yml

@@ -145,6 +145,7 @@
   - GroupTankHarness
   - BoxerJumpsuit
   - BoxerGloves
+  - BoxerMask
   - CommonBackpack
   - Glasses
   - Survival

Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml

@@ -42,9 +42,28 @@
   recipes:
   # CMO
   - ClothingLongcoatCMO
+  - ClothingUniformCMOFormal
+  - ClothingUniformJumpskirtCMOFormal
+  - ClothingUniformCMOVest
+  - ClothingUniformJumpskirtCMOVest
+  - ClothingUniformCMOSummer
   # Chemist
   - ClothingUniformJumpsuitChemShirt
   - ClothingUniformJumpskirtChemShirt
+  # Paramed
+  - ClothingUniformParamedicJumper
+  - ClothingUniformJumpskirtParamedicJumper
+  # General
+  - ClothingUniformMedicalApron
+  - ClothingUniformJumpskirtMedicalApron
+  - ClothingUniformMedicalOffset
+  - ClothingUniformJumpskirtMedicalOffset
+  - ClothingUniformMedicalVest
+  - ClothingUniformJumpskirtMedicalVest
+  # Hats
+  - ClothingHeadHatBeretMedical
+  - ClothingHeadHatBeretSeniorChemistry
+  - ClothingHeadHatBeretParamedic
 
 - type: latheRecipePack
   id: ClothingJustice
@@ -99,6 +118,7 @@
   - ClothingUniformJumpskirtAtmos
   - ClothingUniformJumpsuitAtmosCasual
   - ClothingUniformJumpskirtAtmosCasual
+  - ClothingHeadHatBeretAtmospherics
 
 - type: latheRecipePack
   id: ClothingServiceDeltaV
@@ -150,4 +170,5 @@
   - ClothingUniformCybersunCasual
   - ClothingUniformCybersunRND
   - ClothingOuterCybersunOvercoat
+  - ClothingOuterCoatLabCybersun
   - ClothingBeltSyndicateUtility

Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml

@@ -197,12 +197,12 @@
 # Secretary
 
 - type: latheRecipe
-  parent: BaseCommandJumpsuitRecipe
+  parent: BaseJumpsuitRecipe
   id: ClothingUniformJumpsuitSecretary
   result: ClothingUniformJumpsuitSecretary
 
 - type: latheRecipe
-  parent: BaseCommandJumpsuitRecipe
+  parent: BaseJumpsuitRecipe
   id: ClothingUniformJumpskirtSecretary
   result: ClothingUniformJumpskirtSecretary
 
@@ -238,7 +238,7 @@
 #Centcomm Clothing
 
 - type: latheRecipe
-  parent: BaseHatRecipe
+  parent: BaseCommandHatRecipe
   id: ClothingHeadHatBeretCentcomm
   result: ClothingHeadHatBeretCentcomm
 
@@ -310,6 +310,11 @@
   id: ClothingOuterCybersunOvercoat
   result: ClothingOuterCybersunOvercoat
 
+- type: latheRecipe
+  parent: BaseCoatRecipe
+  id: ClothingOuterCoatLabCybersun
+  result: ClothingOuterCoatLabCybersun
+
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatSurgcapCybersun
@@ -337,6 +342,16 @@
   id: ClothingUniformJumpskirtHoPFormal
   result: ClothingUniformJumpskirtHoPFormal
 
+- type: latheRecipe
+  parent: BaseCommandJumpsuitRecipe
+  id: ClothingUniformCMOFormal
+  result: ClothingUniformCMOFormal
+
+- type: latheRecipe
+  parent: BaseCommandJumpsuitRecipe
+  id: ClothingUniformJumpskirtCMOFormal
+  result: ClothingUniformJumpskirtCMOFormal
+
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
   id: ClothingUniformJumpskirtChemShirt
@@ -398,6 +413,11 @@
   id: ClothingUniformJumpskirtAtmosCasual
   result: ClothingUniformJumpskirtAtmosCasual
 
+- type: latheRecipe
+  parent: BaseHatRecipe
+  id: ClothingHeadHatBeretAtmospherics
+  result: ClothingHeadHatBeretAtmospherics
+
 # Botanist
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
@@ -420,6 +440,79 @@
   id: ClothingUniformSeniorBartenderSkirt
   result: ClothingUniformSeniorBartenderSkirt
 
+# CMO
+- type: latheRecipe
+  parent: BaseCommandJumpsuitRecipe
+  id: ClothingUniformCMOVest
+  result: ClothingUniformCMOVest
+
+- type: latheRecipe
+  parent: BaseCommandJumpsuitRecipe
+  id: ClothingUniformJumpskirtCMOVest
+  result: ClothingUniformJumpskirtCMOVest
+
+- type: latheRecipe
+  parent: BaseCommandJumpsuitRecipe
+  id: ClothingUniformCMOSummer
+  result: ClothingUniformCMOSummer
+
+# Paramedic
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformParamedicJumper
+  result: ClothingUniformParamedicJumper
+
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformJumpskirtParamedicJumper
+  result: ClothingUniformJumpskirtParamedicJumper
+
+- type: latheRecipe
+  parent: BaseHatRecipe
+  id: ClothingHeadHatBeretParamedic
+  result: ClothingHeadHatBeretParamedic
+
+# Medical
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformMedicalApron
+  result: ClothingUniformMedicalApron
+
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformJumpskirtMedicalApron
+  result: ClothingUniformJumpskirtMedicalApron
+
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformMedicalOffset
+  result: ClothingUniformMedicalOffset
+
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformJumpskirtMedicalOffset
+  result: ClothingUniformJumpskirtMedicalOffset
+
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformMedicalVest
+  result: ClothingUniformMedicalVest
+
+- type: latheRecipe
+  parent: BaseJumpsuitRecipe
+  id: ClothingUniformJumpskirtMedicalVest
+  result: ClothingUniformJumpskirtMedicalVest
+
+- type: latheRecipe
+  parent: BaseHatRecipe
+  id: ClothingHeadHatBeretMedical
+  result: ClothingHeadHatBeretMedical
+
+- type: latheRecipe
+  parent: BaseHatRecipe
+  id: ClothingHeadHatBeretSeniorChemistry
+  result: ClothingHeadHatBeretSeniorChemistry
+
 # General
 
 - type: latheRecipe

Resources/Prototypes/_DV/Recipes/Lathes/tools.yml

@@ -36,3 +36,14 @@
   materials:
     Plastic: 250
     Glass: 150
+
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: TrayGoggles
+  result: ClothingEyesGlassesMesonTray
+  completetime: 4
+  materials:
+    Steel: 500
+    Plastic: 200
+    Glass: 200
+    Plasma: 50

Resources/Prototypes/_FarHorizons/Entities/Objects/Devices/flatpack.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: CrateEngineering
+  parent: HeavyFlatpackBase # Delta-V was CrateEngineering
   id: NuclearReactorFlatpack
   name: nuclear reactor flatpack
   description: A flatpack used for constructing a nuclear reactor. Parts sold separately.
@@ -12,7 +12,7 @@
     entity: NuclearReactorEmpty
 
 - type: entity
-  parent: CrateEngineering
+  parent: HeavyFlatpackBase # Delta-V was CrateEngineering
   id: GasTurbineFlatpack
   name: gas turbine flatpack
   description: A flatpack used for constructing a gas turbine.

Resources/Textures/_DV/Clothing/Eyes/Glasses/WrestlerMaskDomino.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Sal_DragonsNOA for ss14. Icon edited from ken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Implementation by RoboBozu.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-monkey",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Eyes/Glasses/traymeson.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub). All versions modified from respective versions by rebe83",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-secdog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Head/Hats/WrestlerMaskLuchaBlue.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Sal_DragonsNOA for ss14. Icon edited from ken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Implementation by RoboBozu.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-monkey",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Head/Hats/WrestlerMaskLuchaRed.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Sal_DragonsNOA for ss14. Icon edited from ken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Implementation by RoboBozu.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-monkey",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Head/Hats/beret_viro.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by ErrorByte, Added by Sugarcane",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeBlue.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Original art by Sal_DragonsNOA for SS14. Implementation by RoboBozu.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-INNERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeGreen.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Original art by Sal_DragonsNOA for SS14. Implementation by RoboBozu.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-INNERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeRed.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Original art by Sal_DragonsNOA for SS14. Implementation by RoboBozu.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-INNERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/WrestlerCostumeYellow.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Original art by Sal_DragonsNOA for SS14. Implementation by RoboBozu.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-INNERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Fun/Toys/avaliplush.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by @Stxcking (github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}