initial commit - game folder + maps + dme

This commit is contained in:
deathride58
2018-01-03 22:52:38 -05:00
parent fb555e5680
commit d8facb3bce
230 changed files with 20742 additions and 14130 deletions
+10 -3
View File
@@ -138,7 +138,7 @@
return FALSE
forceMove(tongs)
tongs.sliver = src
tongs.icon_state = "supermatter_tongs_loaded"
tongs.update_icon()
to_chat(user, "<span class='notice'>You carefully pick up [src] with [tongs].</span>")
else if(istype(W, /obj/item/scalpel/supermatter) || istype(W, /obj/item/nuke_core_container/supermatter/)) // we don't want it to dust
return
@@ -217,6 +217,12 @@
QDEL_NULL(sliver)
return ..()
/obj/item/hemostat/supermatter/update_icon()
if(sliver)
icon_state = "supermatter_tongs_loaded"
else
icon_state = "supermatter_tongs"
/obj/item/hemostat/supermatter/afterattack(atom/O, mob/user, proximity)
if(!sliver)
return
@@ -224,12 +230,14 @@
Consume(O)
to_chat(usr, "<span class='notice'>\The [sliver] is dusted along with \the [O]!</span>")
QDEL_NULL(sliver)
update_icon()
/obj/item/hemostat/supermatter/throw_impact(atom/hit_atom) // no instakill supermatter javelins
if(sliver)
sliver.forceMove(loc)
to_chat(usr, "<span class='notice'>\The [sliver] falls out of \the [src] as you throw them.</span>")
sliver = null
update_icon()
..()
/obj/item/hemostat/supermatter/proc/Consume(atom/movable/AM, mob/user)
@@ -247,6 +255,5 @@
radiation_pulse(user, 500, 2)
playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
user.dust()
icon_state = "supermatter_tongs"
QDEL_NULL(sliver)
update_icon()