Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life().

This commit is contained in:
phil235
2015-05-23 22:34:04 +02:00
parent ff3ea26a3f
commit f643769ef4
7 changed files with 19 additions and 13 deletions

View File

@@ -23,6 +23,8 @@
var/trashtype = null //for disposable cuffs
/obj/item/weapon/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/carbon/human/user)
if(!istype(C))
return
if(user.disabilities & CLUMSY && prob(50))
user << "<span class='warning'>Uh... how do those things work?!</span>"
apply_cuffs(user,user)

View File

@@ -128,9 +128,10 @@
"<span class='warning'>[user] has prodded you with [src]. Luckily it was off</span>")
return
else
..()
if(status)
baton_stun(L, user)
..()
/obj/item/weapon/melee/baton/proc/baton_stun(mob/living/L, mob/user)