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()