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
+2 -2
View File
@@ -52,7 +52,7 @@
O.loc = loc
usr << "\The [src] crumbles to pieces."
spawn(5)
del src
qdel(src)
return
if(!stored_computer.manipulating)
@@ -65,7 +65,7 @@
spawn(5)
stored_computer.manipulating = 0
del src
qdel(src)
else
usr << "\red You are already opening the computer!"
+1 -1
View File
@@ -111,7 +111,7 @@ Programs are a file that can be executed
update_icon()
if(popup)
popup.close()
del popup
qdel(popup)
return
/*
+1 -1
View File
@@ -115,7 +115,7 @@ log transactions
user << "<span class='info'>You insert [I] into [src].</span>"
src.attack_hand(user)
del I
qdel(I)
else
..()
+1 -1
View File
@@ -332,7 +332,7 @@
myloc.overlays += flicker
spawn(8)
myloc.overlays -= flicker
del flicker
qdel(flicker)
//flick("flameburst",src)
if("plasma_gas")
//spawn a bunch of plasma
+1 -1
View File
@@ -53,7 +53,7 @@
New()
..()
for(var/obj/structure/bush/B in src)
del B
qdel(B)
/turf/unsimulated/jungle/proc/Spread(var/probability, var/prob_loss = 50)
if(probability <= 0)
@@ -885,7 +885,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
G.loc = src.loc
G.key = ghost.key
G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
del (src)
qdel(src)
proc/announce_to_ghosts()
@@ -668,5 +668,5 @@
s.set_up(3, 1, src)
s.start()
respawnable_list += src
del src
qdel(src)
return
@@ -69,7 +69,7 @@
..()
/mob/living/simple_animal/hostile/retaliate/ghost/Die()
new /obj/item/weapon/reagent_containers/food/snacks/ectoplasm(loc)
del src
qdel(src)
return
/mob/living/simple_animal/hostile/retaliate/skeleton
@@ -107,7 +107,7 @@
/mob/living/simple_animal/hostile/retaliate/skeleton/Die()
new /obj/effect/decal/remains/human(loc)
del src
qdel(src)
return
/mob/living/simple_animal/hostile/retaliate/zombie
@@ -145,5 +145,5 @@
/mob/living/simple_animal/hostile/retaliate/zombie/Die()
new /obj/effect/decal/cleanable/blood/gibs(loc)
del src
qdel(src)
return
@@ -57,5 +57,5 @@
new corpse (src.loc)
if(weapon1)
new weapon1 (src.loc)
del src
qdel(src)
return
@@ -42,7 +42,7 @@
new weapon1 (src.loc)
if(weapon2)
new weapon2 (src.loc)
del src
qdel(src)
return
///////////////Sword and shield////////////
@@ -165,5 +165,5 @@
/mob/living/simple_animal/hostile/viscerator/Die()
..()
visible_message("\red <b>[src]</b> is smashed into pieces!")
del src
qdel(src)
return
@@ -36,7 +36,7 @@
if((M.client && !( M.blinded )))
M.show_message("\red [src] lets out a contented sigh as their form unwinds. ")
ghostize()
del src
qdel(src)
return
+2 -2
View File
@@ -223,8 +223,8 @@ mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I)
if(T && ismob(T) && !I.target)
T.client.remove_gun_icons()
if(!targeted_by.len)
del target_locked //Remove the overlay
del targeted_by
qdel(target_locked) //Remove the overlay
qdel(targeted_by)
spawn(1) update_targeted()
mob/living/Move()
+4 -2
View File
@@ -249,7 +249,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(method == TOUCH)
if(H.wear_mask)
if(!H.wear_mask.unacidable)
qdel (H.wear_mask)
qdel(H.wear_mask)
H.update_inv_wear_mask()
H << "\red Your mask melts away but protects you from the acid!"
else
@@ -574,7 +574,9 @@ datum/reagent/atrazine/reaction_turf(var/turf/T, var/volume)
var/turf/simulated/wall/W = T
if(W.rotting)
W.rotting = 0
for(var/obj/effect/E in W) if(E.name == "Wallrot") del E
for(var/obj/effect/E in W)
if(E.name == "Wallrot")
qdel(E)
for(var/mob/O in viewers(W, null))
O.show_message(text("\blue The fungi are completely dissolved by the solution!"), 1)
+2 -2
View File
@@ -259,14 +259,14 @@
for(var/turf/O in covered_turfs)
var/obj/effect/energy_field/E = new(O)
field.Add(E)
del covered_turfs
qdel(covered_turfs)
for(var/mob/M in view(5,src))
M << "\icon[src] You hear heavy droning start up."
else
for(var/obj/effect/energy_field/D in field)
field.Remove(D)
del D
qdel(D)
for(var/mob/M in view(5,src))
M << "\icon[src] You hear heavy droning fade out."
+1 -1
View File
@@ -71,7 +71,7 @@
new/mob/living/carbon/alien/larva(mob.loc)
var/datum/disease2/disease/D = mob:virus2
mob:gib()
del D
qdel(D)
/datum/disease2/effect/invisible
+2 -2
View File
@@ -64,7 +64,7 @@
if(airborne_can_reach(get_turf(src), get_turf(target)))
if(get_infection_chance(target))
infect_virus2(target,src.virus2)
del src
qdel(src)
/obj/item/weapon/virusdish/examine()
usr << "This is a virus containment dish."
@@ -84,7 +84,7 @@
if(prob(50))
user << "\The [src] shatters!"
del src
qdel(src)
///////////////GNA DISK///////////////