From 88dfaa51a4dfc700dce3e986ffa3fd2a36806d58 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 7 Jul 2015 00:35:19 -0400 Subject: [PATCH 1/3] Replaces Reamining Del()'s --- .../components/omni_devices/filter.dm | 20 +++++++------- .../components/omni_devices/mixer.dm | 6 ++--- .../components/omni_devices/omni_base.dm | 12 ++++----- .../components/portables_connector.dm | 6 ++--- code/ATMOSPHERICS/components/tvalve.dm | 4 +-- code/ATMOSPHERICS/components/valve.dm | 4 +-- code/game/gamemodes/cult/ritual.dm | 4 +-- code/game/machinery/hologram.dm | 4 +-- code/game/machinery/telecomms/broadcaster.dm | 4 +-- .../machinery/telecomms/telecomunications.dm | 4 +-- code/game/machinery/turret_control.dm | 4 +-- .../effects/decals/Cleanable/humans.dm | 4 +-- code/game/objects/items/devices/multitool.dm | 4 +-- code/game/objects/items/devices/uplinks.dm | 10 +++---- code/modules/food/customizables.dm | 6 ++--- code/modules/mob/holder.dm | 4 +-- .../mob/living/silicon/ai/freelook/eye.dm | 6 ++--- .../silicon/ai/freelook/update_triggers.dm | 12 ++++----- code/modules/mob/mob_grab.dm | 7 +---- code/modules/mob/spirit/spirit.dm | 26 +++++++++---------- code/modules/mob/spirit/viewpoint.dm | 5 ++-- code/modules/ninja/energy_katana.dm | 6 ----- code/modules/projectiles/guns/alien.dm | 4 +-- .../projectiles/guns/energy/special.dm | 4 +-- 24 files changed, 79 insertions(+), 91 deletions(-) diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm index d6c881fd4e4..a3b5c63d05a 100644 --- a/code/ATMOSPHERICS/components/omni_devices/filter.dm +++ b/code/ATMOSPHERICS/components/omni_devices/filter.dm @@ -9,11 +9,11 @@ var/datum/omni_port/input var/datum/omni_port/output -/obj/machinery/atmospherics/omni/filter/Del() +/obj/machinery/atmospherics/omni/filter/Destroy() input = null output = null filters.Cut() - ..() + return ..() /obj/machinery/atmospherics/omni/filter/sort_ports() for(var/datum/omni_port/P in ports) @@ -46,7 +46,7 @@ ..() if(!on) return 0 - + if(!input || !output) return @@ -54,7 +54,7 @@ var/datum/gas_mixture/input_air = input.air // it's completely happy with them if they're in a loop though i.e. "P.air.return_pressure()"... *shrug* var/output_pressure = output_air.return_pressure() - + if(output_pressure >= target_pressure) return for(var/datum/omni_port/P in filters) @@ -68,14 +68,14 @@ if(input.transfer_moles > 0) var/datum/gas_mixture/removed = input_air.remove(input.transfer_moles) - + if(!removed) return - + for(var/datum/omni_port/P in filters) var/datum/gas_mixture/filtered_out = new filtered_out.temperature = removed.return_temperature() - + switch(P.mode) if(ATM_O2) filtered_out.oxygen = removed.oxygen @@ -97,15 +97,15 @@ filtered_out.trace_gases += trace_gas else filtered_out = null - + P.air.merge(filtered_out) if(P.network) P.network.update = 1 - + output_air.merge(removed) if(output.network) output.network.update = 1 - + input.transfer_moles = 0 if(input.network) input.network.update = 1 diff --git a/code/ATMOSPHERICS/components/omni_devices/mixer.dm b/code/ATMOSPHERICS/components/omni_devices/mixer.dm index 64af4057b00..dd1ee03b624 100644 --- a/code/ATMOSPHERICS/components/omni_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/omni_devices/mixer.dm @@ -9,7 +9,7 @@ var/datum/omni_port/output //setup tags for initial concentration values (must be decimal) - var/tag_north_con + var/tag_north_con var/tag_south_con var/tag_east_con var/tag_west_con @@ -44,10 +44,10 @@ tag_east_con = null tag_west_con = null -/obj/machinery/atmospherics/omni/mixer/Del() +/obj/machinery/atmospherics/omni/mixer/Destroy() inputs.Cut() output = null - ..() + return ..() /obj/machinery/atmospherics/omni/mixer/sort_ports() for(var/datum/omni_port/P in ports) diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index dbc1e1420b7..73d28516400 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -28,7 +28,7 @@ /obj/machinery/atmospherics/omni/New() ..() icon_state = "base" - + ports = new() for(var/d in cardinal) var/datum/omni_port/new_port = new(src, d) @@ -44,7 +44,7 @@ if(new_port.mode > 0) initialize_directions |= d ports += new_port - + build_icons() /obj/machinery/atmospherics/omni/update_icon() @@ -173,7 +173,7 @@ if(ATM_O2 to ATM_N2O) ic_on += "_filter" ic_off += "_out" - + ic_on = icon_manager.get_atmos_icon("omni", , , ic_on) ic_off = icon_manager.get_atmos_icon("omni", , , ic_off) @@ -223,7 +223,7 @@ return null -/obj/machinery/atmospherics/omni/Del() +/obj/machinery/atmospherics/omni/Destroy() loc = null for(var/datum/omni_port/P in ports) @@ -232,7 +232,7 @@ del(P.network) P.node = null - ..() + return ..() /obj/machinery/atmospherics/omni/initialize() for(var/datum/omni_port/P in ports) @@ -287,7 +287,7 @@ P.node = null P.update = 1 break - + update_ports() return null \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index fda49cd6efc..59b1174f2f3 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -60,7 +60,7 @@ return null -/obj/machinery/atmospherics/portables_connector/Del() +/obj/machinery/atmospherics/portables_connector/Destroy() loc = null if(connected_device) @@ -72,7 +72,7 @@ node = null - ..() + .return .() /obj/machinery/atmospherics/portables_connector/initialize() if(node) return @@ -127,7 +127,7 @@ if(reference==node) del(network) node = null - + update_underlays() return null diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index c97367f0529..6ad768d0df5 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -101,7 +101,7 @@ return null -/obj/machinery/atmospherics/tvalve/Del() +/obj/machinery/atmospherics/tvalve/Destroy() loc = null if(node1) @@ -118,7 +118,7 @@ node2 = null node3 = null - ..() + return ..() /obj/machinery/atmospherics/tvalve/proc/go_to_side() diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 481b3ecd062..ba2d6fba96b 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -75,7 +75,7 @@ return null -/obj/machinery/atmospherics/valve/Del() +/obj/machinery/atmospherics/valve/Destroy() loc = null if(node1) @@ -88,7 +88,7 @@ node1 = null node2 = null - ..() + return ..() /obj/machinery/atmospherics/valve/proc/open() if(open) return 0 diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index adf28b1e8d2..5bb92c6c748 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -74,9 +74,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", AI.client.images += blood cult_viewpoints += src -/obj/effect/rune/Del() - ..() +/obj/effect/rune/Destroy() cult_viewpoints -= src + return ..() /obj/effect/rune/examine() set src in view(2) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index e65f470a0d6..ecce6d98767 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -196,10 +196,10 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ del(src) return -/obj/machinery/hologram/Del() +/obj/machinery/hologram/Destroy() if(hologram) src:clear_holo() - ..() + return ..() /* Holographic project of everything else. diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index aced6424633..7823dabea92 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -97,11 +97,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Do a snazzy animation! --- */ flick("broadcaster_send", src) -/obj/machinery/telecomms/broadcaster/Del() +/obj/machinery/telecomms/broadcaster/Destroy() // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. if(message_delay) message_delay = 0 - ..() + return ..() /* diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 0450905528f..79be894bf42 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -160,9 +160,9 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() add_link(T) -/obj/machinery/telecomms/Del() +/obj/machinery/telecomms/Destroy() telecomms_list -= src - ..() + return ..() // Used in auto linking /obj/machinery/telecomms/proc/add_link(var/obj/machinery/telecomms/T) diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 55399f8b199..545033aa718 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -37,12 +37,12 @@ lethal = 1 icon_state = "control_kill" -/obj/machinery/turretid/Del() +/obj/machinery/turretid/Destroy() if(control_area) var/area/A = control_area if(A && istype(A)) A.turret_controls -= src - ..() + return ..() /obj/machinery/turretid/initialize() if(!control_area) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 66c5b3a3e0b..fea98e5f472 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -21,10 +21,10 @@ var/global/list/image/splatter_cache=list() var/list/datum/disease2/disease/virus2 = list() var/amount = 5 -/obj/effect/decal/cleanable/blood/Del() +/obj/effect/decal/cleanable/blood/Destroy() for(var/datum/disease2/disease/D in viruses) D.cure(0) - ..() + return ..() /obj/effect/decal/cleanable/blood/New() ..() diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 9c1072cfa65..32d5984f8b9 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -36,9 +36,9 @@ processing_objects += src -/obj/item/device/multitool/ai_detect/Del() +/obj/item/device/multitool/ai_detect/Destroy() processing_objects -= src - ..() + return ..() /obj/item/device/multitool/ai_detect/process() diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 67571efdba3..c358afce2d9 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -26,9 +26,9 @@ var/list/world_uplinks = list() welcome = ticker.mode.uplink_welcome uses = ticker.mode.uplink_uses -/obj/item/device/uplink/Del() +/obj/item/device/uplink/Destroy() world_uplinks-=src - ..() + return ..() //Let's build a menu! /obj/item/device/uplink/proc/generate_menu(mob/user as mob) @@ -105,7 +105,7 @@ var/list/world_uplinks = list() /obj/item/device/uplink/Topic(href, href_list) if(..()) return 1 - + if(!active) return @@ -252,8 +252,8 @@ var/list/world_uplinks = list() src.hidden_uplink.trigger(user) return 1 return 0 - -//Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it) + +//Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it) /obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/antag_spawner/borg_tele)) var/obj/item/weapon/antag_spawner/borg_tele/S = W diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm index 0616f036bab..c1bbcdb50dc 100644 --- a/code/modules/food/customizables.dm +++ b/code/modules/food/customizables.dm @@ -377,10 +377,10 @@ T.pixel_y = (ingredients.len * 2)+1 overlays += T -/obj/item/weapon/reagent_containers/food/snacks/customizable/Del() +/obj/item/weapon/reagent_containers/food/snacks/customizable/Destroy() for(var/obj/item/O in ingredients) - del(O) - ..() + qdel(O) + return ..() /obj/item/weapon/reagent_containers/food/snacks/customizable/examine() ..() diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index a441cfcf5b6..f67b3b9f7e1 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -9,9 +9,9 @@ ..() processing_objects.Add(src) -/obj/item/weapon/holder/Del() +/obj/item/weapon/holder/Destroy() processing_objects.Remove(src) - ..() + return ..() /obj/item/weapon/holder/process() diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index bc775bfeb42..4397b63223e 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -100,10 +100,10 @@ spawn(5) eyeobj.loc = src.loc -/mob/living/silicon/ai/Del() +/mob/living/silicon/ai/Destroy() eyeobj.ai = null - del(eyeobj) // No AI, no Eye - ..() + qdel(eyeobj) // No AI, no Eye + return ..() /atom/proc/move_camera_by_click() if(istype(usr, /mob/living/silicon/ai)) diff --git a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm index 328bd8c28c9..44e358da9d6 100644 --- a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm +++ b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm @@ -23,10 +23,10 @@ // STRUCTURES -/obj/structure/Del() +/obj/structure/Destroy() if(ticker) cameranet.updateVisibility(src) - ..() + return ..() /obj/structure/New() ..() @@ -35,10 +35,10 @@ // EFFECTS -/obj/effect/Del() +/obj/effect/Destroy() if(ticker) cameranet.updateVisibility(src) - ..() + return ..() /obj/effect/New() ..() @@ -99,11 +99,11 @@ if(open_networks.len) //If there is at least one open network, chunk is available for AI usage. cameranet.addCamera(src) -/obj/machinery/camera/Del() +/obj/machinery/camera/Destroy() cameranet.cameras -= src var/list/open_networks = difflist(network,restricted_camera_networks) if(open_networks.len) cameranet.removeCamera(src) - ..() + return ..() #undef BORG_CAMERA_BUFFER \ No newline at end of file diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index de745ec80b4..a49656dbe59 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -404,18 +404,13 @@ /obj/item/weapon/grab/dropped() qdel(src) -/obj/item/weapon/grab/Del() - //make sure the grabbed_by list doesn't fill up with nulls - if(affecting) affecting.grabbed_by -= src - ..() - /obj/item/weapon/grab/Destroy() if(affecting) affecting.pixel_x = 0 affecting.pixel_y = 0 //used to be an animate, not quick enough for del'ing affecting.layer = initial(affecting.layer) affecting.grabbed_by -= src - del(hud) + qdel(hud) return ..() #undef EAT_TIME_XENO diff --git a/code/modules/mob/spirit/spirit.dm b/code/modules/mob/spirit/spirit.dm index c90f0f569b7..b5295a0d85f 100644 --- a/code/modules/mob/spirit/spirit.dm +++ b/code/modules/mob/spirit/spirit.dm @@ -29,38 +29,38 @@ mob/spirit/is_active() if (client && client.inactivity <= 10 * 60 * 10) return TRUE return FALSE - - + + mob/spirit/New() sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF see_invisible = SEE_SPIRITS see_in_dark = 100 loc = pick(latejoin) - + // no nameless spirits if (!name) name = "Boogyman" - + spirits+=src - + ..() - -mob/spirit/Del() + +mob/spirit/Destroy() spirits-=src - ..() - - + return ..() + + mob/spirit/Topic(href, href_list) - + if(usr != src) return ..() - + usr << "Spirit Href = [href]" for (var/tempref in href_list) usr << "Spirit href list [tempref] = [href_list[tempref]]" - + if (href_list["track"]) usr << "Got to tracking." var/mob/target = locate(href_list["track"]) in mob_list diff --git a/code/modules/mob/spirit/viewpoint.dm b/code/modules/mob/spirit/viewpoint.dm index 15c4937b43d..85599a52b62 100644 --- a/code/modules/mob/spirit/viewpoint.dm +++ b/code/modules/mob/spirit/viewpoint.dm @@ -23,11 +23,10 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() ..() -/obj/cult_viewpoint/Del() +/obj/cult_viewpoint/Destroy() processing_objects.Remove(src) cult_viewpoints-=src - ..() - return + return ..() // VERBS diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 61269d6b85a..2acb3109769 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -73,12 +73,6 @@ spark_system.set_up(5, 0, src) spark_system.attach(src) - -/obj/item/weapon/katana/energy/Del() - qdel(spark_system) - spark_system = null - ..() - /obj/item/weapon/katana/energy/Destroy() qdel(spark_system) spark_system = null diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 2f369244afc..0c649df0ca9 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -20,9 +20,9 @@ processing_objects.Add(src) last_regen = world.time -/obj/item/weapon/gun/launcher/spikethrower/Del() +/obj/item/weapon/gun/launcher/spikethrower/Destroy() processing_objects.Remove(src) - ..() + return ..() /obj/item/weapon/gun/launcher/spikethrower/process() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 3da05e86f8b..9f49dcf7fb6 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -48,9 +48,9 @@ ..() processing_objects.Add(src) -/obj/item/weapon/gun/energy/floragun/Del() +/obj/item/weapon/gun/energy/floragun/Destroy() processing_objects.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/floragun/process() charge_tick++ From a9f3eab66945273f5bd5e856872d9e044094c13b Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 7 Jul 2015 00:58:34 -0400 Subject: [PATCH 2/3] pass 2+fix --- code/ATMOSPHERICS/components/portables_connector.dm | 2 +- .../components/trinary_devices/trinary_base.dm | 8 ++++---- code/ATMOSPHERICS/datum_pipeline.dm | 4 ++-- code/defines/procs/sd_Alert.dm | 4 ++-- code/game/gamemodes/objective.dm | 4 ++-- code/game/jobs/job_objective.dm | 2 +- code/game/objects/structures/inflatable.dm | 4 ++-- code/modules/computer3/laptop.dm | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index 59b1174f2f3..88b2673812c 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -72,7 +72,7 @@ node = null - .return .() + return ..() /obj/machinery/atmospherics/portables_connector/initialize() if(node) return diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 655e58ea384..2b629722b91 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -2,7 +2,7 @@ obj/machinery/atmospherics/trinary dir = SOUTH initialize_directions = SOUTH|NORTH|WEST use_power = 1 - + var/on = 0 var/datum/gas_mixture/air1 @@ -54,7 +54,7 @@ obj/machinery/atmospherics/trinary return null - Del() + Destroy() loc = null if(node1) @@ -71,7 +71,7 @@ obj/machinery/atmospherics/trinary node2 = null node3 = null - ..() + return ..() initialize() if(node1 && node2 && node3) return @@ -163,7 +163,7 @@ obj/machinery/atmospherics/trinary else if(reference==node3) del(network3) node3 = null - + update_underlays() return null \ No newline at end of file diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index 18a27f9c18d..13073fb7407 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -10,7 +10,7 @@ datum/pipeline var/alert_pressure = 0 - Del() + Destroy() if(network) del(network) @@ -18,7 +18,7 @@ datum/pipeline temporarily_store_air() del(air) - ..() + return ..() proc/process()//This use to be called called from the pipe networks diff --git a/code/defines/procs/sd_Alert.dm b/code/defines/procs/sd_Alert.dm index c63cab8f8b7..a6927491092 100644 --- a/code/defines/procs/sd_Alert.dm +++ b/code/defines/procs/sd_Alert.dm @@ -93,9 +93,9 @@ sd_alert response list/validation - Del() + Destroy() target << browse(null,"window=\ref[src]") - ..() + return ..() New(who, tag) ..() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 08d1eea5ca7..e49914896ad 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -20,9 +20,9 @@ datum/objective if(text) explanation_text = text - Del() + Destroy() all_objectives -= src - ..() + return ..() proc/check_completion() return completed diff --git a/code/game/jobs/job_objective.dm b/code/game/jobs/job_objective.dm index 43a15d88ea7..1efb8ba0c76 100644 --- a/code/game/jobs/job_objective.dm +++ b/code/game/jobs/job_objective.dm @@ -22,7 +22,7 @@ owner=new_owner owner.job_objectives += src -/datum/job_objective/Del() +/datum/job_objective/Destroy() /datum/job_objective/proc/get_description() return "Placeholder objective." diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index fe5171d84c9..bbce5440dd8 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -30,9 +30,9 @@ ..() air_update_turf() - Del() + Destroy() air_update_turf() - ..() + return ..() CanPass(atom/movable/mover, turf/target, height=0, air_group=0) return 0 diff --git a/code/modules/computer3/laptop.dm b/code/modules/computer3/laptop.dm index bd45c044748..6880935e495 100644 --- a/code/modules/computer3/laptop.dm +++ b/code/modules/computer3/laptop.dm @@ -180,13 +180,13 @@ else stat &= ~NOPOWER - Del() + Destroy() if(istype(loc,/obj/item/device/laptop)) var/obj/O = loc spawn(5) if(O) - del O - ..() + qdel(O) + return ..() AltClick() From 561e0c226857e17014c71d854ce19af8cdcf0c43 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 7 Jul 2015 01:32:40 -0400 Subject: [PATCH 3/3] pass 3 and cleanup --- code/ATMOSPHERICS/mainspipe.dm | 6 +- code/game/objects/items/devices/PDA/PDA.dm | 67 ---------------------- code/game/turfs/simulated/walls.dm | 4 +- code/modules/mob/living/silicon/ai/ai.dm | 4 +- 4 files changed, 8 insertions(+), 73 deletions(-) diff --git a/code/ATMOSPHERICS/mainspipe.dm b/code/ATMOSPHERICS/mainspipe.dm index 631f3530a24..2c0a7989533 100644 --- a/code/ATMOSPHERICS/mainspipe.dm +++ b/code/ATMOSPHERICS/mainspipe.dm @@ -37,7 +37,7 @@ obj/machinery/atmospherics/mains_pipe layer = 2.4 //under wires with their 2.5 force = 20 - + var/volume = 0 var/alert_pressure = 80*ONE_ATMOSPHERE @@ -99,9 +99,9 @@ obj/machinery/atmospherics/mains_pipe for(var/obj/machinery/atmospherics/pipe/mains_component/node in nodes) node.disconnect() - Del() + Destroy() disconnect() - ..() + return ..() initialize() for(var/i = 1 to nodes.len) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index c0a5bce63b2..667c37c882f 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -812,73 +812,6 @@ var/global/list/obj/item/device/pda/PDAs = list() return 1 // return 1 tells it to refresh the UI in NanoUI - -/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P) - //TODO: sometimes these attacks show up on the message server - var/i = rand(1,100) - var/j = rand(0,1) //Possibility of losing the PDA after the detonation - var/message = "" - var/mob/living/M = null - if(ismob(P.loc)) - M = P.loc - - //switch(i) //Yes, the overlapping cases are intended. - if(i<=10) //The traditional explosion - P.explode() - j=1 - message += "Your [P] suddenly explodes!" - if(i>=10 && i<= 20) //The PDA burns a hole in the holder. - j=1 - if(M && isliving(M)) - M.apply_damage( rand(30,60) , BURN) - message += "You feel a searing heat! Your [P] is burning!" - if(i>=20 && i<=25) //EMP - empulse(P.loc, 3, 6, 1) - message += "Your [P] emits a wave of electromagnetic energy!" - if(i>=25 && i<=40) //Smoke - var/datum/effect/effect/system/harmless_smoke_spread/S = new /datum/effect/effect/system/harmless_smoke_spread //Why was this chem_smoke_spread when there are no chems involved? - S.attach(P.loc) - S.set_up(P, 10, 0, P.loc) - playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3) - S.start() - message += "Large clouds of smoke billow forth from your [P]!" - if(i>=40 && i<=45) //Bad smoke - var/datum/effect/effect/system/bad_smoke_spread/B = new /datum/effect/effect/system/bad_smoke_spread - B.attach(P.loc) - B.set_up(P, 10, 0, P.loc) - playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3) - B.start() - message += "Large clouds of noxious smoke billow forth from your [P]!" - if(i>=65 && i<=75) //Weaken - if(M && isliving(M)) - M.apply_effects(0,1) - message += "Your [P] flashes with a blinding white light! You feel weaker." - if(i>=75 && i<=85) //Stun and stutter - if(M && isliving(M)) - M.apply_effects(1,0,0,0,1) - message += "Your [P] flashes with a blinding white light! You feel weaker." - if(i>=85) //Sparks - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(2, 1, P.loc) - s.start() - message += "Your [P] begins to spark violently!" - if(i>45 && i<65 && prob(50)) //Nothing happens - message += "Your [P] bleeps loudly." - j = prob(10) - - if(j) //This kills the PDA - P.Del() - if(message) - message += "It melts in a puddle of plastic." - else - message += "Your [P] shatters in a thousand pieces!" - - JFLOG("[M]'s PDA Detonated >>> [message]") - - if(M && isliving(M)) - message = "\red" + message - M.show_message(message, 1) - /obj/item/device/pda/proc/remove_id() if (id) if (ismob(loc)) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 1ffea6a4d93..8771ce02bd4 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -34,7 +34,9 @@ /turf/simulated/wall/Del() - for(var/obj/effect/E in src) if(E.name == "Wallrot") del E + for(var/obj/effect/E in src) + if(E.name == "Wallrot") + qdel(E) /turf/simulated/wall/ChangeTurf(var/newtype) for(var/obj/effect/E in src) if(E.name == "Wallrot") del E diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 5324628ef90..63573fb70b0 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -243,7 +243,7 @@ var/list/ai_verbs_default = list( /obj/machinery/ai_powersupply/New(var/mob/living/silicon/ai/ai=null) powered_ai = ai if(isnull(powered_ai)) - Del() + qdel(src) loc = powered_ai.loc use_power(1) // Just incase we need to wake up the power system. @@ -252,7 +252,7 @@ var/list/ai_verbs_default = list( /obj/machinery/ai_powersupply/process() if(!powered_ai || powered_ai.stat & DEAD) - Del() + qdel(src) if(!powered_ai.anchored) loc = powered_ai.loc use_power = 0