Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget

On screen alert system
This commit is contained in:
Cheridan
2015-03-04 19:39:04 -06:00
28 changed files with 305 additions and 354 deletions
+2
View File
@@ -42,6 +42,7 @@
buckled_mob = M
M.update_canmove()
post_buckle_mob(M)
M.throw_alert("buckled", new_master = src)
return 1
/obj/proc/unbuckle_mob()
@@ -50,6 +51,7 @@
buckled_mob.buckled = null
buckled_mob.anchored = initial(buckled_mob.anchored)
buckled_mob.update_canmove()
buckled_mob.clear_alert("buckled")
buckled_mob = null
post_buckle_mob(.)
@@ -44,6 +44,7 @@
/obj/item/weapon/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user)
if(!target.handcuffed)
user.drop_item()
//target.throw_alert("handcuffed", src) // Can't do this because escaping cuffs isn't standardized. Also zipties.
if(trashtype)
target.handcuffed = new trashtype(target)
qdel(src)
@@ -16,8 +16,7 @@
if(ishuman(L) || ismonkey(L) || iscorgi(L))
if(L.buckled)
L.buckled = 0
L.anchored = 0
L.buckled.unbuckle_mob()
if(L.client)
L.client.perspective = EYE_PERSPECTIVE
L.client.eye = src