cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: picking up and dropping earmuffs while having earmuffs already equipped no longer removes the deaf trait (#17862)

Browse Source 
* earmuff fix

* flagellant robes too
This commit is contained in:
SteelSlayer
2022-05-26 00:08:56 +01:00
committed by GitHub
parent c4b8dd8f30
commit 60140694b0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/cult_items.dm
+2 -2
View File
@@ -208,12 +208,12 @@
user.Confused(20 SECONDS)
user.Weaken(10 SECONDS)
else if(slot == slot_wear_suit)
ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes")
ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes[UID()]")
/obj/item/clothing/suit/hooded/cultrobes/flagellant_robe/dropped(mob/user)
. = ..()
if(user)
REMOVE_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes")
REMOVE_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes[UID()]")
/obj/item/clothing/head/hooded/flagellant_hood
name = "flagellant's robes"
code/modules/clothing/ears/ears.dm
+2 -2
View File
@@ -15,8 +15,8 @@
/obj/item/clothing/ears/earmuffs/equipped(mob/user, slot)
. = ..()
if(ishuman(user) && ((slot == slot_l_ear) || (slot == slot_r_ear)))
ADD_TRAIT(user, TRAIT_DEAF, CLOTHING_TRAIT)
ADD_TRAIT(user, TRAIT_DEAF, "[CLOTHING_TRAIT][UID()]")
/obj/item/clothing/ears/earmuffs/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_DEAF, CLOTHING_TRAIT)
REMOVE_TRAIT(user, TRAIT_DEAF, "[CLOTHING_TRAIT][UID()]")