The Great Del() Cull of 2015

This commit is contained in:
Fox-McCloud
2015-07-09 02:48:34 -04:00
parent 656b2c449a
commit 0dbea7621f
342 changed files with 915 additions and 916 deletions
+1 -1
View File
@@ -15,7 +15,7 @@
M.client.show_popup_menus = 1
for(var/obj/effect/bmode/buildholder/H)
if(H.cl == M.client)
del(H)
qdel(H)
else
message_admins("[key_name(usr)] has entered build mode.")
log_admin("[key_name(usr)] has entered build mode.")
+8 -8
View File
@@ -1574,7 +1574,7 @@
S.victim = M
S.loc = M.loc
spawn(20)
del(S)
qdel(S)
var/turf/simulated/floor/T = get_turf(M)
if(istype(T))
@@ -1706,7 +1706,7 @@
var/list/departmentoptions = alldepartments + "All Departments"
destination = input(usr, "To which department?", "Choose a department", "") as null|anything in departmentoptions
if(!destination)
del(P)
qdel(P)
return
for(var/obj/machinery/photocopier/faxmachine/F in allfaxes)
@@ -1716,7 +1716,7 @@
var/input = input(src.owner, "Please enter a message to send a fax via secure connection. Use <br> for line breaks. Both pencode and HTML work.", "Outgoing message from Centcomm", "") as message|null
if(!input)
del(P)
qdel(P)
return
input = P.parsepencode(input) // Encode everything from pencode to html
@@ -1753,7 +1753,7 @@
else if(stamptype == "none")
stamptype = ""
else
del(P)
qdel(P)
return
sendername = input(src.owner, "What organization does the fax come from? This determines the prefix of the paper (i.e. Central Command- Title). This is optional.", "Organization") as text|null
@@ -2031,21 +2031,21 @@
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SC")
for(var/obj/item/clothing/under/O in world)
del(O)
qdel(O)
ok = 1
if("sec_all_clothes")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SAC")
for(var/obj/item/clothing/O in world)
del(O)
qdel(O)
ok = 1
if("sec_classic1")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SC1")
for(var/obj/item/clothing/suit/fire/O in world)
del(O)
qdel(O)
for(var/obj/structure/grille/O in world)
del(O)
qdel(O)
/* for(var/obj/machinery/vehicle/pod/O in world)
for(var/mob/M in src)
M.loc = src.loc
+1 -1
View File
@@ -29,7 +29,7 @@
// if(!istates.Find(O.item_state))
// text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.item_state]\" IN \"[O.icon]\"\n"
//text+="\n"
del(O)
qdel(O)
if(text)
var/F = file("broken_hand_icons.txt")
fdel(F)
+4 -4
View File
@@ -400,7 +400,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(hsbitem)
for(var/atom/O in world)
if(istype(O, hsbitem))
del(O)
qdel(O)
log_admin("[key_name(src)] has deleted all instances of [hsbitem].")
message_admins("[key_name_admin(src)] has deleted all instances of [hsbitem].", 0)
feedback_add_details("admin_verb","DELA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -461,7 +461,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/mob/adminmob = src.mob
M.ckey = src.ckey
if( isobserver(adminmob) )
del(adminmob)
qdel(adminmob)
feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -615,7 +615,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
continue
if(istype(I, /obj/item/organ))
continue
del(I)
qdel(I)
switch(dresscode)
if ("strip")
//do nothing
@@ -1111,7 +1111,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(G.anchored)
var/obj/singularity/S = new /obj/singularity(get_turf(G), 50)
spawn(0)
del(G)
qdel(G)
S.energy = 1750
S.current_size = 7
S.icon = 'icons/effects/224x224.dmi'
+1 -1
View File
@@ -292,7 +292,7 @@ client/proc/one_click_antag()
if(synd_mind.current.client)
for(var/image/I in synd_mind.current.client.images)
if(I.icon_state == "synd")
del(I)
qdel(I)
for(var/datum/mind/synd_mind in ticker.mode.syndicates)
if(synd_mind.current)
+1 -1
View File
@@ -32,7 +32,7 @@
continue
if(istype(I, /obj/item/organ))
continue
del(I)
qdel(I)
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
+1 -1
View File
@@ -17,7 +17,7 @@
continue
if(istype (I, /obj/item/organ))
continue
del(I)
qdel(I)
H << "<B>You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.</B>"
+1 -1
View File
@@ -173,7 +173,7 @@
a_right:holder = null
a_right.loc = T
spawn(0)
del(src)
qdel(src)
return
+1 -1
View File
@@ -25,7 +25,7 @@
part2.master = null
part1 = null
part2 = null
del(src)
qdel(src)
return
if(istype(W, /obj/item/weapon/screwdriver))
status = !status
+2 -2
View File
@@ -6,7 +6,7 @@
if(M.client)
M << "<span class='info'>[message]</span>"
if(once)
del(src)
qdel(src)
/obj/effect/step_trigger/teleport_fancy
var/locationx
@@ -41,4 +41,4 @@
uses--
if(uses == 0)
del(src)
qdel(src)
+2 -2
View File
@@ -87,7 +87,7 @@
O = (H.l_ear == src ? H.r_ear : H.l_ear)
user.unEquip(O)
if(!istype(src,/obj/item/clothing/ears/offear))
del(O)
qdel(O)
O = src
else
O = src
@@ -99,7 +99,7 @@
O.add_fingerprint(user)
if(istype(src,/obj/item/clothing/ears/offear))
del(src)
qdel(src)
/obj/item/clothing/ears/offear
name = "Other ear"
+1 -1
View File
@@ -105,7 +105,7 @@
if ((istype(H, /obj/item/weapon/restraints/handcuffs) && !( src.chained )))
//H = null
if (src.icon_state != "orange") return
del(H)
qdel(H)
src.chained = 1
src.slowdown = 15
src.icon_state = "orange1"
+1 -1
View File
@@ -152,7 +152,7 @@ var/global/list/breach_burn_descriptors = list(
for(var/datum/breach/B in breaches)
if(!B.class)
src.breaches -= B
del(B)
qdel(B)
else
damage += B.class
if(B.damtype == BRUTE)
@@ -36,7 +36,7 @@
/obj/item/clothing/suit/space/chronos/proc/new_camera(var/mob/user)
if(camera)
del(camera)
qdel(camera)
camera = new /obj/effect/chronos_cam(get_turf(user))
camera.holder = user
user.remote_control = camera
@@ -104,11 +104,11 @@
user.client.eye = camera
else
user.client.eye = user
del(holder)
qdel(holder)
else if(user)
user.loc = from_turf
if(phaseanim)
del(phaseanim)
qdel(phaseanim)
teleporting = 0
if(user && !user.loc) //ubersanity
user.loc = locate(0,0,1)
@@ -163,7 +163,7 @@
user << "\nroot@ChronosuitMK4# chronowalk4 --stop\n"
if(camera)
user << "\[ <span style='color: #ff5500;'>ok</span> \] Sending TERM signal to chronowalk4-view" //yes I know they aren't a different color when shutting down, but they were too similar at a glance
del(camera)
qdel(camera)
if(helmet)
user << "\[ <span style='color: #ff5500;'>ok</span> \] Stopping ui display driver"
user << "\[ <span style='color: #ff5500;'>ok</span> \] Stopping brainwave scanner"
@@ -201,7 +201,7 @@
else
src.loc = step
else
del(src)
qdel(src)
/obj/effect/chronos_cam/Destroy()
if(holder)
+3 -3
View File
@@ -95,7 +95,7 @@
if(!src || !WT.isOn()) return
user << "\blue You deconstruct the frame."
new /obj/item/stack/sheet/metal( src.loc, 5 )
del(src)
qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -160,7 +160,7 @@
if(do_after(user, 20))
if(P)
P:amount -= 5
if(!P:amount) del(P)
if(!P:amount) qdel(P)
user << "\blue You add cables to the frame."
src.state = 3
src.icon_state = "3"
@@ -212,7 +212,7 @@
if(circuit.OS)
circuit.OS.computer = B
B.RefreshParts() // todo
del(src)
qdel(src)
/*
This will remove peripherals if you specify one, but the main function is to
@@ -160,7 +160,7 @@
if(!silent)
var/obj/oldobj = obj
obj.visible_message("The [oldobj.name] fades away!")
del(obj)
qdel(obj)
proc/checkInteg(var/area/A)
for(var/turf/T in A)
@@ -213,10 +213,10 @@
derez(item)
for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
del(B)
qdel(B)
for(var/mob/living/simple_animal/hostile/carp/C in linkedholodeck)
del(C)
qdel(C)
holographic_items = A.copy_contents_to(linkedholodeck , 1)
+2 -2
View File
@@ -253,7 +253,7 @@
if (href_list["del_all2"])
for(var/datum/data/record/R in data_core.medical)
//R = null
del(R)
qdel(R)
//Foreach goto(494)
src.temp = "All records deleted."
@@ -419,7 +419,7 @@
if (href_list["del_r2"])
if (src.active2)
//src.active2 = null
del(src.active2)
qdel(src.active2)
if (href_list["d_rec"])
var/datum/data/record/R = locate(href_list["d_rec"])
+6 -6
View File
@@ -397,7 +397,7 @@ What a mess.*/
if ("Purge All Records")
for(var/datum/data/record/R in data_core.security)
del(R)
qdel(R)
temp = "All Security records deleted."
if ("Add Entry")
@@ -581,17 +581,17 @@ What a mess.*/
if ("Delete Record (Security) Execute")
if (active2)
del(active2)
qdel(active2)
if ("Delete Record (ALL) Execute")
if (active1)
for(var/datum/data/record/R in data_core.medical)
if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
del(R)
qdel(R)
else
del(active1)
qdel(active1)
if (active2)
del(active2)
qdel(active2)
else
temp = "This function does not appear to be working at the moment. Our apologies."
@@ -622,7 +622,7 @@ What a mess.*/
continue
else if(prob(1))
del(R)
qdel(R)
continue
..(severity)
+4 -4
View File
@@ -31,7 +31,7 @@
/obj/machinery/lapvend/blob_act()
if (prob(50))
spawn(0)
del(src)
qdel(src)
return
return
@@ -201,10 +201,10 @@
if (network == 3)
newlap.spawn_parts += (/obj/item/part/computer/networking/cable)
if (power == 1)
del(newlap.battery)
qdel(newlap.battery)
newlap.battery = new /obj/item/weapon/stock_parts/cell/high(newlap)
if (power == 2)
del(newlap.battery)
qdel(newlap.battery)
newlap.battery = new /obj/item/weapon/stock_parts/cell/super(newlap)
newlap.spawn_parts()
@@ -394,7 +394,7 @@
T.time = worldtime2text()
vendor_account.transaction_log.Add(T)
del(relap)
qdel(relap)
vendmode = 0
cardreader = 0
+4 -4
View File
@@ -24,8 +24,8 @@
var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction
user.unEquip(src)
user.put_in_hands(I)
del(W)
del(src)
qdel(W)
qdel(src)
return
// SHOTGUN //
@@ -57,8 +57,8 @@
var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3
user.unEquip(src)
user.put_in_hands(I)
del(W)
del(src)
qdel(W)
qdel(src)
return
/obj/item/weaponcrafting/ishotgunconstruction3
+1 -1
View File
@@ -77,7 +77,7 @@
I.fingerprint_hash = C.fingerprint_hash
//I.pin = C.pin
//replace old ID
del(C)
qdel(C)
ok = M.equip_if_possible(I, slot_wear_id, 0) //if 1, last argument deletes on fail
break
testing("Replaced ID!")
+1 -1
View File
@@ -23,4 +23,4 @@
if(!C.stat)
var/turf/T = get_turf(C)
if(istype(T, /turf/space))
del(C)
qdel(C)
+1 -1
View File
@@ -45,7 +45,7 @@
D.z = 2
D.has_loot = 0
del(D)
qdel(D)
num_recovered++
if(num_recovered > drones_list.len * 0.75)
+1 -1
View File
@@ -50,4 +50,4 @@
else
new /mob/living/simple_animal/cow(loc)
del(src)
qdel(src)
+2 -2
View File
@@ -19,7 +19,7 @@
/datum/event/tear/end()
if(TE)
del(TE)
qdel(TE)
/obj/effect/tear
name="Dimensional Tear"
@@ -40,7 +40,7 @@
animation.master = src
// flick("newtear",usr)
spawn(15)
if(animation) del(animation)
if(animation) qdel(animation)
spawn(rand(30,120))
+1 -1
View File
@@ -88,7 +88,7 @@
if(life <= 0)
walk(src,0)
spawn(1)
del(src)
qdel(src)
return 0
return
@@ -67,7 +67,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
Move()
if(z != z_original || loc == destination)
spawn(0) del(src)
spawn(0) qdel(src)
return ..()
Bump(atom/clong)
@@ -87,7 +87,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
if(clong.density || prob(10))
clong.ex_act(2)
else
del(src)
qdel(src)
if(clong && prob(25))
src.loc = clong.loc
+2 -2
View File
@@ -37,7 +37,7 @@
if(recipe.result) // Ignore recipe subtypes that lack a result
available_recipes += recipe
else
del(recipe)
qdel(recipe)
acceptable_items = new
acceptable_reagents = new
for (var/datum/recipe/candy/recipe in available_recipes)
@@ -404,7 +404,7 @@
var/id = O.reagents.get_master_reagent_id()
if (id)
amount+=O.reagents.get_reagent_amount(id)
del(O)
qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
+1 -1
View File
@@ -52,7 +52,7 @@ obj/machinery/cooker/proc/turnoff(obj/item/olditem)
icon_state = officon
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
on = 0
del(olditem)
qdel(olditem)
return
// Burns the food with a chance of starting a fire - for if you try cooking something that's already been cooked that way
+2 -2
View File
@@ -38,7 +38,7 @@
if(recipe.result) // Ignore recipe subtypes that lack a result
available_recipes += recipe
else
del(recipe)
qdel(recipe)
acceptable_items = new
acceptable_reagents = new
for (var/datum/recipe/grill/recipe in available_recipes)
@@ -402,7 +402,7 @@
var/id = O.reagents.get_master_reagent_id()
if (id)
amount+=O.reagents.get_reagent_amount(id)
del(O)
qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
+2 -2
View File
@@ -38,7 +38,7 @@
if(recipe.result) // Ignore recipe subtypes that lack a result
available_recipes += recipe
else
del(recipe)
qdel(recipe)
acceptable_items = new
acceptable_reagents = new
for (var/datum/recipe/oven/recipe in available_recipes)
@@ -402,7 +402,7 @@
var/id = O.reagents.get_master_reagent_id()
if (id)
amount+=O.reagents.get_reagent_amount(id)
del(O)
qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
+1 -1
View File
@@ -17,7 +17,7 @@
evil_tree.icon_living = evil_tree.icon_state
evil_tree.icon_dead = evil_tree.icon_state
evil_tree.icon_gib = evil_tree.icon_state
del(xmas)
qdel(xmas)
/obj/item/weapon/toy/xmas_cracker
name = "xmas cracker"
+4 -4
View File
@@ -49,8 +49,8 @@
dest_temple.my_ladder.up = my_ladder
//delete the landmarks now that we're finished
del(dest_temple)
del(src)
qdel(dest_temple)
qdel(src)
/obj/effect/landmark/temple/destination/New()
//nothing
@@ -74,7 +74,7 @@
fwall.mineral = mineral
if(mineral == "iron")
fwall.is_metal = 1
del(F)
qdel(F)
for(var/obj/effect/landmark/door_spawner/D in T.contents)
var/spawn_type
@@ -83,7 +83,7 @@
else
spawn_type = text2path("/obj/machinery/door/airlock/[mineral]")
new spawn_type(D.loc)
del(D)
qdel(D)
for(var/turf/unsimulated/wall/T in temple_turfs)
if(mineral != "plasma")
+1 -1
View File
@@ -10,7 +10,7 @@
if(!spawn_type)
var/new_type = pick(typesof(/obj/effect/landmark/animal_spawner) - /obj/effect/landmark/animal_spawner)
new new_type(get_turf(src))
del(src)
qdel(src)
processing_objects.Add(src)
spawned_animal = new spawn_type(get_turf(src))
+1 -1
View File
@@ -49,7 +49,7 @@
pixel_x = rand(-6,6)
pixel_y = rand(-6,6)
else
del(src)
qdel(src)
else
return ..()
+5 -5
View File
@@ -310,7 +310,7 @@
myloc.overlays += flicker
spawn(8)
myloc.overlays -= flicker
del(flicker)
qdel(flicker)
//flick("sawblade",src)
if("poison_dart")
M << "\red <b>You feel something small and sharp strike you!</b>"
@@ -321,7 +321,7 @@
myloc.overlays += flicker
spawn(8)
myloc.overlays -= flicker
del(flicker)
qdel(flicker)
//flick("dart[rand(1,3)]",src)
if("flame_burst")
M << "\red <b>A jet of fire comes out of nowhere!</b>"
@@ -353,7 +353,7 @@
my_turf.density = 0
spawn(8)
myloc.overlays -= flicker
del(flicker)
qdel(flicker)
var/dist = rand(1,5)
var/curtiles = 0
@@ -381,7 +381,7 @@
if(prob(90))
var/turf/T = get_turf(src)
T.desc = pick("It looks a little dustier than the surrounding tiles.","It is somewhat ornate.","It looks a little darker than the surrounding tiles.")
del(src)
qdel(src)
//50% chance of being a trap
/obj/effect/step_trigger/trap/fifty
@@ -395,4 +395,4 @@
else
if(prob(10))
new /obj/effect/glowshroom(src.loc)
del(src)
qdel(src)
+1 -1
View File
@@ -123,7 +123,7 @@
/turf/unsimulated/jungle/water/New()
..()
for(var/obj/structure/bush/B in src)
del(B)
qdel(B)
/turf/unsimulated/jungle/water/Entered(atom/movable/O)
..()
+1 -1
View File
@@ -469,7 +469,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
b.dat = O:info
b.name = "Print Job #" + "[rand(100, 999)]"
b.icon_state = "book[rand(1,7)]"
del(O)
qdel(O)
else
..()
/client/proc/delbook()
+1 -1
View File
@@ -4,4 +4,4 @@
..()
spawn(0)
if(src && !key) //we've transferred to another mob. This ghost should be deleted.
del(src)
qdel(src)
+6 -6
View File
@@ -21,8 +21,8 @@
if(client)
respawnable_list += src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
//This is the proc for turning a mob into ash. Mostly a copy of gib code (above).
@@ -48,8 +48,8 @@
if(client)
respawnable_list += src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/proc/melt()
death(1)
@@ -71,8 +71,8 @@
if(client)
respawnable_list += src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/proc/death(gibbed)
+1 -1
View File
@@ -258,6 +258,6 @@
W.loc = src
else
if (del_on_fail)
del(W)
qdel(W)
return equipped
@@ -266,7 +266,7 @@ Des: Removes all infected images from the alien.
if (client)
for(var/image/I in client.images)
if(dd_hasprefix_case(I.icon_state, "infected"))
del(I)
qdel(I)
return
/mob/living/carbon/alien/canBeHandcuffed()
@@ -16,8 +16,8 @@
dead_mob_list -= src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/living/carbon/alien/dust()
death(1)
@@ -37,8 +37,8 @@
dead_mob_list -= src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/living/carbon/alien/death(gibbed)
if(stat == DEAD) return
@@ -42,7 +42,7 @@
var/mob/living/carbon/alien/humanoid/queen/new_xeno = new(loc)
mind.transfer_to(new_xeno)
new_xeno.mind.name = new_xeno.name
del(src)
qdel(src)
else
src << "<span class='notice'>We already have an alive queen.</span>"
return
@@ -157,7 +157,7 @@
if (targeted_by && target_locked)
overlays_standing[TARGETED_LAYER] = target_locked
else if (!targeted_by && target_locked)
del(target_locked)
qdel(target_locked)
if (!targeted_by)
overlays_standing[TARGETED_LAYER] = null
if(update_icons) update_icons()
@@ -53,7 +53,7 @@
else
new_xeno.key = key
new_xeno.mind.name = new_xeno.name
del(src)
qdel(src)
return
else
src << "<span class='warning'>You are not fully grown.</span>"
@@ -137,4 +137,4 @@ Des: Removes all images from the mob infected by this embryo
if(alien.client)
for(var/image/I in alien.client.images)
if(dd_hasprefix_case(I.icon_state, "infected") && I.loc == affected_mob)
del(I)
qdel(I)
+1 -1
View File
@@ -50,7 +50,7 @@
name = "Man-Machine Interface: [brainmob.real_name]"
icon_state = "mmi_full"
alien = 0
del(O)
qdel(O)
locked = 1
@@ -34,10 +34,10 @@
dead_mob_list -= src
if(container && istype(container, /obj/item/device/mmi))
del(container)//Gets rid of the MMI if there is one
qdel(container)//Gets rid of the MMI if there is one
if(loc)
if(istype(loc,/obj/item/organ/brain))
del(loc)//Gets rid of the brain item
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
@@ -37,8 +37,8 @@
s.start()
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/living/carbon/human/dust()
death(1)
@@ -57,8 +57,8 @@
new /obj/effect/decal/remains/human(loc)
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/living/carbon/human/melt()
death(1)
@@ -77,8 +77,8 @@
//new /obj/effect/decal/remains/human(loc)
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/living/carbon/human/death(gibbed)
if(stat == DEAD) return
@@ -246,7 +246,7 @@
if (client.statpanel == "Status")
if (internal)
if (!internal.air_contents)
del(internal)
qdel(internal)
else
stat("Internal Atmosphere Info", internal.name)
stat("Tank Pressure", internal.air_contents.return_pressure())
@@ -1205,7 +1205,7 @@
if(H.brainmob.real_name == src.real_name)
if(H.brainmob.mind)
H.brainmob.mind.transfer_to(src)
del(H)
qdel(H)
@@ -1279,7 +1279,7 @@
.=..()
if(clean_feet && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
feet_blood_color = null
del(feet_blood_DNA)
qdel(feet_blood_DNA)
update_inv_shoes(1)
return 1
@@ -206,14 +206,14 @@
visible_message("\red <b>[M] has broken [src]'s grip on [lgrab.affecting]!</B>")
talked = 1
spawn(1)
del(lgrab)
qdel(lgrab)
if(istype(r_hand, /obj/item/weapon/grab))
var/obj/item/weapon/grab/rgrab = r_hand
if(rgrab.affecting)
visible_message("\red <b>[M] has broken [src]'s grip on [rgrab.affecting]!</B>")
talked = 1
spawn(1)
del(rgrab)
qdel(rgrab)
//End BubbleWrap
if(!talked) //BubbleWrap
@@ -247,7 +247,7 @@ emp_act
else
LAssailant = user
del(src)
qdel(src)
var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting))
if(!affecting || affecting.is_stump() || (affecting.status & ORGAN_DESTROYED))
@@ -139,7 +139,7 @@
spark_system.attach(src)
spark_system.start()
spawn(10)
del(spark_system)
qdel(spark_system)
//Handles chem traces
/mob/living/carbon/human/proc/handle_trace_chems()
@@ -42,7 +42,7 @@
if (equip_to_slot_if_possible(W, slots[slot], del_on_fail = 0))
return slot
if (del_on_fail)
del(W)
qdel(W)
return null
/mob/living/carbon/human/proc/is_in_hands(var/typepath)
@@ -353,9 +353,9 @@
/obj/effect/equip_e/New()
if (!ticker)
del(src)
qdel(src)
spawn(100)
del(src)
qdel(src)
..()
return
@@ -366,22 +366,22 @@
switch(place)
if("mask")
if (!( target.wear_mask ))
del(src)
qdel(src)
if("l_hand")
if (!( target.l_hand ))
del(src)
qdel(src)
if("r_hand")
if (!( target.r_hand ))
del(src)
qdel(src)
if("suit")
if (!( target.wear_suit ))
del(src)
qdel(src)
if("uniform")
if (!( target.w_uniform ))
del(src)
qdel(src)
if("back")
if (!( target.back ))
del(src)
qdel(src)
if("syringe")
return
if("pill")
@@ -394,10 +394,10 @@
return
if("handcuff")
if (!( target.handcuffed ))
del(src)
qdel(src)
if("id")
if ((!( target.wear_id ) || !( target.w_uniform )))
del(src)
qdel(src)
if("splints")
var/count = 0
for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
@@ -406,11 +406,11 @@
count = 1
break
if(count == 0)
del(src)
qdel(src)
return
if("internal")
if ((!( (istype(target.wear_mask, /obj/item/clothing/mask) && (istype(target.back, /obj/item/weapon/tank) || istype(target.belt, /obj/item/weapon/tank) || istype(target.s_store, /obj/item/weapon/tank)) && !( target.internal )) ) && !( target.internal )))
del(src)
qdel(src)
var/message=null
if(target.frozen)
@@ -557,7 +557,7 @@
message = "\red <B>[source] is trying to empty [target]'s pockets!</B>"
if("CPR")
if (!target.cpr_time)
del(src)
qdel(src)
target.cpr_time = 0
message = "\red <B>[source] is trying perform CPR on [target]!</B>"
if("id")
@@ -668,13 +668,13 @@ It can still be worn/put on as normal.
strip_item = target.shoes
if("l_hand")
if (istype(target, /obj/item/clothing/suit/straight_jacket))
del(src)
qdel(src)
slot_to_process = slot_l_hand
if (target.l_hand)
strip_item = target.l_hand
if("r_hand")
if (istype(target, /obj/item/clothing/suit/straight_jacket))
del(src)
qdel(src)
slot_to_process = slot_r_hand
if (target.r_hand)
strip_item = target.r_hand
@@ -746,11 +746,11 @@ It can still be worn/put on as normal.
S.add_fingerprint(source)
if (!( istype(S, /obj/item/weapon/dnainjector) ))
S.inuse = 0
del(src)
qdel(src)
S.inject(target, source)
if (S.s_time >= world.time + 30)
S.inuse = 0
del(src)
qdel(src)
S.s_time = world.time
for(var/mob/O in viewers(source, null))
O.show_message("\red [source] injects [target] with the DNA Injector!", 1)
@@ -815,7 +815,7 @@ It can still be worn/put on as normal.
if(source && target)
if(source.machine == target)
target.show_inv(source)
del(src)
qdel(src)
/mob/proc/get_item_by_slot(slot_id)
+1 -1
View File
@@ -1471,7 +1471,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(M.stat == 2)
M.death(1)
stomach_contents.Remove(M)
del(M)
qdel(M)
continue
if(mob_master.current_cycle%3==1)
if(!(M.status_flags & GODMODE))
@@ -60,7 +60,7 @@
H << "<span class='danger'><B>[M] grips your antennae and starts violently pulling!<B></span>"
do_after(H, 250)
if(p_loc == M.loc && p_loc_m == H.loc)
del(H.internal_organs_by_name["antennae"])
qdel(H.internal_organs_by_name["antennae"])
H.remove_language("Wryn Hivemind")
new /obj/item/organ/wryn/hivenode(M.loc)
M << "<span class='notice'>You hear a loud crunch as you mercilessly pull off [H]'s antennae.</span>"
@@ -110,4 +110,4 @@
H.visible_message("\red[H]'s body explodes, leaving behind a pile of microscopic crystals!")
explosion(T, 0, 0, 2, 2) // Create a small explosion burst upon death
// new /obj/item/weapon/shard/supermatter( T )
del(H)
qdel(H)
@@ -122,7 +122,7 @@
for(var/obj/item/organ/organ in H.contents)
if((organ in H.organs) || (organ in H.internal_organs))
del(organ)
qdel(organ)
if(H.organs) H.organs.Cut()
if(H.internal_organs) H.internal_organs.Cut()
@@ -133,7 +133,7 @@
//now mobs
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
spawn(30) del(speech_bubble)
spawn(30) qdel(speech_bubble)
for(var/mob/M in listening)
M << speech_bubble
@@ -638,7 +638,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
user <<"You apply the enhancer. It now has triple the amount of uses."
Uses = 3
enhanced = 1
del(O)
qdel(O)
/obj/item/slime_extract/New()
..()
@@ -777,14 +777,14 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
pet.icon_dead = "[M.colour] baby slime dead"
pet.colour = "[M.colour]"
user <<"You feed the slime the potion, removing it's powers and calming it."
del(M)
qdel(M)
var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
if (!newname)
newname = "pet slime"
pet.name = newname
pet.real_name = newname
del(src)
qdel(src)
/obj/item/weapon/slimepotion2
name = "advanced docility potion"
@@ -808,14 +808,14 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
pet.icon_dead = "[M.colour] baby slime dead"
pet.colour = "[M.colour]"
user <<"You feed the slime the potion, removing it's powers and calming it."
del(M)
qdel(M)
var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
if (!newname)
newname = "pet slime"
pet.name = newname
pet.real_name = newname
del(src)
qdel(src)
/obj/item/weapon/slimesteroid
@@ -840,7 +840,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
user <<"You feed the slime the steroid. It now has triple the amount of extract."
M.cores = 3
del(src)
qdel(src)
/obj/item/weapon/slimesteroid2
name = "extract enhancer"
@@ -221,7 +221,7 @@
src.mind.transfer_to(new_slime)
else
new_slime.key = src.key
del(src)
qdel(src)
else
src << "<i>I am not ready to reproduce yet...</i>"
else
@@ -167,7 +167,7 @@
if(istype(loc,/obj/item/weapon/holder/diona))
var/obj/item/weapon/holder/diona/L = loc
src.loc = L.loc
del(L)
qdel(L)
for(var/datum/language/L in languages)
adult.add_language(L.name)
@@ -182,7 +182,7 @@
for (var/obj/item/W in src.contents)
src.unEquip(W)
del(src)
qdel(src)
/mob/living/carbon/primitive/diona/verb/steal_blood()
set category = "Diona"
+3 -3
View File
@@ -423,7 +423,7 @@
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1)
//G = null
del(G)
qdel(G)
else
ok = 0
if (locate(/obj/item/weapon/grab, M.grabbed_by.len))
@@ -565,7 +565,7 @@
for(var/obj/O in L.requests)
L.requests.Remove(O)
del(O)
qdel(O)
resisting++
for(var/obj/item/weapon/grab/G in usr.grabbed_by)
@@ -739,7 +739,7 @@
if(hulklien)
CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
del(CM.handcuffed)
qdel(CM.handcuffed)
CM.handcuffed = null
CM.update_inv_handcuffed()
return
+1 -1
View File
@@ -122,7 +122,7 @@ proc/get_radio_key_from_channel(var/channel)
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
spawn(30) del(speech_bubble)
spawn(30) qdel(speech_bubble)
for(var/mob/M in listening)
M << speech_bubble
+2 -2
View File
@@ -882,7 +882,7 @@ var/list/ai_verbs_default = list(
input = input("Select a crew member:") as null|anything in personnel_list
var/icon/character_icon = personnel_list[input]
if(character_icon)
del(holo_icon)//Clear old icon so we're not storing it in memory.
qdel(holo_icon)//Clear old icon so we're not storing it in memory.
holo_icon = getHologramIcon(icon(character_icon))
else
alert("No suitable records found. Aborting.")
@@ -895,7 +895,7 @@ var/list/ai_verbs_default = list(
)
input = input("Please select a hologram:") as null|anything in icon_list
if(input)
del(holo_icon)
qdel(holo_icon)
switch(input)
if("default")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
+4 -4
View File
@@ -16,8 +16,8 @@
dead_mob_list -= src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/living/silicon/dust()
death(1)
@@ -37,5 +37,5 @@
dead_mob_list -= src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
+1 -1
View File
@@ -6,7 +6,7 @@
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
del(src.cable)
qdel(src.cable)
sleeping = 0
ear_deaf = 0
@@ -17,8 +17,8 @@
living_mob_list -= src
dead_mob_list -= src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/living/silicon/robot/dust()
death(1)
@@ -35,12 +35,12 @@
flick("dust-r", animation)
new /obj/effect/decal/remains/robot(loc)
if(mmi) del(mmi) //Delete the MMI first so that it won't go popping out.
if(mmi) qdel(mmi) //Delete the MMI first so that it won't go popping out.
dead_mob_list -= src
spawn(15)
if(animation) del(animation)
if(src) del(src)
if(animation) qdel(animation)
if(src) qdel(src)
/mob/living/silicon/robot/death(gibbed)
@@ -176,7 +176,7 @@
if(istype(M,/mob/living/simple_animal/lizard) || istype(M,/mob/living/simple_animal/mouse))
src.loc.visible_message("\red [src.loc] sucks [M] into its decompiler. There's a horrible crunching noise.","\red It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.")
new/obj/effect/decal/cleanable/blood/splatter(get_turf(src))
del(M)
qdel(M)
stored_comms["wood"]++
stored_comms["wood"]++
stored_comms["plastic"]++
@@ -200,7 +200,7 @@
D << "\red You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself."
del(M)
qdel(M)
new/obj/effect/decal/cleanable/blood/oil(get_turf(src))
stored_comms["metal"] += 15
@@ -267,7 +267,7 @@
else
continue
del(W)
qdel(W)
grabbed_something = 1
if(grabbed_something)
@@ -703,7 +703,7 @@ var/list/robot_verbs_default = list(
// This doesn't work. Don't use it.
//src.Destroy()
// del() because it's infrequent and mobs act weird in qdel.
del(src)
qdel(src)
else
// Okay we're not removing the cell or an MMI, but maybe something else?
var/list/removable_components = list()
@@ -865,7 +865,7 @@ var/list/robot_verbs_default = list(
src << "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands."
if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
del(D)
qdel(D)
src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
src.module.rebuild()
if(src.module && istype(src.module, /obj/item/weapon/robot_module/medical))
@@ -1067,7 +1067,7 @@ var/list/robot_verbs_default = list(
//Call when target overlay should be added/removed
/mob/living/silicon/robot/update_targeted()
if(!targeted_by && target_locked)
del(target_locked)
qdel(target_locked)
updateicon()
if (targeted_by && target_locked)
overlays += target_locked
@@ -1205,7 +1205,7 @@ var/list/robot_verbs_default = list(
for(var/A in tile)
if(istype(A, /obj/effect))
if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
del(A)
qdel(A)
else if(istype(A, /obj/item))
var/obj/item/cleaned_item = A
cleaned_item.clean_blood()
@@ -117,7 +117,7 @@
if(feral > 0)
src.strength += B.strength
del(B)
qdel(B)
src.icon_state = "bees[src.strength]"
if(strength > 5)
icon_state = "bees_swarm"
@@ -130,7 +130,7 @@
B.icon_state = "bees[B.strength]"
if(src.strength <= 0)
del(src)
qdel(src)
return
src.icon_state = "bees[B.strength]"
var/turf/simulated/floor/T = get_turf(get_step(src, pick(1,2,4,8)))
@@ -179,7 +179,7 @@
if(!parent && prob(10))
strength -= 1
if(strength <= 0)
del(src)
qdel(src)
else if(strength <= 5)
icon_state = "bees[strength]"
@@ -204,7 +204,7 @@
host.computer_id = null
host.lastKnownIP = null
del(host_brain)
qdel(host_brain)
host_brain = new(src)
host_brain.ckey = host.ckey
@@ -352,7 +352,7 @@ mob/living/simple_animal/borer/proc/detatch()
if(!host.lastKnownIP)
host.lastKnownIP = b2h_ip
del(host_brain)
qdel(host_brain)
return
@@ -47,7 +47,7 @@
if(locate(/obj/effect/plant) in loc)
var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
del(SV)
qdel(SV)
if(prob(10))
say("Nom")
@@ -67,7 +67,7 @@
if(!stat)
if(locate(/obj/effect/plant) in loc)
var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
del(SV)
qdel(SV)
if(prob(10))
say("Nom")
@@ -245,7 +245,7 @@ var/global/chicken_count = 0
if(!stat && eggsleft < 8)
user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
user.drop_item()
del(O)
qdel(O)
eggsleft += rand(1, 4)
//world << eggsleft
else
@@ -276,7 +276,7 @@ var/global/chicken_count = 0
visible_message("[src] hatches with a quiet cracking sound.")
new /mob/living/simple_animal/chick(get_turf(src))
processing_objects.Remove(src)
del(src)
qdel(src)
else
processing_objects.Remove(src)
@@ -81,4 +81,4 @@
S2.icon_living = "[src.colour] baby slime"
S2.icon_dead = "[src.colour] baby slime dead"
S2.colour = "[src.colour]"
del(src)
qdel(src)
@@ -100,7 +100,7 @@
if("rapid")
new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
spawn(100)
del(src)
qdel(src)
return
@@ -159,7 +159,7 @@
/mob/living/simple_animal/hostile/retaliate/malf_drone/Die()
src.visible_message("\blue \icon[src] [src] suddenly breaks apart.")
..()
del(src)
qdel(src)
/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy()
//some random debris left behind
@@ -54,4 +54,4 @@
..()
visible_message("\red <b>[src]</b> is hacked into pieces!")
new /obj/item/stack/sheet/wood(loc)
del(src)
qdel(src)
@@ -399,7 +399,7 @@
adjustBruteLoss(-MED.heal_brute)
MED.amount -= 1
if(MED.amount <= 0)
del(MED)
qdel(MED)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\blue [user] applies [MED] on [src]")
@@ -49,7 +49,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
T.gestation = src.gestation
T.pickup(user)
user.put_in_active_hand(T)
del(src)
qdel(src)
/mob/living/simple_animal/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params)
@@ -109,7 +109,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
T.gestation = src.gestation
user << "<span class='notice'>The tribble gets up and wanders around.</span>"
del(src)
qdel(src)
/obj/item/toy/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) //neutering and un-neutering
..()
@@ -162,7 +162,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
if (prob(75))
new /obj/item/weapon/shard( src.loc )
Break()
del(src)
qdel(src)
/obj/structure/tribble_cage/proc/healthcheck()
+2 -2
View File
@@ -168,7 +168,7 @@
if(!W.mob_can_equip(src, slot, disable_warning))
if(del_on_fail)
del(W)
qdel(W)
else
if(!disable_warning)
src << "\red You are unable to equip that." //Only print if del_on_fail is false
@@ -510,7 +510,7 @@ var/list/slot_equipment_priority = list( \
var/list/temp = list( )
temp += L.container
//L = null
del(L)
qdel(L)
return temp
else
return L.container
+3 -3
View File
@@ -374,17 +374,17 @@
var/obj/item/weapon/grab/G = mob.r_hand
grabbing += G.affecting
for(var/obj/item/weapon/grab/G in mob.grabbed_by)
if((G.state == 1)&&(!grabbing.Find(G.assailant))) del(G)
if((G.state == 1)&&(!grabbing.Find(G.assailant))) qdel(G)
if(G.state == 2)
move_delay = world.time + 10
if(!prob(25)) return 1
mob.visible_message("\red [mob] has broken free of [G.assailant]'s grip!")
del(G)
qdel(G)
if(G.state == 3)
move_delay = world.time + 10
if(!prob(5)) return 1
mob.visible_message("\red [mob] has broken free of [G.assailant]'s headlock!")
del(G)
qdel(G)
return 0
+2 -2
View File
@@ -10,9 +10,9 @@
ghost.timeofdeath = world.time - 20000
ghost.newPlayerType = /mob/new_player/cultist
// remove old mask body
del(currentSpirit)
qdel(currentSpirit)
/mob/new_player/cultist/AttemptLateSpawn(rank)
var/mob/newCharacter = ..(rank)
if(ticker.mode)
+14 -14
View File
@@ -65,7 +65,7 @@
if (notransform)
return
for(var/t in organs)
del(t)
qdel(t)
return ..(move)
@@ -159,7 +159,7 @@
"[src] disappears into the shadows, never to be seen again.", \
"You disappear into the shadows, never to be seen again.", \
"You hear strange noise, you can't quite place it.")
del(src)
qdel(src)
new_spirit << "<font color=\"purple\"><b><i>You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god.</b></i></font>"
new_spirit << "<font color=\"purple\"><b><i>Your job is to help your acolytes complete their goals. Be spooky. Do evil.</b></i></font>"
@@ -188,9 +188,9 @@
icon = null
invisibility = 101
for(var/t in organs)
del(t)
qdel(t)
for(var/i in internal_organs)
del(i)
qdel(i)
var/mob/living/silicon/robot/O = new /mob/living/silicon/robot( loc )
@@ -233,7 +233,7 @@
O.Namepick()
spawn(0)//To prevent the proc from returning null.
del(src)
qdel(src)
return O
//human -> alien
@@ -248,7 +248,7 @@
icon = null
invisibility = 101
for(var/t in organs)
del(t)
qdel(t)
var/alien_caste = pick("Hunter","Sentinel","Drone")
var/mob/living/carbon/alien/humanoid/new_xeno
@@ -266,7 +266,7 @@
new_xeno << "<B>You are now an alien.</B>"
new_xeno.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
del(src)
qdel(src)
return
/mob/living/carbon/human/proc/slimeize(adult as num, reproduce as num)
@@ -280,7 +280,7 @@
icon = null
invisibility = 101
for(var/t in organs)
del(t)
qdel(t)
var/mob/living/carbon/slime/new_slime
if(reproduce)
@@ -302,7 +302,7 @@
new_slime << "<B>You are now a slime. Skreee!</B>"
new_slime.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
del(src)
qdel(src)
return
/mob/living/carbon/human/proc/corgize()
@@ -316,7 +316,7 @@
icon = null
invisibility = 101
for(var/t in organs) //this really should not be necessary
del(t)
qdel(t)
var/mob/living/simple_animal/pet/corgi/new_corgi = new /mob/living/simple_animal/pet/corgi (loc)
new_corgi.a_intent = "harm"
@@ -325,7 +325,7 @@
new_corgi << "<B>You are now a Corgi. Yap Yap!</B>"
new_corgi.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
del(src)
qdel(src)
return
/mob/living/carbon/human/Animalize()
@@ -349,7 +349,7 @@
invisibility = 101
for(var/t in organs)
del(t)
qdel(t)
var/mob/new_mob = new mobpath(src.loc)
@@ -360,7 +360,7 @@
new_mob << "You suddenly feel more... animalistic."
new_mob.update_pipe_vision()
spawn()
del(src)
qdel(src)
return
/mob/proc/Animalize()
@@ -379,7 +379,7 @@
new_mob << "You feel more... animalistic"
new_mob.update_pipe_vision()
del(src)
qdel(src)
/* Certain mob types have problems and should not be allowed to be controlled by players.
*
+2 -2
View File
@@ -71,7 +71,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
src.nutrition += (15 * REAGENTS_METABOLISM)
BL.volume -= REAGENTS_METABOLISM
if(BL.volume <= 0)
del(BL)
qdel(BL)
break //Only process one blood per tick, to maintain the same metabolism as nutriment for non-vampires.
if(B.data["donor"] != src) //If it's not theirs, then we look for theirs
@@ -332,7 +332,7 @@ proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
// Only a certain number of drips (or one large splatter) can be on a given turf.
for(var/obj/effect/decal/cleanable/blood/drip/drop in T)
drips |= drop.drips
del(drop)
qdel(drop)
if(!large && drips.len < 3)
decal_type = /obj/effect/decal/cleanable/blood/drip
+1 -1
View File
@@ -282,4 +282,4 @@ var/list/organ_cache = list()
if(fingerprintslast) O.fingerprintslast = fingerprintslast
user.put_in_active_hand(O)
del(src)
qdel(src)
+1 -1
View File
@@ -247,7 +247,7 @@
B.ckey = owner.ckey
spawn(0)
del(src)
qdel(src)
//XENOMORPH ORGANS
/obj/item/organ/xenos/eggsac
+3 -3
View File
@@ -834,7 +834,7 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.bad_external_organs -= src
for(var/implant in implants) //todo: check if this can be left alone
del(implant)
qdel(implant)
// Attached organs also fly off.
if(!ignore_children)
@@ -864,8 +864,8 @@ Note that amputating the affected organ does in fact remove the infection from t
spark_system.attach(owner)
spark_system.start()
spawn(10)
del(spark_system)
del(src)
qdel(spark_system)
qdel(src)
/obj/item/organ/external/proc/disfigure(var/type = "brute")
if (disfigured)
+1 -1
View File
@@ -19,4 +19,4 @@
/obj/item/organ/external/stump/removed()
..()
del(src)
qdel(src)
+1 -1
View File
@@ -300,7 +300,7 @@
user.unEquip(src)
new /obj/effect/decal/cleanable/ash(get_turf(src))
del(src)
qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
+4 -4
View File
@@ -56,7 +56,7 @@
if(screen == 2)
screen = 1
user << "<span class='notice'>You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>"
del(W)
qdel(W)
else
if(istype(W, /obj/item/stack/tape_roll))
return 0
@@ -91,7 +91,7 @@
user.unEquip(src)
new /obj/effect/decal/cleanable/ash(get_turf(src))
del(src)
qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
@@ -171,7 +171,7 @@
var/obj/item/weapon/paper/P = src[1]
usr.unEquip(src)
usr.put_in_hands(P)
del(src)
qdel(src)
else if(page == amount)
screen = 2
else if(page == amount+1)
@@ -210,7 +210,7 @@
O.layer = initial(O.layer)
O.add_fingerprint(usr)
usr.unEquip(src)
del(src)
qdel(src)
return
+1 -1
View File
@@ -119,7 +119,7 @@
user << "<span class='notice'>You insert the toner cartridge into \the [src].</span>"
var/obj/item/device/toner/T = O
toner += T.toner_amount
del(O)
qdel(O)
updateUsrDialog()
else
user << "<span class='notice'>This cartridge is not yet ready for replacement! Use up the rest of the toner.</span>"
+6 -6
View File
@@ -64,7 +64,7 @@
user.unEquip(src)
new /obj/effect/decal/cleanable/ash(get_turf(src))
del(src)
qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
@@ -178,7 +178,7 @@
return
user << "<span class='notice'>You insert [I] into [src].</span>"
user.drop_item()
del(I)
qdel(I)
pictures_left = pictures_max
return
..()
@@ -201,7 +201,7 @@
for(var/atom/A in the_turf)
if(A.invisibility) continue
atoms.Add(A)
// Sort the atoms into their layers
var/list/sorted = sort_atoms_by_layer(atoms)
var/center_offset = (size-1)/2 * 32 + 1
@@ -229,7 +229,7 @@
// Calculate where we are relative to the center of the photo
var/xoff = (the_turf.x - center.x) * 32 + center_offset
var/yoff = (the_turf.y - center.y) * 32 + center_offset
res.Blend(getFlatIcon(the_turf.loc), blendMode2iconMode(the_turf.blend_mode),xoff,yoff)
res.Blend(getFlatIcon(the_turf.loc), blendMode2iconMode(the_turf.blend_mode),xoff,yoff)
return res
@@ -464,7 +464,7 @@
camera.network = list("news")
camera.c_tag = user.name
else
src.icon_state = icon_on
camera = new /obj/machinery/camera(src)
camera.network = list("news")
@@ -483,4 +483,4 @@
if(get_dist(src, M) <= canhear_range)
talk_into(M, msg)
for(var/mob/living/carbon/human/H in watcherslist)
H.show_message(text("\blue (Newscaster) [] says, '[]'",M,msg), 1)
H.show_message(text("\blue (Newscaster) [] says, '[]'",M,msg), 1)
@@ -64,7 +64,7 @@
usr << P.desc
// TG uses a special garbage collector.. qdel(P)
del(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.
qdel(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.
/obj/item/device/camera/siliconcam/proc/deletepicture(obj/item/device/camera/siliconcam/cam)
var/datum/picture/selection = selectpicture(cam)
+7 -7
View File
@@ -498,14 +498,14 @@
user.visible_message(\
"\red [user.name] cut the cables and dismantled the power terminal.",\
"You cut the cables and dismantle the power terminal.")
del(terminal)
qdel(terminal)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
user << "You trying to insert the power control board into the frame..."
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 10))
has_electronics = 1
user << "You place the power control board inside the frame."
del(W)
qdel(W)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
user << "\red You cannot put the board inside, the frame is damaged."
return
@@ -530,7 +530,7 @@
"\red [src] has been cut from the wall by [user.name] with the weldingtool.",\
"You cut the APC frame from the wall.",\
"\red You hear welding.")
del(src)
qdel(src)
return
else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && emagged)
emagged = 0
@@ -539,7 +539,7 @@
user.visible_message(\
"\red [user.name] has replaced the damaged APC frontal panel with a new one.",\
"You replace the damaged APC frontal panel with a new one.")
del(W)
qdel(W)
update_icon()
else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack))
if (has_electronics)
@@ -550,7 +550,7 @@
user.visible_message(\
"\red [user.name] has replaced the damaged APC frame with new one.",\
"You replace the damaged APC frame with new one.")
del(W)
qdel(W)
stat &= ~BROKEN
malfai = null
malfhack = 0
@@ -1000,7 +1000,7 @@
malf.mind.transfer_to(src.occupant)
src.occupant.eyeobj.name = "[src.occupant.name] (AI Eye)"
if(malf.parent)
del(malf)
qdel(malf)
src.occupant.verbs += /mob/living/silicon/ai/proc/corereturn
src.occupant.verbs += /datum/game_mode/malfunction/proc/takeover
src.occupant.cancel_camera()
@@ -1016,7 +1016,7 @@
src.occupant.mind.transfer_to(src.occupant.parent)
src.occupant.parent.adjustOxyLoss(src.occupant.getOxyLoss())
src.occupant.parent.cancel_camera()
del(src.occupant)
qdel(src.occupant)
if (seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
for(var/obj/item/weapon/pinpointer/point in world)
for(var/datum/mind/AI_mind in ticker.mode.malf_ai)
+5 -5
View File
@@ -136,7 +136,7 @@
investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
del(src)
qdel(src)
return
@@ -309,7 +309,7 @@
if(ismob(loc))
var/mob/M = loc
M.unEquip(src)
del(src)
qdel(src)
else
amount -= used
update_icon()
@@ -371,7 +371,7 @@
if (C.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(C.loc, 1, C.cable_color)
del(C)
qdel(C)
//src.laying = 1
//last = C
@@ -431,7 +431,7 @@
if (NC.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(NC.loc, 1, NC.cable_color)
del(NC)
qdel(NC)
return
else if(C.d1 == 0) // exisiting cable doesn't point at our position, so see if it's a stub
@@ -470,7 +470,7 @@
if (C.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(C.loc, 2, C.cable_color)
del(C)
qdel(C)
return
+1 -1
View File
@@ -33,6 +33,6 @@
/turf/simulated/floor/engine/blob_act()
if (prob(25))
ChangeTurf(/turf/space)
del(src)
qdel(src)
return
return
+4 -4
View File
@@ -53,7 +53,7 @@
user.visible_message("[user.name] deconstructs [src].", \
"You deconstruct [src].", "You hear a noise.")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
del(src)
qdel(src)
if (src.stage == 2)
usr << "You have to remove the wires first."
return
@@ -111,7 +111,7 @@
newlight.dir = src.dir
src.transfer_fingerprints_to(newlight)
del(src)
qdel(src)
return
..()
@@ -315,7 +315,7 @@
update()
user.drop_item() //drop the item to update overlays and such
del(L)
qdel(L)
if(on && rigged)
@@ -370,7 +370,7 @@
newlight.fingerprints = src.fingerprints
newlight.fingerprintshidden = src.fingerprintshidden
newlight.fingerprintslast = src.fingerprintslast
del(src)
qdel(src)
return
user << "You stick \the [W] into the light socket!"
+1 -1
View File
@@ -188,7 +188,7 @@ display round(lastgen) and plasmatank amount
if (heat > 300)
overheat()
del(src)
qdel(src)
return
/obj/machinery/power/port_gen/pacman/handleInactive()
+2 -2
View File
@@ -83,7 +83,7 @@
/proc/makepowernets()
for(var/datum/powernet/PN in powernets)
del(PN)
qdel(PN)
powernets.Cut()
for(var/obj/structure/cable/PC in cable_list)
@@ -373,7 +373,7 @@
Cable.powernet = net1
net1.cables += Cable
del(net2)
qdel(net2)
return net1
@@ -52,7 +52,7 @@
if(hasShocked)
return 0
if(!FG1 || !FG2)
del(src)
qdel(src)
return 0
if(iscarbon(user))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread

Some files were not shown because too many files have changed in this diff Show More