Updates to tgstation commit 78e471d
This commit is contained in:
@@ -414,7 +414,7 @@
|
||||
if(!prob(prb))
|
||||
return FALSE //you lucked out, no shock for you
|
||||
do_sparks(5, TRUE, src)
|
||||
var/tmp/check_range = TRUE
|
||||
var/check_range = TRUE
|
||||
if(electrocute_mob(user, get_area(src), src, 1, check_range))
|
||||
shockCooldown = world.time + 10
|
||||
return TRUE
|
||||
|
||||
@@ -479,6 +479,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
|
||||
continue
|
||||
if(another.validate_location(T))
|
||||
unset_holo(holo_owner)
|
||||
if(another.masters && another.masters[holo_owner])
|
||||
another.clear_holo(holo_owner)
|
||||
another.set_holo(holo_owner, h)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
else
|
||||
toggle_mode()
|
||||
|
||||
/obj/machinery/iv_drip/verb/eject_beaker(mob/user)
|
||||
/obj/machinery/iv_drip/verb/eject_beaker()
|
||||
set category = "Object"
|
||||
set name = "Remove IV Container"
|
||||
set src in view(1)
|
||||
|
||||
Reference in New Issue
Block a user