Merge pull request #3898 from Ikarrus/striptextfix

Stripping people now bolds the text for the target
This commit is contained in:
Alex
2014-06-13 09:14:01 +01:00
+8 -8
View File
@@ -425,7 +425,7 @@
if(HULK in usr.mutations)
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
C.visible_message("<span class='danger'>[C] manages to break [I]!</span>", \
"<span class='notice'>You successfully break [I].</span>")
qdel(I)
@@ -436,11 +436,11 @@
else
C.update_inv_legcuffed(0)
C.legcuffed = null
/mob/living/proc/cuff_resist(obj/item/I, mob/living/carbon/C)
var/breakouttime = 600
var/displaytime = 1
var/displaytime = 1
if(istype(I, /obj/item/weapon/handcuffs))
var/obj/item/weapon/handcuffs/HC = C.handcuffed
breakouttime = HC.breakouttime
@@ -456,15 +456,15 @@
if(do_after(C, 50))
if(!I || C.buckled)
return
cuff_break(I, C)
cuff_break(I, C)
else
C.visible_message("<span class='warning'>[usr] attempts to remove [I]!</span>", \
"<span class='notice'>You attempt to remove [I]. (This will take around [displaytime] minutes and you need to stand still.)</span>")
spawn(0)
if(do_after(C, breakouttime))
if(!I || C.buckled)
return
return
C.visible_message("<span class='danger'>[C] manages to remove [I]!</span>", \
"<span class='notice'>You successfully remove [I].</span>")
@@ -596,7 +596,7 @@
if(what.flags & NODROP)
src << "<span class='notice'>You can't remove \the [what.name], it appears to be stuck!</span>"
return
visible_message("<span class='danger'>[src] tries to remove [who]'s [what.name].</span>", \
who.visible_message("<span class='danger'>[src] tries to remove [who]'s [what.name].</span>", \
"<span class='userdanger'>[src] tries to remove [who]'s [what.name].</span>")
what.add_fingerprint(src)
if(do_mob(src, who, STRIP_DELAY))