Port Discordia gloves (#419)

Still need descriptions on the items to be done but the groundwork is there. Could also do with layers for stuff that should light up in the darkness but I wasn't entirely sure what should and shouldn't.
space-wizards · Nov 6, 2019 · 0b5759a · 0b5759a
1 parent 1e425f3
commit 0b5759a
Showing 325 changed files with 845 additions and 183 deletions.
diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs
@@ -75,7 +75,7 @@ void Spawn(string prototype)
 
             if (random.Prob(0.05f))
             {
-                Spawn("YellowGloves");
+                Spawn("GlovesYellow");
             }
 
             if (random.Prob(0.4f))

diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs
@@ -35,7 +35,7 @@ void Spawn(string prototype)
             Spawn("CableStack");
 
             // 5% chance for a pair of fancy insulated gloves, else just a third cable coil.
-            Spawn(random.Prob(0.05f) ? "YellowGloves" : "CableStack");
+            Spawn(random.Prob(0.05f) ? "GlovesYellow" : "CableStack");
         }
     }
 }
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
@@ -3175,7 +3175,7 @@ entities:
         entities: []
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
-- type: BlackGloves
+- type: GlovesBlack
   uid: 267
   components:
   - grid: 0
@@ -3687,7 +3687,7 @@ entities:
     - !type:PhysShapeAabb
       layer: 1
     type: Collidable
-- type: LeatherGloves
+- type: GlovesLeather
   uid: 311
   components:
   - grid: 0
@@ -3700,7 +3700,7 @@ entities:
       mask: 5
       bounds: -0.25,-0.25,0.25,0.25
     type: Collidable
-- type: LeatherGloves
+- type: GlovesLeather
   uid: 312
   components:
   - grid: 0
@@ -3713,7 +3713,7 @@ entities:
       mask: 5
       bounds: -0.25,-0.25,0.25,0.25
     type: Collidable
-- type: LeatherGloves
+- type: GlovesLeather
   uid: 313
   components:
   - grid: 0