From ee4729fed3a5a2a2d2a29a024c5b8818431ae185 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:47:23 +0200 Subject: [PATCH] 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 --- Resources/Prototypes/Entities/Clothing/Eyes/misc.yml | 4 ++-- Resources/Prototypes/Entities/Clothing/Masks/masks.yml | 4 ++-- .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 - Resources/Prototypes/Recipes/Lathes/security.yml | 8 -------- Resources/Prototypes/Research/arsenal.yml | 1 - 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml index 9599b11bb136..81de8a61bce7 100644 --- 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 94351cc12611..7d270b8ee7a6 100644 --- 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 6c97f9fd5f23..bf4d4de7833f 100644 --- 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 2e3d5c7fc640..a54d5b623563 100644 --- 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 01198d7d766a..553258fdb3f4 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -126,7 +126,6 @@ cost: 5000 recipeUnlocks: - ClothingBackpackElectropack - - ClothingOuterStraightjacket # Tier 2