shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4513 from Citadel-Station-13/upstream-merge-33728

Browse Source 
[MIRROR] Fixes biodegrading handcuffs
This commit is contained in:
LetterJay
2017-12-24 16:54:15 -06:00
committed by GitHub
parent b6f4a63ec8 e23448d913
commit 2001ba6a8e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/changeling/powers/biodegrade.dm
+2
View File
@@ -55,12 +55,14 @@
/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O) /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O)
if(O && user.handcuffed == O) if(O && user.handcuffed == O)
user.visible_message("<span class='warning'>[O] dissolve[O.gender==PLURAL?"":"s"] into a puddle of sizzling goop.</span>") user.visible_message("<span class='warning'>[O] dissolve[O.gender==PLURAL?"":"s"] into a puddle of sizzling goop.</span>")
user.uncuff()
new /obj/effect/decal/cleanable/greenglow(O.drop_location()) new /obj/effect/decal/cleanable/greenglow(O.drop_location())
qdel(O) qdel(O)
/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S) /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S)
if(S && user.wear_suit == S) if(S && user.wear_suit == S)
user.visible_message("<span class='warning'>[S] dissolves into a puddle of sizzling goop.</span>") user.visible_message("<span class='warning'>[S] dissolves into a puddle of sizzling goop.</span>")
user.uncuff()
new /obj/effect/decal/cleanable/greenglow(S.drop_location()) new /obj/effect/decal/cleanable/greenglow(S.drop_location())
qdel(S) qdel(S)