Commit f7f7d15c authored by BarneyGumball's avatar BarneyGumball Committed by clusterfack
Browse files

runtimes (#12502)

parent 32357c52
......@@ -347,7 +347,7 @@ obj/machinery/teleport/station/New()
/obj/machinery/teleport/station/attack_hand(var/mob/user)
if(engaged)
src.disengage()
src.disengage(user)
else
src.engage()
......@@ -367,7 +367,7 @@ obj/machinery/teleport/station/New()
src.engaged = 1
return
/obj/machinery/teleport/station/proc/disengage()
/obj/machinery/teleport/station/proc/disengage(mob/user)
var/atom/l = src.loc
var/obj/machinery/teleport/hub/hub = locate(/obj/machinery/teleport/hub, locate(l.x + 1, l.y, l.z))
if (hub)
......@@ -375,7 +375,8 @@ obj/machinery/teleport/station/New()
hub.update_icon()
for(var/mob/O in hearers(src, null))
O.show_message("<span class='notice'>Teleporter disengaged!</span>", 2)
src.add_fingerprint(usr)
if(user)
src.add_fingerprint(user)
src.engaged = 0
return
......
......@@ -100,11 +100,12 @@
set_move_event(wearer)
/obj/item/weapon/rcl/proc/set_move_event(mob/user)
if(active && user)
trigger(user)
targetMoveKey = user.on_moved.Add(src, "holder_moved")
return
user.on_moved.Remove(targetMoveKey)
if(user)
if(active)
trigger(user)
targetMoveKey = user.on_moved.Add(src, "holder_moved")
return
user.on_moved.Remove(targetMoveKey)
targetMoveKey = null
/obj/item/weapon/rcl/attack_self(mob/user as mob)
......
......@@ -102,11 +102,13 @@
/obj/item/clothing/accessory/holster/on_attached(obj/item/clothing/under/S)
..()
//We're making a new verb, see http://www.byond.com/forum/?post=238593
attached_to.verbs += new/obj/item/clothing/accessory/holster/verb/holster_verb(attached_to,holster_verb_name)
if(attached_to)
attached_to.verbs += new/obj/item/clothing/accessory/holster/verb/holster_verb(attached_to,holster_verb_name)
/obj/item/clothing/accessory/holster/on_removed(mob/user as mob)
//Yes, we're calling "new" when removing a verb. I blame verbs entirely for this shit. See: http://www.byond.com/forum/?post=80230
attached_to.verbs -= new/obj/item/clothing/accessory/holster/verb/holster_verb(attached_to,holster_verb_name)
if(attached_to)
attached_to.verbs -= new/obj/item/clothing/accessory/holster/verb/holster_verb(attached_to,holster_verb_name)
..()
//
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment