diff --git a/Content.Server/White/ShockClothing/ShockClothingSystem.cs b/Content.Server/White/ShockClothing/ShockClothingSystem.cs index 46c6c8d2c0..6386dedf42 100644 --- a/Content.Server/White/ShockClothing/ShockClothingSystem.cs +++ b/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); } } diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_black-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_black-equipped.png new file mode 100644 index 0000000000..43c2cbc6ff Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_black-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_black.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_black.png new file mode 100644 index 0000000000..c9e2fcbd44 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_black.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_cyan-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_cyan-equipped.png new file mode 100644 index 0000000000..ebfcb425b3 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_cyan-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_cyan.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_cyan.png new file mode 100644 index 0000000000..ab3284fbcc Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_cyan.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_green-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_green-equipped.png new file mode 100644 index 0000000000..4fa1caf872 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_green-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_green.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_green.png new file mode 100644 index 0000000000..77fcdcb288 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_green.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_latex-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_latex-equipped.png new file mode 100644 index 0000000000..2d01099afa Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_latex-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_latex.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_latex.png new file mode 100644 index 0000000000..a6f480e195 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_latex.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_orange-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_orange-equipped.png new file mode 100644 index 0000000000..e48d5f135c Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_orange-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_orange.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_orange.png new file mode 100644 index 0000000000..fc89b25b0a Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_orange.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_purple-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_purple-equipped.png new file mode 100644 index 0000000000..c6d47732fe Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_purple-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_purple.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_purple.png new file mode 100644 index 0000000000..c59fd302d8 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_purple.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_red-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_red-equipped.png new file mode 100644 index 0000000000..0494fada07 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_red-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_red.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_red.png new file mode 100644 index 0000000000..546c363b60 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_red.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_spike-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_spike-equipped.png new file mode 100644 index 0000000000..3826c1157b Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_spike-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_spike.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_spike.png new file mode 100644 index 0000000000..dcc3b11dea Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_spike.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_tealblack-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_tealblack-equipped.png new file mode 100644 index 0000000000..2a7d1556ba Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_tealblack-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_tealblack.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_tealblack.png new file mode 100644 index 0000000000..5e739fe788 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_tealblack.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_white-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_white-equipped.png new file mode 100644 index 0000000000..bf00384e2f Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_white-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_white.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_white.png new file mode 100644 index 0000000000..55ee2a6f1e Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_white.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_yellow-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_yellow-equipped.png new file mode 100644 index 0000000000..ecb4f1a557 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_yellow-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_yellow.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_yellow.png new file mode 100644 index 0000000000..26a0457c7c Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/collar_yellow.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_black-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_black-equipped.png new file mode 100644 index 0000000000..3c7ac8023d Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_black-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_black.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_black.png new file mode 100644 index 0000000000..60ce72e708 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_black.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_cyan-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_cyan-equipped.png new file mode 100644 index 0000000000..49a0eafb80 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_cyan-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_cyan.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_cyan.png new file mode 100644 index 0000000000..9a9319081f Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_cyan.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_green-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_green-equipped.png new file mode 100644 index 0000000000..c62cf41c54 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_green-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_green.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_green.png new file mode 100644 index 0000000000..aa0b48a8fd Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_green.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_latex-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_latex-equipped.png new file mode 100644 index 0000000000..eefb413e70 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_latex-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_latex.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_latex.png new file mode 100644 index 0000000000..6d52eba71a Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_latex.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_orange-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_orange-equipped.png new file mode 100644 index 0000000000..d4ca3fb603 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_orange-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_orange.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_orange.png new file mode 100644 index 0000000000..4b9568eebf Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_orange.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_purple-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_purple-equipped.png new file mode 100644 index 0000000000..8b5eecfae6 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_purple-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_purple.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_purple.png new file mode 100644 index 0000000000..4e5ae48c27 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_purple.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_red-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_red-equipped.png new file mode 100644 index 0000000000..5cc43eb479 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_red-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_red.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_red.png new file mode 100644 index 0000000000..24e3edffa5 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_red.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_spike-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_spike-equipped.png new file mode 100644 index 0000000000..8153557659 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_spike-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_spike.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_spike.png new file mode 100644 index 0000000000..dcc3b11dea Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_spike.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_tealblack-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_tealblack-equipped.png new file mode 100644 index 0000000000..53848f2a0c Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_tealblack-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_tealblack.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_tealblack.png new file mode 100644 index 0000000000..1a816255bc Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_tealblack.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_white-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_white-equipped.png new file mode 100644 index 0000000000..8e8c366578 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_white-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_white.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_white.png new file mode 100644 index 0000000000..d47d05ff23 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_white.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_yellow-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_yellow-equipped.png new file mode 100644 index 0000000000..503bcd4552 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_yellow-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_yellow.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_yellow.png new file mode 100644 index 0000000000..8eb99c4fed Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/lock_collar_yellow.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/meta.json b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/meta.json new file mode 100644 index 0000000000..8255d0103d --- /dev/null +++ b/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 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/mindcollar-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/mindcollar-equipped.png new file mode 100644 index 0000000000..70c0d3d6e1 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/mindcollar-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/mindcollar.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/mindcollar.png new file mode 100644 index 0000000000..68767ecff5 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/mindcollar.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/shockcollar-equipped.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/shockcollar-equipped.png new file mode 100644 index 0000000000..3da656f288 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/shockcollar-equipped.png differ diff --git a/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/shockcollar.png b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/shockcollar.png new file mode 100644 index 0000000000..cfb8e35a6a Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/lewd_neck.rsi/shockcollar.png differ