Collars

(cherry picked from commit 045439676ee03c51d377d318624d46ff84ae07d8)

Content.Server/White/ShockClothing/ShockClothingSystem.cs

@@ -36,7 +36,7 @@ public sealed class ShockClothingSystem : EntitySystem
         if (!_containerSystem.TryGetContainingContainer(uid, out var container))
             return;
 
-        _electrocution.TryDoElectrocution(container.Owner, uid, 0, TimeSpan.FromSeconds(5), true,
+        _electrocution.TryDoElectrocution(container.Owner, uid, 1, TimeSpan.FromSeconds(5), true,
             ignoreInsulation: true);
     }
 }

Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/meta.json

@@ -0,0 +1,237 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "taken from Skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/ at 08668ffb5e567907783e86d839c144b1f746b252",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "collar_cyan"
+    },
+    {
+      "name": "collar_yellow"
+    },
+    {
+      "name": "collar_green"
+    },
+    {
+      "name": "collar_red"
+    },
+    {
+      "name": "collar_latex"
+    },
+    {
+      "name": "collar_orange"
+    },
+    {
+      "name": "collar_white"
+    },
+    {
+      "name": "collar_purple"
+    },
+    {
+      "name": "collar_black"
+    },
+    {
+      "name": "collar_tealblack"
+    },
+    {
+      "name": "lock_collar_white"
+    },
+    {
+      "name": "lock_collar_cyan"
+    },
+    {
+      "name": "lock_collar_yellow"
+    },
+    {
+      "name": "lock_collar_green"
+    },
+    {
+      "name": "lock_collar_red"
+    },
+    {
+      "name": "lock_collar_latex"
+    },
+    {
+      "name": "lock_collar_orange"
+    },
+    {
+      "name": "lock_collar_purple"
+    },
+    {
+      "name": "lock_collar_black"
+    },
+    {
+      "name": "lock_collar_tealblack"
+    },
+    {
+      "name": "shockcollar"
+    },
+    {
+      "name": "collar_spike"
+    },
+    {
+      "name": "lock_collar_spike"
+    },
+    {
+      "name": "mindcollar",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "collar_cyan-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_yellow-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_green-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_red-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_latex-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_orange-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_white-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_purple-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_black-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_tealblack-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_white-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_cyan-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_yellow-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_green-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_red-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_latex-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_orange-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_purple-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_black-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_tealblack-equipped",
+      "directions": 4
+    },
+    {
+      "name": "shockcollar-equipped",
+      "directions": 4
+    },
+    {
+      "name": "collar_spike-equipped",
+      "directions": 4
+    },
+    {
+      "name": "lock_collar_spike-equipped",
+      "directions": 4
+    },
+    {
+      "name": "mindcollar-equipped",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}