This commit is contained in:
Fox-McCloud
2015-07-09 19:51:40 -04:00
parent 0dbea7621f
commit 54f59b9899
43 changed files with 90 additions and 86 deletions
@@ -14,7 +14,7 @@ obj/effect/decal/cleanable/liquid_fuel
if(other != src)
other.amount += src.amount
spawn other.Spread()
del src
qdel(src)
Spread()
. = ..()
@@ -53,7 +53,7 @@
/obj/effect/decal/warning_stripes/New()
. = ..()
loc.overlays += src
del src
qdel(src)
// Credit to Neinhaus for making these into individual decals.
+1 -1
View File
@@ -68,7 +68,7 @@
else
D.organ_names += ", [O.name]"
del D.organs_scanned[O.name]
qdel(D.organs_scanned[O.name])
D.organs_scanned[O.name] = W.copy()
for(var/V in O.trace_chemicals)
+6 -6
View File
@@ -9,7 +9,7 @@
var/T = pick(types)
new T(loc)
spawn(1)
del src
qdel(src)
// -------------------------------------
// Random cleanables, clearly this makes sense
@@ -23,7 +23,7 @@
var/T = pick(list)
new T(loc)
spawn(0)
del src
qdel(src)
/obj/item/stack/sheet/animalhide/random
@@ -34,7 +34,7 @@
var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey)
var/obj/item/stack/S = new htype(loc)
S.amount = amount
del src
qdel(src)
// -------------------------------------
// Not yet identified chemical.
@@ -115,7 +115,7 @@
pixel_x = rand(-5,5)
pixel_y = rand(-5,5)
spawn(0)
del src
qdel(src)
/obj/item/weapon/storage/pill_bottle/random_meds
name = "unlabelled pillbottle"
@@ -311,9 +311,9 @@
Cat2.desc = "It's was alive the whole time!"
sleep(2)
if(prob(50))
del Cat1
qdel(Cat1)
else
del Cat2
qdel(Cat2)
..()
// --------------------------------------
+1 -1
View File
@@ -458,4 +458,4 @@
A:prime()
if(istype(A,/obj/singularity)) // I can't emphasize enough how much you should never use this grenade
A:energy = 200
del src
qdel(src)
@@ -266,7 +266,7 @@
update_mob()
invisibility = INVISIBILITY_MAXIMUM //kaboom
del nadeassembly // do this now to stop infrared beams
qdel(nadeassembly) // do this now to stop infrared beams
var/end_temp = 0
for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
G.reagents.trans_to(src, G.reagents.total_volume)
@@ -552,7 +552,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
imp_in.put_in_hands(scanned)
else
scanned.loc = t
del src
qdel(src)
implanted(mob/source as mob)
src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
+1 -1
View File
@@ -11,7 +11,7 @@
..()
if (!prob(spawn_nothing_percentage))
spawn_item()
del src
qdel(src)
// this function should return a specific item to spawn
@@ -174,7 +174,7 @@ obj/structure/door_assembly
if(!src || !WT.isOn()) return
user << "\blue You dissasembled the airlock assembly!"
new /obj/item/stack/sheet/metal(src.loc, 4)
del (src)
qdel(src)
else
user << "\blue You need more welding fuel."
return
@@ -58,7 +58,7 @@
origin.loc = get_turf(src)
user.unEquip(src)
user.visible_message("\blue [user] puts [src] down.", "\blue You put [src] down.")
del src
qdel(src)
/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
if (prob(5) && istype(M,/mob/living))
@@ -66,7 +66,7 @@
user.unEquip(src)
var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
m.loc = get_turf(src)
del src
qdel(src)
var/mob/living/T = M
T.Weaken(5)
return