mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
initialize() should now always be called, be it on game starting up or object being created after game start.
Partially fixes #9036.
This commit is contained in:
@@ -54,9 +54,6 @@
|
|||||||
air2.volume = ATMOS_DEFAULT_VOLUME_FILTER
|
air2.volume = ATMOS_DEFAULT_VOLUME_FILTER
|
||||||
air3.volume = ATMOS_DEFAULT_VOLUME_FILTER
|
air3.volume = ATMOS_DEFAULT_VOLUME_FILTER
|
||||||
|
|
||||||
if(radio_controller)
|
|
||||||
initialize()
|
|
||||||
|
|
||||||
/obj/machinery/atmospherics/trinary/filter/update_icon()
|
/obj/machinery/atmospherics/trinary/filter/update_icon()
|
||||||
if(istype(src, /obj/machinery/atmospherics/trinary/filter/m_filter))
|
if(istype(src, /obj/machinery/atmospherics/trinary/filter/m_filter))
|
||||||
icon_state = "m"
|
icon_state = "m"
|
||||||
|
|||||||
@@ -73,9 +73,6 @@
|
|||||||
if (!id_tag)
|
if (!id_tag)
|
||||||
assign_uid()
|
assign_uid()
|
||||||
id_tag = num2text(uid)
|
id_tag = num2text(uid)
|
||||||
if(ticker && ticker.current_state == 3)//if the game is running
|
|
||||||
src.initialize()
|
|
||||||
src.broadcast_status()
|
|
||||||
|
|
||||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume
|
/obj/machinery/atmospherics/unary/vent_pump/high_volume
|
||||||
name = "Large Air Vent"
|
name = "Large Air Vent"
|
||||||
@@ -259,11 +256,12 @@
|
|||||||
/obj/machinery/atmospherics/unary/vent_pump/initialize()
|
/obj/machinery/atmospherics/unary/vent_pump/initialize()
|
||||||
..()
|
..()
|
||||||
|
|
||||||
//some vents work his own spesial way
|
//some vents work his own special way
|
||||||
radio_filter_in = frequency==1439?(RADIO_FROM_AIRALARM):null
|
radio_filter_in = frequency==1439?(RADIO_FROM_AIRALARM):null
|
||||||
radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null
|
radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null
|
||||||
if(frequency)
|
if(frequency)
|
||||||
set_frequency(frequency)
|
set_frequency(frequency)
|
||||||
|
src.broadcast_status()
|
||||||
|
|
||||||
/obj/machinery/atmospherics/unary/vent_pump/receive_signal(datum/signal/signal)
|
/obj/machinery/atmospherics/unary/vent_pump/receive_signal(datum/signal/signal)
|
||||||
if(stat & (NOPOWER|BROKEN))
|
if(stat & (NOPOWER|BROKEN))
|
||||||
|
|||||||
@@ -42,9 +42,6 @@
|
|||||||
if (!id_tag)
|
if (!id_tag)
|
||||||
assign_uid()
|
assign_uid()
|
||||||
id_tag = num2text(uid)
|
id_tag = num2text(uid)
|
||||||
if(ticker && ticker.current_state == 3)//if the game is running
|
|
||||||
src.initialize()
|
|
||||||
src.broadcast_status()
|
|
||||||
|
|
||||||
/obj/machinery/atmospherics/unary/vent_scrubber/update_icon(var/safety = 0)
|
/obj/machinery/atmospherics/unary/vent_scrubber/update_icon(var/safety = 0)
|
||||||
if(!check_icon_cache())
|
if(!check_icon_cache())
|
||||||
@@ -121,6 +118,7 @@
|
|||||||
radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null
|
radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null
|
||||||
if (frequency)
|
if (frequency)
|
||||||
set_frequency(frequency)
|
set_frequency(frequency)
|
||||||
|
src.broadcast_status()
|
||||||
|
|
||||||
/obj/machinery/atmospherics/unary/vent_scrubber/process()
|
/obj/machinery/atmospherics/unary/vent_scrubber/process()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -45,8 +45,6 @@ obj/machinery/atmospherics/pipe/zpipe/New()
|
|||||||
initialize_directions = EAST
|
initialize_directions = EAST
|
||||||
if(SOUTHWEST)
|
if(SOUTHWEST)
|
||||||
initialize_directions = SOUTH
|
initialize_directions = SOUTH
|
||||||
initialize()
|
|
||||||
|
|
||||||
|
|
||||||
obj/machinery/atmospherics/pipe/zpipe/hide(var/i)
|
obj/machinery/atmospherics/pipe/zpipe/hide(var/i)
|
||||||
if(level == 1 && istype(loc, /turf/simulated))
|
if(level == 1 && istype(loc, /turf/simulated))
|
||||||
|
|||||||
@@ -38,6 +38,10 @@
|
|||||||
|
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
|
||||||
|
/atom/movable/proc/initialize()
|
||||||
|
return
|
||||||
|
|
||||||
/atom/movable/Bump(var/atom/A, yes)
|
/atom/movable/Bump(var/atom/A, yes)
|
||||||
if(src.throwing)
|
if(src.throwing)
|
||||||
src.throw_impact(A)
|
src.throw_impact(A)
|
||||||
|
|||||||
@@ -118,8 +118,6 @@
|
|||||||
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
|
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
|
||||||
pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
|
pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
|
||||||
update_icon()
|
update_icon()
|
||||||
if(ticker && ticker.current_state == 3)//if the game is running
|
|
||||||
src.initialize()
|
|
||||||
return
|
return
|
||||||
|
|
||||||
first_run()
|
first_run()
|
||||||
|
|||||||
@@ -67,12 +67,6 @@
|
|||||||
/obj/machinery/air_sensor/initialize()
|
/obj/machinery/air_sensor/initialize()
|
||||||
set_frequency(frequency)
|
set_frequency(frequency)
|
||||||
|
|
||||||
/obj/machinery/air_sensor/New()
|
|
||||||
..()
|
|
||||||
|
|
||||||
if(radio_controller)
|
|
||||||
set_frequency(frequency)
|
|
||||||
|
|
||||||
obj/machinery/air_sensor/Destroy()
|
obj/machinery/air_sensor/Destroy()
|
||||||
if(radio_controller)
|
if(radio_controller)
|
||||||
radio_controller.remove_object(src,frequency)
|
radio_controller.remove_object(src,frequency)
|
||||||
|
|||||||
@@ -9,12 +9,6 @@
|
|||||||
var/circuit = null //The path to the circuit board type. If circuit==null, the computer can't be disassembled.
|
var/circuit = null //The path to the circuit board type. If circuit==null, the computer can't be disassembled.
|
||||||
var/processing = 0
|
var/processing = 0
|
||||||
|
|
||||||
/obj/machinery/computer/New()
|
|
||||||
..()
|
|
||||||
if(ticker)
|
|
||||||
initialize()
|
|
||||||
|
|
||||||
|
|
||||||
/obj/machinery/computer/initialize()
|
/obj/machinery/computer/initialize()
|
||||||
power_change()
|
power_change()
|
||||||
|
|
||||||
|
|||||||
@@ -58,10 +58,9 @@
|
|||||||
icon_state = "cart-s"
|
icon_state = "cart-s"
|
||||||
access_security = 1
|
access_security = 1
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/security/New()
|
/obj/item/weapon/cartridge/security/initialize()
|
||||||
..()
|
|
||||||
spawn(5)
|
|
||||||
radio = new /obj/item/radio/integrated/beepsky(src)
|
radio = new /obj/item/radio/integrated/beepsky(src)
|
||||||
|
..()
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/detective
|
/obj/item/weapon/cartridge/detective
|
||||||
name = "\improper D.E.T.E.C.T. cartridge"
|
name = "\improper D.E.T.E.C.T. cartridge"
|
||||||
@@ -102,6 +101,7 @@
|
|||||||
/obj/item/weapon/cartridge/signal
|
/obj/item/weapon/cartridge/signal
|
||||||
name = "generic signaler cartridge"
|
name = "generic signaler cartridge"
|
||||||
desc = "A data cartridge with an integrated radio signaler module."
|
desc = "A data cartridge with an integrated radio signaler module."
|
||||||
|
var/qdeled = 0
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/signal/science
|
/obj/item/weapon/cartridge/signal/science
|
||||||
name = "\improper Signal Ace 2 cartridge"
|
name = "\improper Signal Ace 2 cartridge"
|
||||||
@@ -110,10 +110,9 @@
|
|||||||
access_reagent_scanner = 1
|
access_reagent_scanner = 1
|
||||||
access_atmos = 1
|
access_atmos = 1
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/signal/New()
|
/obj/item/weapon/cartridge/signal/initialize()
|
||||||
..()
|
|
||||||
spawn(5)
|
|
||||||
radio = new /obj/item/radio/integrated/signal(src)
|
radio = new /obj/item/radio/integrated/signal(src)
|
||||||
|
..()
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/signal/Destroy()
|
/obj/item/weapon/cartridge/signal/Destroy()
|
||||||
qdel(radio)
|
qdel(radio)
|
||||||
@@ -125,10 +124,9 @@
|
|||||||
icon_state = "cart-q"
|
icon_state = "cart-q"
|
||||||
access_quartermaster = 1
|
access_quartermaster = 1
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/quartermaster/New()
|
/obj/item/weapon/cartridge/quartermaster/initialize()
|
||||||
..()
|
|
||||||
spawn(5)
|
|
||||||
radio = new /obj/item/radio/integrated/mule(src)
|
radio = new /obj/item/radio/integrated/mule(src)
|
||||||
|
..()
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/head
|
/obj/item/weapon/cartridge/head
|
||||||
name = "\improper Easy-Record DELUXE"
|
name = "\improper Easy-Record DELUXE"
|
||||||
@@ -143,9 +141,7 @@
|
|||||||
access_janitor = 1
|
access_janitor = 1
|
||||||
access_security = 1
|
access_security = 1
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/hop/New()
|
/obj/item/weapon/cartridge/hop/initialize()
|
||||||
..()
|
|
||||||
spawn(5)
|
|
||||||
radio = new /obj/item/radio/integrated/mule(src)
|
radio = new /obj/item/radio/integrated/mule(src)
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/hos
|
/obj/item/weapon/cartridge/hos
|
||||||
@@ -154,10 +150,9 @@
|
|||||||
access_status_display = 1
|
access_status_display = 1
|
||||||
access_security = 1
|
access_security = 1
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/hos/New()
|
/obj/item/weapon/cartridge/hos/initialize()
|
||||||
..()
|
|
||||||
spawn(5)
|
|
||||||
radio = new /obj/item/radio/integrated/beepsky(src)
|
radio = new /obj/item/radio/integrated/beepsky(src)
|
||||||
|
..()
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/ce
|
/obj/item/weapon/cartridge/ce
|
||||||
name = "\improper Power-On DELUXE"
|
name = "\improper Power-On DELUXE"
|
||||||
@@ -180,10 +175,9 @@
|
|||||||
access_reagent_scanner = 1
|
access_reagent_scanner = 1
|
||||||
access_atmos = 1
|
access_atmos = 1
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/rd/New()
|
/obj/item/weapon/cartridge/rd/initialize()
|
||||||
..()
|
|
||||||
spawn(5)
|
|
||||||
radio = new /obj/item/radio/integrated/signal(src)
|
radio = new /obj/item/radio/integrated/signal(src)
|
||||||
|
..()
|
||||||
|
|
||||||
/obj/item/weapon/cartridge/captain
|
/obj/item/weapon/cartridge/captain
|
||||||
name = "\improper Value-PAK cartridge"
|
name = "\improper Value-PAK cartridge"
|
||||||
|
|||||||
@@ -217,12 +217,10 @@
|
|||||||
var/last_transmission
|
var/last_transmission
|
||||||
var/datum/radio_frequency/radio_connection
|
var/datum/radio_frequency/radio_connection
|
||||||
|
|
||||||
New()
|
|
||||||
..()
|
|
||||||
if(radio_controller)
|
|
||||||
initialize()
|
initialize()
|
||||||
|
if(!radio_controller)
|
||||||
|
return
|
||||||
|
|
||||||
initialize()
|
|
||||||
if (src.frequency < 1441 || src.frequency > 1489)
|
if (src.frequency < 1441 || src.frequency > 1489)
|
||||||
src.frequency = sanitize_frequency(src.frequency)
|
src.frequency = sanitize_frequency(src.frequency)
|
||||||
|
|
||||||
|
|||||||
@@ -42,8 +42,6 @@
|
|||||||
/obj/item/device/radio/New()
|
/obj/item/device/radio/New()
|
||||||
..()
|
..()
|
||||||
wires = new(src)
|
wires = new(src)
|
||||||
if(radio_controller)
|
|
||||||
initialize()
|
|
||||||
|
|
||||||
/obj/item/device/radio/Destroy()
|
/obj/item/device/radio/Destroy()
|
||||||
qdel(wires)
|
qdel(wires)
|
||||||
|
|||||||
@@ -61,9 +61,6 @@
|
|||||||
else
|
else
|
||||||
return null
|
return null
|
||||||
|
|
||||||
/atom/movable/proc/initialize()
|
|
||||||
return
|
|
||||||
|
|
||||||
/obj/proc/updateUsrDialog()
|
/obj/proc/updateUsrDialog()
|
||||||
if(in_use)
|
if(in_use)
|
||||||
var/is_in_use = 0
|
var/is_in_use = 0
|
||||||
|
|||||||
@@ -308,12 +308,6 @@ var/list/solars_list = list()
|
|||||||
/obj/machinery/power/solar_control/drain_power()
|
/obj/machinery/power/solar_control/drain_power()
|
||||||
return -1
|
return -1
|
||||||
|
|
||||||
/obj/machinery/power/solar_control/New()
|
|
||||||
..()
|
|
||||||
if(ticker)
|
|
||||||
initialize()
|
|
||||||
connect_to_network()
|
|
||||||
|
|
||||||
/obj/machinery/power/solar_control/Destroy()
|
/obj/machinery/power/solar_control/Destroy()
|
||||||
for(var/obj/machinery/power/solar/M in connected_panels)
|
for(var/obj/machinery/power/solar/M in connected_panels)
|
||||||
M.unset_control()
|
M.unset_control()
|
||||||
@@ -368,6 +362,7 @@ var/list/solars_list = list()
|
|||||||
..()
|
..()
|
||||||
if(!powernet) return
|
if(!powernet) return
|
||||||
set_panels(cdir)
|
set_panels(cdir)
|
||||||
|
connect_to_network()
|
||||||
|
|
||||||
/obj/machinery/power/solar_control/update_icon()
|
/obj/machinery/power/solar_control/update_icon()
|
||||||
if(stat & BROKEN)
|
if(stat & BROKEN)
|
||||||
|
|||||||
Reference in New Issue
Block a user