Revert "Tweaking things that restrict freedom (#31095) (#31197)

* Revert "Tweaking things that restrict freedom (#31095)"

This reverts commit 171884df8f8ef76027f1de76e46d488326fd0110.

* keep the unequip time

* keep alphabetical order

diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
index 9599b11bb1361e379bb468679c967d9d4c279c4b..81de8a61bce76a634c26dd853cad40ac32932238 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
@@ -8,8 +8,8 @@
     sprite: Clothing/Eyes/Misc/blindfold.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Misc/blindfold.rsi
-    equipDelay: 5
-    unequipDelay: 5
+    equipDelay: 3
+    unequipDelay: 3
   - type: Blindfold
   - type: Construction
     graph: Blindfold

diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 94351cc12611932ae191f2a411239b3ed0a38e95..7d270b8ee7a6c010bff21a36673e9f2f51dfdbfb 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -315,8 +315,8 @@
     sprite: Clothing/Mask/muzzle.rsi
   - type: Clothing
     sprite: Clothing/Mask/muzzle.rsi
-    equipDelay: 5
-    unequipDelay: 5
+    equipDelay: 3
+    unequipDelay: 3
   - type: IngestionBlocker
   - type: AddAccentClothing
     accent: ReplacementAccent

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 6c97f9fd5f23a4f59a6db104f49b967de1e00f6f..bf4d4de7833f04a8de3f830cdae70a6d34b1aec7 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -763,7 +763,6 @@
       - BoxShotgunUranium
       - BoxShellTranquilizer
       - ClothingBackpackElectropack
-      - ClothingOuterStraightjacket
       - ExplosivePayload
       - FlashPayload
       - GrenadeBlast

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 2e3d5c7fc64042449ae4538622ba1f27331b1203..a54d5b62356344f895faad8d5a03ab8973ca1b79 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -710,11 +710,3 @@
      Plastic: 1000
      Plasma: 500
      Glass: 500
-
-- type: latheRecipe
-  id: ClothingOuterStraightjacket
-  result: ClothingOuterStraightjacket
-  completetime: 4
-  materials:
-    Steel: 200
-    Cloth: 500

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 01198d7d766ad2a6f1ed38edd31f6996ff2b1b2b..553258fdb3f45fab4a19ab909c787caa69655d17 100644 (file)
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -126,7 +126,6 @@
   cost: 5000
   recipeUnlocks:
   - ClothingBackpackElectropack
-  - ClothingOuterStraightjacket
 
 # Tier 2