This commit is contained in:
tralezab
2020-02-18 19:08:53 -08:00
parent 3d5700bf62
commit abdda91ea0
2 changed files with 7 additions and 2 deletions
+6 -1
View File
@@ -172,9 +172,12 @@
var/mutable_appearance/mob_underlay
var/preloaded = 0
var/RPpos = null
var/attached = TRUE //if the gun arg isn't included initially, then the chronofield will work without one
/obj/structure/chrono_field/Initialize(mapload, mob/living/target, obj/item/gun/energy/chrono_gun/G)
if(target && isliving(target) && G)
if(target && isliving(target))
if(!G)
attached = FALSE
target.forceMove(src)
captured = target
var/icon/mob_snapshot = getFlatIcon(target)
@@ -234,6 +237,8 @@
else
gun = null
return .()
else if(!attached)
tickstokill--
else
tickstokill++
else
+1 -1
View File
@@ -83,7 +83,7 @@
/obj/item/soap/omega/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is using [src] to clean themselves from the timeline! It looks like [user.p_theyre()] trying to commit suicide!</span>")
new /obj/structure/chrono_field(user.loc, user)
return
return MANUAL_SUICIDE
/obj/item/paper/fluff/stations/soap
name = "ancient janitorial poem"