cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 00:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1467 from Fox-McCloud/del-the-dels

Browse Source 
Replaces Remaining Del()'s
This commit is contained in:
TheDZD
2015-07-07 19:07:53 -04:00
parent db8767265a 561e0c2268
commit b02cd94168
35 changed files with 103 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/omni_devices/filter.dm
+10 -10
View File
@@ -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
code/ATMOSPHERICS/components/omni_devices/mixer.dm
+3 -3
View File
@@ -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)
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+6 -6
View File
@@ -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
code/ATMOSPHERICS/components/portables_connector.dm
+3 -3
View File
@@ -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
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
+4 -4
View File
@@ -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
code/ATMOSPHERICS/components/tvalve.dm
+2 -2
View File
@@ -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()
code/ATMOSPHERICS/components/valve.dm
+2 -2
View File
@@ -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
code/ATMOSPHERICS/datum_pipeline.dm
+2 -2
View File
@@ -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
code/ATMOSPHERICS/mainspipe.dm
+3 -3
View File
@@ -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)
code/defines/procs/sd_Alert.dm
+2 -2
View File
@@ -93,9 +93,9 @@ sd_alert
response
list/validation
Del()
Destroy()
target << browse(null,"window=\ref[src]")
..()
return ..()
New(who, tag)
..()
code/game/gamemodes/cult/ritual.dm
+2 -2
View File
@@ -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)
code/game/gamemodes/objective.dm
+2 -2
View File
@@ -20,9 +20,9 @@ datum/objective
if(text)
explanation_text = text
Del()
Destroy()
all_objectives -= src
..()
return ..()
proc/check_completion()
return completed
code/game/jobs/job_objective.dm
+1 -1
View File
@@ -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."
code/game/machinery/hologram.dm
+2 -2
View File
@@ -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.
code/game/machinery/telecomms/broadcaster.dm
+2 -2
View File
@@ -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 ..()
/*
code/game/machinery/telecomms/telecomunications.dm
+2 -2
View File
@@ -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)
code/game/machinery/turret_control.dm
+2 -2
View File
@@ -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)
code/game/objects/effects/decals/Cleanable/humans.dm
+2 -2
View File
@@ -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()
..()
code/game/objects/items/devices/PDA/PDA.dm
-67
View File
@@ -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))
code/game/objects/items/devices/multitool.dm
+2 -2
View File
@@ -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()
code/game/objects/items/devices/uplinks.dm
+5 -5
View File
@@ -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
code/game/objects/structures/inflatable.dm
+2 -2
View File
@@ -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
code/game/turfs/simulated/walls.dm
+3 -1
View File
@@ -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
code/modules/computer3/laptop.dm
+3 -3
View File
@@ -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()
code/modules/food/customizables.dm
+3 -3
View File
@@ -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()
..()
code/modules/mob/holder.dm
+2 -2
View File
@@ -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()
code/modules/mob/living/silicon/ai/ai.dm
+2 -2
View File
@@ -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
code/modules/mob/living/silicon/ai/freelook/eye.dm
+3 -3
View File
@@ -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))
code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
+6 -6
View File
@@ -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
code/modules/mob/mob_grab.dm
+1 -6
View File
@@ -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
code/modules/mob/spirit/spirit.dm
+13 -13
View File
@@ -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
code/modules/mob/spirit/viewpoint.dm
+2 -3
View File
@@ -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
code/modules/ninja/energy_katana.dm
-6
View File
@@ -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
code/modules/projectiles/guns/alien.dm
+2 -2
View File
@@ -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()
code/modules/projectiles/guns/energy/special.dm
+2 -2
View File
@@ -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++