Revert erroneous attack_paw proc muzzle removal.

SPLURT-Station · Oct 24, 2023 · d74d265 · d74d265
1 parent be7b23e
commit d74d265
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
@@ -11,7 +11,7 @@
 	mutantrace_variation = STYLE_MUZZLE
 	var/seamless = FALSE
 
-/obj/item/clothing/mask/muzzle/attack_hand(mob/user, act_intent, attackchain_flags)
+/obj/item/clothing/mask/muzzle/attack_paw(mob/user, act_intent, attackchain_flags)
     if(iscarbon(user))
         var/mob/living/carbon/C = user
         if(src == C.wear_mask)

diff --git a/modular_splurt/code/modules/clothing/masks/miscellaneous.dm b/modular_splurt/code/modules/clothing/masks/miscellaneous.dm
@@ -1,3 +1,16 @@
+//Main code edits
+/obj/item/clothing/mask/muzzle/attack_hand(mob/user, act_intent, attackchain_flags)
+    if(iscarbon(user))
+        var/mob/living/carbon/C = user
+        if(src == C.wear_mask)
+            if(seamless)
+                to_chat(user, span_warning("You need help taking this off!"))
+                return
+            else
+                if(!do_after(C, 60, target = src))
+                    return
+    ..()
+
 //Own stuff
 
 /* I'm sorry nuke but cit added their own