cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

makes all Destroy()'s return properly

Browse Source
This commit is contained in:
duncathan
2015-08-31 00:21:01 -06:00
parent 529059c3f1
commit 51c09f16bf
172 changed files with 208 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+1 -1
View File
@@ -35,7 +35,7 @@ Acts like a normal vent, but has an input AND output.
/obj/machinery/atmospherics/components/binary/dp_vent_pump/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
..()
return ..()
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume
name = "large dual-port air vent"
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+1 -1
View File
@@ -25,7 +25,7 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
..()
return ..()
/obj/machinery/atmospherics/components/binary/passive_gate/update_icon_nopipes()
if(!on)
code/ATMOSPHERICS/components/binary_devices/pump.dm
+1 -1
View File
@@ -29,7 +29,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/pump/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
..()
return ..()
/obj/machinery/atmospherics/components/binary/pump/on
on = 1
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+1 -1
View File
@@ -29,7 +29,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
..()
return ..()
/obj/machinery/atmospherics/components/binary/volume_pump/on
on = 1
code/ATMOSPHERICS/components/components_base.dm
+1 -1
View File
@@ -90,7 +90,7 @@ Pipenet stuff; housekeeping
N.disconnect(src)
nodes["n[I]"] = null
nullifyPipenet(parents["p[I]"])
..()
return ..()
/obj/machinery/atmospherics/components/atmosinit(var/list/node_connects)
for(var/I = 1; I <= device_type; I++)
code/ATMOSPHERICS/components/trinary_devices/filter.dm
+1 -1
View File
@@ -47,7 +47,7 @@ Filter types:
/obj/machinery/atmospherics/components/trinary/filter/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
..()
return ..()
/obj/machinery/atmospherics/components/trinary/filter/update_icon()
overlays.Cut()
code/ATMOSPHERICS/components/unary_devices/cryo.dm
+1 -1
View File
@@ -44,7 +44,7 @@
if(beaker)
beaker.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube
beaker = null
..()
return ..()
/obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos()
..()
var/datum/gas_mixture/air_contents = airs[AIR1]
code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
..()
return ..()
/obj/machinery/atmospherics/components/unary/outlet_injector/on
on = 1
code/ATMOSPHERICS/components/unary_devices/portables_connector.dm
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/Destroy()
if(connected_device)
connected_device.disconnect()
..()
return ..()
/obj/machinery/atmospherics/components/unary/portables_connector/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
+2 -2
View File
@@ -59,7 +59,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
..()
return ..()
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume
name = "large air vent"
@@ -305,7 +305,7 @@
if(initial_loc)
initial_loc.air_vent_info -= id_tag
initial_loc.air_vent_names -= id_tag
..()
return ..()
/obj/machinery/atmospherics/components/unary/vent_pump/can_crawl_through()
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+1 -1
View File
@@ -51,7 +51,7 @@
if(initial_loc)
initial_loc.air_scrub_info -= id_tag
initial_loc.air_scrub_names -= id_tag
..()
return ..()
/obj/machinery/atmospherics/components/unary/vent_scrubber/auto_use_power()
if(!powered(power_channel))
return 0