cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update every initialize() proc to return an initialize hint.

Browse Source 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
This commit is contained in:
Leshana
2018-01-26 18:50:55 -05:00
parent ef73c090ab
commit cef001bf2a
114 changed files with 196 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
View File

@@ -194,7 +194,7 @@
return 1 return 1
/obj/machinery/atmospherics/binary/dp_vent_pump/initialize() /obj/machinery/atmospherics/binary/dp_vent_pump/initialize()
..() . = ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)

2
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
View File

@@ -128,7 +128,7 @@
return 1 return 1
/obj/machinery/atmospherics/binary/passive_gate/initialize() /obj/machinery/atmospherics/binary/passive_gate/initialize()
..() . = ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)

2
code/ATMOSPHERICS/components/binary_devices/pump.dm
View File

@@ -148,7 +148,7 @@ Thus, the two variables affect pump operation are set in New():
ui.set_auto_update(1) // auto update every Master Controller tick ui.set_auto_update(1) // auto update every Master Controller tick
/obj/machinery/atmospherics/binary/pump/initialize() /obj/machinery/atmospherics/binary/pump/initialize()
..() . = ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)

5
code/ATMOSPHERICS/components/trinary_devices/filter.dm
View File

@@ -129,8 +129,9 @@
return 1 return 1
/obj/machinery/atmospherics/trinary/atmos_filter/initialize() /obj/machinery/atmospherics/trinary/atmos_filter/initialize()
set_frequency(frequency) . = ..()
..() if(frequency)
set_frequency(frequency)
/obj/machinery/atmospherics/trinary/atmos_filter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) /obj/machinery/atmospherics/trinary/atmos_filter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if (!istype(W, /obj/item/weapon/wrench)) if (!istype(W, /obj/item/weapon/wrench))

4
code/ATMOSPHERICS/components/tvalve.dm
View File

@@ -318,7 +318,7 @@
/obj/machinery/atmospherics/tvalve/digital/initialize() /obj/machinery/atmospherics/tvalve/digital/initialize()
..() . = ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)
@@ -458,7 +458,7 @@
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/atmospherics/tvalve/mirrored/digital/initialize() /obj/machinery/atmospherics/tvalve/mirrored/digital/initialize()
..() . = ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)

6
code/ATMOSPHERICS/components/unary/outlet_injector.dm
View File

@@ -123,9 +123,9 @@
return 1 return 1
/obj/machinery/atmospherics/unary/outlet_injector/initialize() /obj/machinery/atmospherics/unary/outlet_injector/initialize()
..() . = ..()
if(frequency)
set_frequency(frequency) set_frequency(frequency)
/obj/machinery/atmospherics/unary/outlet_injector/receive_signal(datum/signal/signal) /obj/machinery/atmospherics/unary/outlet_injector/receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))

2
code/ATMOSPHERICS/components/valve.dm
View File

@@ -266,7 +266,7 @@
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/atmospherics/valve/digital/initialize() /obj/machinery/atmospherics/valve/digital/initialize()
..() . = ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)

1
code/__defines/qdel.dm
View File

@@ -18,5 +18,6 @@
#define GC_QUEUED_FOR_HARD_DEL -2 #define GC_QUEUED_FOR_HARD_DEL -2
#define GC_CURRENTLY_BEING_QDELETED -3 #define GC_CURRENTLY_BEING_QDELETED -3
#define QDELING(X) (X.gc_destroyed)
#define QDELETED(X) (!X || X.gc_destroyed) #define QDELETED(X) (!X || X.gc_destroyed)
#define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) #define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)

16
code/controllers/master_controller.dm
View File

@@ -42,16 +42,16 @@ datum/controller/game_controller/proc/setup()
transfer_controller = new transfer_controller = new
admin_notice("<span class='danger'>Initializations complete.</span>", R_DEBUG) admin_notice("<span class='danger'>Initializations complete.</span>", R_DEBUG)
#if UNIT_TEST // #if UNIT_TEST
#define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed. // #define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed.
#else // #else
#define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); } // #define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); }
#endif // #endif
datum/controller/game_controller/proc/setup_objects() datum/controller/game_controller/proc/setup_objects()
#if !UNIT_TEST // #if !UNIT_TEST
var/initialized_objects = 0 // var/initialized_objects = 0
#endif // #endif
// Set up antagonists. // Set up antagonists.
populate_antag_type_list() populate_antag_type_list()

22
code/datums/mind.dm
View File

@@ -503,53 +503,53 @@
//slime //slime
/mob/living/simple_animal/slime/mind_initialize() /mob/living/simple_animal/slime/mind_initialize()
..() . = ..()
mind.assigned_role = "slime" mind.assigned_role = "slime"
/mob/living/carbon/alien/larva/mind_initialize() /mob/living/carbon/alien/larva/mind_initialize()
..() . = ..()
mind.special_role = "Larva" mind.special_role = "Larva"
//AI //AI
/mob/living/silicon/ai/mind_initialize() /mob/living/silicon/ai/mind_initialize()
..() . = ..()
mind.assigned_role = "AI" mind.assigned_role = "AI"
//BORG //BORG
/mob/living/silicon/robot/mind_initialize() /mob/living/silicon/robot/mind_initialize()
..() . = ..()
mind.assigned_role = "Cyborg" mind.assigned_role = "Cyborg"
//PAI //PAI
/mob/living/silicon/pai/mind_initialize() /mob/living/silicon/pai/mind_initialize()
..() . = ..()
mind.assigned_role = "pAI" mind.assigned_role = "pAI"
mind.special_role = "" mind.special_role = ""
//Animals //Animals
/mob/living/simple_animal/mind_initialize() /mob/living/simple_animal/mind_initialize()
..() . = ..()
mind.assigned_role = "Animal" mind.assigned_role = "Animal"
/mob/living/simple_animal/corgi/mind_initialize() /mob/living/simple_animal/corgi/mind_initialize()
..() . = ..()
mind.assigned_role = "Corgi" mind.assigned_role = "Corgi"
/mob/living/simple_animal/shade/mind_initialize() /mob/living/simple_animal/shade/mind_initialize()
..() . = ..()
mind.assigned_role = "Shade" mind.assigned_role = "Shade"
/mob/living/simple_animal/construct/builder/mind_initialize() /mob/living/simple_animal/construct/builder/mind_initialize()
..() . = ..()
mind.assigned_role = "Artificer" mind.assigned_role = "Artificer"
mind.special_role = "Cultist" mind.special_role = "Cultist"
/mob/living/simple_animal/construct/wraith/mind_initialize() /mob/living/simple_animal/construct/wraith/mind_initialize()
..() . = ..()
mind.assigned_role = "Wraith" mind.assigned_role = "Wraith"
mind.special_role = "Cultist" mind.special_role = "Cultist"
/mob/living/simple_animal/construct/armoured/mind_initialize() /mob/living/simple_animal/construct/armoured/mind_initialize()
..() . = ..()
mind.assigned_role = "Juggernaut" mind.assigned_role = "Juggernaut"
mind.special_role = "Cultist" mind.special_role = "Cultist"

3
code/game/area/areas.dm
View File

@@ -27,6 +27,9 @@
/area/initialize() /area/initialize()
. = ..() . = ..()
return INITIALIZE_HINT_LATELOAD // Areas tradiationally are initialized AFTER other atoms.
/area/LateInitialize()
if(!requires_power || !apc) if(!requires_power || !apc)
power_light = 0 power_light = 0
power_equip = 0 power_equip = 0

1
code/game/machinery/Sleeper.dm
View File

@@ -95,6 +95,7 @@
RefreshParts() RefreshParts()
/obj/machinery/sleeper/initialize() /obj/machinery/sleeper/initialize()
. = ..()
update_icon() update_icon()
/obj/machinery/sleeper/process() /obj/machinery/sleeper/process()

2
code/game/machinery/alarm.dm
View File

@@ -131,6 +131,7 @@
/obj/machinery/alarm/initialize() /obj/machinery/alarm/initialize()
. = ..()
set_frequency(frequency) set_frequency(frequency)
if(!master_is_operating()) if(!master_is_operating())
elect_master() elect_master()
@@ -991,6 +992,7 @@ FIRE ALARM
update_icon() update_icon()
/obj/machinery/firealarm/initialize() /obj/machinery/firealarm/initialize()
. = ..()
if(z in using_map.contact_levels) if(z in using_map.contact_levels)
set_security_level(security_level? get_security_level() : "green") set_security_level(security_level? get_security_level() : "green")

10
code/game/machinery/atmo_control.dm
View File

@@ -64,12 +64,14 @@
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/air_sensor/initialize() /obj/machinery/air_sensor/initialize()
set_frequency(frequency) . = ..()
if(frequency)
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)
..() . = ..()
/obj/machinery/computer/general_air_control /obj/machinery/computer/general_air_control
icon_keyboard = "atmos_key" icon_keyboard = "atmos_key"
@@ -128,7 +130,9 @@ obj/machinery/computer/general_air_control/Destroy()
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/computer/general_air_control/initialize() /obj/machinery/computer/general_air_control/initialize()
set_frequency(frequency) . = ..()
if(frequency)
set_frequency(frequency)
/obj/machinery/computer/general_air_control/large_tank_control /obj/machinery/computer/general_air_control/large_tank_control
icon = 'icons/obj/computer.dmi' icon = 'icons/obj/computer.dmi'

9
code/game/machinery/atmoalter/meter.dm
View File

@@ -12,17 +12,10 @@
use_power = 1 use_power = 1
idle_power_usage = 15 idle_power_usage = 15
/obj/machinery/meter/New()
..()
spawn(5)
target = select_target()
return 1
/obj/machinery/meter/initialize() /obj/machinery/meter/initialize()
. = ..() . = ..()
if (!target) if (!target)
spawn(5) target = select_target()
target = select_target()
/obj/machinery/meter/Destroy() /obj/machinery/meter/Destroy()
pipes_on_turf.Cut() pipes_on_turf.Cut()

2
code/game/machinery/computer/camera.dm
View File

@@ -224,7 +224,7 @@
var/obj/item/device/radio/radio = null var/obj/item/device/radio/radio = null
/obj/machinery/computer/security/telescreen/entertainment/initialize() /obj/machinery/computer/security/telescreen/entertainment/initialize()
..() . = ..()
radio = new(src) radio = new(src)
radio.listening = TRUE radio.listening = TRUE
radio.broadcasting = FALSE radio.broadcasting = FALSE

2
code/game/machinery/computer/cloning.dm
View File

@@ -17,7 +17,7 @@
/obj/machinery/computer/cloning/initialize() /obj/machinery/computer/cloning/initialize()
..() . = ..()
updatemodules() updatemodules()
/obj/machinery/computer/cloning/Destroy() /obj/machinery/computer/cloning/Destroy()

1
code/game/machinery/computer/computer.dm
View File

@@ -20,6 +20,7 @@
..() ..()
/obj/machinery/computer/initialize() /obj/machinery/computer/initialize()
. = ..()
power_change() power_change()
update_icon() update_icon()

2
code/game/machinery/computer/message.dm
View File

@@ -76,7 +76,7 @@
if(!linkedServer) if(!linkedServer)
if(message_servers && message_servers.len > 0) if(message_servers && message_servers.len > 0)
linkedServer = message_servers[1] linkedServer = message_servers[1]
return return ..()
/obj/machinery/computer/message_monitor/attack_hand(var/mob/living/user as mob) /obj/machinery/computer/message_monitor/attack_hand(var/mob/living/user as mob)
if(stat & (NOPOWER|BROKEN)) if(stat & (NOPOWER|BROKEN))

2
code/game/machinery/computer/station_alert.dm
View File

@@ -20,7 +20,7 @@
/obj/machinery/computer/station_alert/initialize() /obj/machinery/computer/station_alert/initialize()
alarm_monitor = new monitor_type(src) alarm_monitor = new monitor_type(src)
alarm_monitor.register_alarm(src, /obj/machinery/computer/station_alert/update_icon) alarm_monitor.register_alarm(src, /obj/machinery/computer/station_alert/update_icon)
..() . = ..()
/obj/machinery/computer/station_alert/Destroy() /obj/machinery/computer/station_alert/Destroy()
alarm_monitor.unregister_alarm(src) alarm_monitor.unregister_alarm(src)

2
code/game/machinery/cryopod.dm
View File

@@ -301,7 +301,7 @@
return ..() return ..()
/obj/machinery/cryopod/initialize() /obj/machinery/cryopod/initialize()
..() . = ..()
find_control_computer() find_control_computer()

1
code/game/machinery/doors/airlock.dm
View File

@@ -1210,6 +1210,7 @@ About the new airlock wires panel:
src.closeOther = A src.closeOther = A
break break
name = "\improper [name]" name = "\improper [name]"
. = ..()
/obj/machinery/door/airlock/Destroy() /obj/machinery/door/airlock/Destroy()
qdel(wires) qdel(wires)

22
code/game/machinery/doors/airlock_control.dm
View File

@@ -130,18 +130,12 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
obj/machinery/door/airlock/initialize() obj/machinery/door/airlock/initialize()
. = ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)
update_icon() update_icon()
obj/machinery/door/airlock/New()
..()
if(radio_controller)
set_frequency(frequency)
obj/machinery/door/airlock/Destroy() obj/machinery/door/airlock/Destroy()
if(frequency && radio_controller) if(frequency && radio_controller)
radio_controller.remove_object(src,frequency) radio_controller.remove_object(src,frequency)
@@ -210,13 +204,9 @@ obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK) radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
obj/machinery/airlock_sensor/initialize() obj/machinery/airlock_sensor/initialize()
. = ..()
set_frequency(frequency) set_frequency(frequency)
obj/machinery/airlock_sensor/New()
..()
if(radio_controller)
set_frequency(frequency)
obj/machinery/airlock_sensor/Destroy() obj/machinery/airlock_sensor/Destroy()
if(radio_controller) if(radio_controller)
radio_controller.remove_object(src,frequency) radio_controller.remove_object(src,frequency)
@@ -280,15 +270,9 @@ obj/machinery/access_button/proc/set_frequency(new_frequency)
obj/machinery/access_button/initialize() obj/machinery/access_button/initialize()
. = ..()
set_frequency(frequency) set_frequency(frequency)
obj/machinery/access_button/New()
..()
if(radio_controller)
set_frequency(frequency)
obj/machinery/access_button/Destroy() obj/machinery/access_button/Destroy()
if(radio_controller) if(radio_controller)
radio_controller.remove_object(src, frequency) radio_controller.remove_object(src, frequency)

2
code/game/machinery/doors/alarmlock.dm
View File

@@ -19,7 +19,7 @@
..() ..()
/obj/machinery/door/airlock/alarmlock/initialize() /obj/machinery/door/airlock/alarmlock/initialize()
..() . = ..()
radio_controller.remove_object(src, air_frequency) radio_controller.remove_object(src, air_frequency)
air_connection = radio_controller.add_object(src, air_frequency, RADIO_TO_AIRALARM) air_connection = radio_controller.add_object(src, air_frequency, RADIO_TO_AIRALARM)
open() open()

2
code/game/machinery/doors/blast_door.dm
View File

@@ -30,7 +30,7 @@
block_air_zones = 0 block_air_zones = 0
/obj/machinery/door/blast/initialize() /obj/machinery/door/blast/initialize()
..() . = ..()
implicit_material = get_material_by_name("plasteel") implicit_material = get_material_by_name("plasteel")
/obj/machinery/door/blast/get_material() /obj/machinery/door/blast/get_material()

2
code/game/machinery/embedded_controller/airlock_controllers.dm
View File

@@ -13,7 +13,7 @@
var/tag_secure = 0 var/tag_secure = 0
/obj/machinery/embedded_controller/radio/airlock/initialize() /obj/machinery/embedded_controller/radio/airlock/initialize()
..() . = ..()
program = new/datum/computer/file/embedded_program/airlock(src) program = new/datum/computer/file/embedded_program/airlock(src)
//Advanced airlock controller for when you want a more versatile airlock controller - useful for turning simple access control rooms into airlocks //Advanced airlock controller for when you want a more versatile airlock controller - useful for turning simple access control rooms into airlocks

2
code/game/machinery/embedded_controller/airlock_docking_controller.dm
View File

@@ -6,7 +6,7 @@
tag_secure = 1 tag_secure = 1
/obj/machinery/embedded_controller/radio/airlock/docking_port/initialize() /obj/machinery/embedded_controller/radio/airlock/docking_port/initialize()
..() . = ..()
airlock_program = new/datum/computer/file/embedded_program/airlock/docking(src) airlock_program = new/datum/computer/file/embedded_program/airlock/docking(src)
docking_program = new/datum/computer/file/embedded_program/docking/airlock(src, airlock_program) docking_program = new/datum/computer/file/embedded_program/docking/airlock(src, airlock_program)
program = docking_program program = docking_program

4
code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm
View File

@@ -10,7 +10,7 @@
var/datum/computer/file/embedded_program/docking/multi/docking_program var/datum/computer/file/embedded_program/docking/multi/docking_program
/obj/machinery/embedded_controller/radio/docking_port_multi/initialize() /obj/machinery/embedded_controller/radio/docking_port_multi/initialize()
..() . = ..()
docking_program = new/datum/computer/file/embedded_program/docking/multi(src) docking_program = new/datum/computer/file/embedded_program/docking/multi(src)
program = docking_program program = docking_program
@@ -56,7 +56,7 @@
tag_secure = 1 tag_secure = 1
/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/initialize() /obj/machinery/embedded_controller/radio/airlock/docking_port_multi/initialize()
..() . = ..()
airlock_program = new/datum/computer/file/embedded_program/airlock/multi_docking(src) airlock_program = new/datum/computer/file/embedded_program/airlock/multi_docking(src)
program = airlock_program program = airlock_program

1
code/game/machinery/embedded_controller/embedded_controller_base.dm
View File

@@ -58,6 +58,7 @@ obj/machinery/embedded_controller/radio/Destroy()
unacidable = 1 unacidable = 1
/obj/machinery/embedded_controller/radio/initialize() /obj/machinery/embedded_controller/radio/initialize()
. = ..()
set_frequency(frequency) set_frequency(frequency)
/obj/machinery/embedded_controller/radio/update_icon() /obj/machinery/embedded_controller/radio/update_icon()

2
code/game/machinery/embedded_controller/simple_docking_controller.dm
View File

@@ -5,7 +5,7 @@
var/datum/computer/file/embedded_program/docking/simple/docking_program var/datum/computer/file/embedded_program/docking/simple/docking_program
/obj/machinery/embedded_controller/radio/simple_docking_controller/initialize() /obj/machinery/embedded_controller/radio/simple_docking_controller/initialize()
..() . = ..()
docking_program = new/datum/computer/file/embedded_program/docking/simple(src) docking_program = new/datum/computer/file/embedded_program/docking/simple(src)
program = docking_program program = docking_program

2
code/game/machinery/kitchen/icecream.dm
View File

@@ -52,7 +52,7 @@
return "vanilla" return "vanilla"
/obj/machinery/icecream_vat/initialize() /obj/machinery/icecream_vat/initialize()
..() . = ..()
create_reagents(100) create_reagents(100)
while(product_types.len < 6) while(product_types.len < 6)
product_types.Add(5) product_types.Add(5)

2
code/game/machinery/status_display.dm
View File

@@ -61,7 +61,7 @@
// register for radio system // register for radio system
/obj/machinery/status_display/initialize() /obj/machinery/status_display/initialize()
..() . = ..()
if(radio_controller) if(radio_controller)
radio_controller.add_object(src, frequency) radio_controller.add_object(src, frequency)

1
code/game/machinery/telecomms/telecomunications.dm
View File

@@ -131,6 +131,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
else else
for(var/obj/machinery/telecomms/T in telecomms_list) for(var/obj/machinery/telecomms/T in telecomms_list)
add_link(T) add_link(T)
. = ..()
/obj/machinery/telecomms/Destroy() /obj/machinery/telecomms/Destroy()
telecomms_list -= src telecomms_list -= src

2
code/game/machinery/teleporter.dm
View File

@@ -18,7 +18,7 @@
return return
/obj/machinery/computer/teleporter/initialize() /obj/machinery/computer/teleporter/initialize()
..() . = ..()
var/obj/machinery/teleport/station/station var/obj/machinery/teleport/station/station
var/obj/machinery/teleport/hub/hub var/obj/machinery/teleport/hub/hub

2
code/game/machinery/turret_control.dm
View File

@@ -62,7 +62,7 @@
control_area = null control_area = null
power_change() //Checks power and initial settings power_change() //Checks power and initial settings
return . = ..()
/obj/machinery/turretid/proc/isLocked(mob/user) /obj/machinery/turretid/proc/isLocked(mob/user)
if(ailock && issilicon(user)) if(ailock && issilicon(user))

2
code/game/machinery/vr_console.dm
View File

@@ -24,6 +24,7 @@
RefreshParts() RefreshParts()
/obj/machinery/vr_sleeper/initialize() /obj/machinery/vr_sleeper/initialize()
. = ..()
update_icon() update_icon()
/obj/machinery/vr_sleeper/process() /obj/machinery/vr_sleeper/process()
@@ -223,3 +224,4 @@
else else
occupant.enter_vr(avatar) occupant.enter_vr(avatar)

1
code/game/mecha/mech_fabricator.dm
View File

@@ -40,6 +40,7 @@
/obj/machinery/mecha_part_fabricator/initialize() /obj/machinery/mecha_part_fabricator/initialize()
update_categories() update_categories()
. = ..()
/obj/machinery/mecha_part_fabricator/process() /obj/machinery/mecha_part_fabricator/process()
..() ..()

1
code/game/mecha/mech_prosthetics.dm
View File

@@ -40,6 +40,7 @@
return return
/obj/machinery/pros_fabricator/initialize() /obj/machinery/pros_fabricator/initialize()
. = ..()
manufacturer = basic_robolimb.company manufacturer = basic_robolimb.company
update_categories() update_categories()

1
code/game/mecha/mech_sensor.dm
View File

@@ -70,6 +70,7 @@
icon_state = "airlock_sensor_off" icon_state = "airlock_sensor_off"
/obj/machinery/mech_sensor/initialize() /obj/machinery/mech_sensor/initialize()
. = ..()
set_frequency(frequency) set_frequency(frequency)
/obj/machinery/mech_sensor/proc/set_frequency(new_frequency) /obj/machinery/mech_sensor/proc/set_frequency(new_frequency)

3
code/game/mecha/medical/medical.dm
View File

@@ -1,9 +1,8 @@
/obj/mecha/medical/initialize() /obj/mecha/medical/initialize()
..() . = ..()
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if(isPlayerLevel(T.z)) if(isPlayerLevel(T.z))
new /obj/item/mecha_parts/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
return
/obj/mecha/medical/mechturn(direction) /obj/mecha/medical/mechturn(direction)

3
code/game/mecha/working/working.dm
View File

@@ -4,11 +4,10 @@
var/cargo_capacity = 5 var/cargo_capacity = 5
/obj/mecha/working/initialize() /obj/mecha/working/initialize()
..() . = ..()
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if(isPlayerLevel(T.z)) if(isPlayerLevel(T.z))
new /obj/item/mecha_parts/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
return
/obj/mecha/working/Destroy() /obj/mecha/working/Destroy()
for(var/mob/M in src) for(var/mob/M in src)

1
code/game/objects/effects/decals/contraband.dm
View File

@@ -110,6 +110,7 @@
pixel_y = 0 pixel_y = 0
/obj/structure/sign/poster/initialize() /obj/structure/sign/poster/initialize()
. = ..()
if (poster_type) if (poster_type)
var/path = text2path(poster_type) var/path = text2path(poster_type)
var/datum/poster/design = new path var/datum/poster/design = new path

2
code/game/objects/effects/effect_system.dm
View File

@@ -104,7 +104,7 @@ steam.start() -- spawns the effect
T.hotspot_expose(1000,100) T.hotspot_expose(1000,100)
/obj/effect/effect/sparks/initialize() /obj/effect/effect/sparks/initialize()
..() . = ..()
schedule_task_in(5 SECONDS, /proc/qdel, list(src)) schedule_task_in(5 SECONDS, /proc/qdel, list(src))
/obj/effect/effect/sparks/Destroy() /obj/effect/effect/sparks/Destroy()

4
code/game/objects/effects/landmarks.dm
View File

@@ -84,9 +84,9 @@
delete_me = 1 delete_me = 1
/obj/effect/landmark/initialize() /obj/effect/landmark/initialize()
..() . = ..()
if(delete_me) if(delete_me)
qdel(src) return INITIALIZE_HINT_QDEL
/obj/effect/landmark/Destroy(var/force = FALSE) /obj/effect/landmark/Destroy(var/force = FALSE)
if(delete_me || force) if(delete_me || force)

3
code/game/objects/effects/misc.dm
View File

@@ -34,6 +34,7 @@
pixel_y = -32 pixel_y = -32
/obj/effect/temporary_effect/cleave_attack/initialize() // Makes the slash fade smoothly. When completely transparent it should qdel itself. /obj/effect/temporary_effect/cleave_attack/initialize() // Makes the slash fade smoothly. When completely transparent it should qdel itself.
. = ..()
animate(src, alpha = 0, time = time_to_die - 1) animate(src, alpha = 0, time = time_to_die - 1)
/obj/effect/temporary_effect/shuttle_landing /obj/effect/temporary_effect/shuttle_landing
@@ -44,4 +45,4 @@
/obj/effect/temporary_effect/shuttle_landing/initialize() /obj/effect/temporary_effect/shuttle_landing/initialize()
flick("shuttle_warning", src) // flick() forces the animation to always begin at the start. flick("shuttle_warning", src) // flick() forces the animation to always begin at the start.
..() . = ..()

1
code/game/objects/effects/step_triggers.dm
View File

@@ -129,6 +129,7 @@
var/landmark_id = null var/landmark_id = null
/obj/effect/step_trigger/teleporter/landmark/initialize() /obj/effect/step_trigger/teleporter/landmark/initialize()
. = ..()
for(var/obj/effect/landmark/teleport_mark/mark in tele_landmarks) for(var/obj/effect/landmark/teleport_mark/mark in tele_landmarks)
if(mark.landmark_id == landmark_id) if(mark.landmark_id == landmark_id)
the_landmark = mark the_landmark = mark

8
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -110,7 +110,7 @@ var/list/civilian_cartridges = list(
/obj/item/weapon/cartridge/security/initialize() /obj/item/weapon/cartridge/security/initialize()
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"
@@ -166,7 +166,7 @@ var/list/civilian_cartridges = list(
/obj/item/weapon/cartridge/signal/initialize() /obj/item/weapon/cartridge/signal/initialize()
radio = new /obj/item/radio/integrated/signal(src) radio = new /obj/item/radio/integrated/signal(src)
..() . = ..()
/obj/item/weapon/cartridge/quartermaster /obj/item/weapon/cartridge/quartermaster
name = "\improper Space Parts & Space Vendors cartridge" name = "\improper Space Parts & Space Vendors cartridge"
@@ -200,7 +200,7 @@ var/list/civilian_cartridges = list(
/obj/item/weapon/cartridge/hos/initialize() /obj/item/weapon/cartridge/hos/initialize()
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"
@@ -225,7 +225,7 @@ var/list/civilian_cartridges = list(
/obj/item/weapon/cartridge/rd/initialize() /obj/item/weapon/cartridge/rd/initialize()
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"

2
code/game/objects/items/devices/flashlight.dm
View File

@@ -18,7 +18,7 @@
var/power_use = 1 var/power_use = 1
/obj/item/device/flashlight/initialize() /obj/item/device/flashlight/initialize()
..() . = ..()
update_icon() update_icon()
/obj/item/device/flashlight/New() /obj/item/device/flashlight/New()

1
code/game/objects/items/devices/gps.dm
View File

@@ -18,6 +18,7 @@ var/list/GPS_list = list()
var/can_hide_signal = FALSE // If it can toggle the above var. var/can_hide_signal = FALSE // If it can toggle the above var.
/obj/item/device/gps/initialize() /obj/item/device/gps/initialize()
. = ..()
GPS_list += src GPS_list += src
name = "global positioning system ([gps_tag])" name = "global positioning system ([gps_tag])"
update_icon() update_icon()

2
code/game/objects/items/devices/radio/headset.dm
View File

@@ -81,7 +81,7 @@
ks1type = /obj/item/device/encryptionkey/raider ks1type = /obj/item/device/encryptionkey/raider
/obj/item/device/radio/headset/raider/initialize() /obj/item/device/radio/headset/raider/initialize()
..() . = ..()
set_frequency(RAID_FREQ) set_frequency(RAID_FREQ)
/obj/item/device/radio/headset/binary /obj/item/device/radio/headset/binary

2
code/game/objects/items/devices/radio/radio.dm
View File

@@ -80,7 +80,7 @@ var/global/list/default_medbay_channels = list(
/obj/item/device/radio/initialize() /obj/item/device/radio/initialize()
. = ..()
if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ) if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ) frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
set_frequency(frequency) set_frequency(frequency)

2
code/game/objects/items/devices/tvcamera.dm
View File

@@ -27,7 +27,7 @@
to_chat(usr, "Audio feed is [radio.broadcasting ? "on" : "off"]") to_chat(usr, "Audio feed is [radio.broadcasting ? "on" : "off"]")
/obj/item/device/tvcamera/initialize() /obj/item/device/tvcamera/initialize()
..() . = ..()
camera = new(src) camera = new(src)
camera.c_tag = channel camera.c_tag = channel
camera.status = FALSE camera.status = FALSE

4
code/game/objects/items/weapons/policetape.dm
View File

@@ -12,7 +12,7 @@
var/apply_tape = FALSE var/apply_tape = FALSE
/obj/item/taperoll/initialize() /obj/item/taperoll/initialize()
..() . = ..()
if(apply_tape) if(apply_tape)
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if(!T) if(!T)
@@ -20,7 +20,7 @@
var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in T var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in T
if(airlock) if(airlock)
afterattack(airlock, null, TRUE) afterattack(airlock, null, TRUE)
qdel(src) return INITIALIZE_HINT_QDEL
var/list/image/hazard_overlays var/list/image/hazard_overlays

2
code/game/objects/random/random.dm
View File

@@ -979,7 +979,7 @@ var/list/multi_point_spawns
var/weight // Probability weight for this spawn point var/weight // Probability weight for this spawn point
/obj/random_multi/initialize() /obj/random_multi/initialize()
..() . = ..()
weight = max(1, round(weight)) weight = max(1, round(weight))
if(!multi_point_spawns) if(!multi_point_spawns)

2
code/game/objects/structures/alien_props.dm
View File

@@ -69,7 +69,7 @@
var/static/list/possible_tech = list(TECH_MATERIAL, TECH_ENGINEERING, TECH_PHORON, TECH_POWER, TECH_BIO, TECH_COMBAT, TECH_MAGNET, TECH_DATA) var/static/list/possible_tech = list(TECH_MATERIAL, TECH_ENGINEERING, TECH_PHORON, TECH_POWER, TECH_BIO, TECH_COMBAT, TECH_MAGNET, TECH_DATA)
/obj/item/prop/alien/junk/initialize() /obj/item/prop/alien/junk/initialize()
..() . = ..()
icon_state = pick(possible_states) icon_state = pick(possible_states)
var/list/techs = possible_tech.Copy() var/list/techs = possible_tech.Copy()
origin_tech = list() origin_tech = list()

3
code/game/objects/structures/catwalk.dm
View File

@@ -11,12 +11,13 @@
anchored = 1.0 anchored = 1.0
/obj/structure/catwalk/initialize() /obj/structure/catwalk/initialize()
. = ..()
for(var/obj/structure/catwalk/O in range(1)) for(var/obj/structure/catwalk/O in range(1))
O.update_icon() O.update_icon()
for(var/obj/structure/catwalk/C in get_turf(src)) for(var/obj/structure/catwalk/C in get_turf(src))
if(C != src) if(C != src)
warning("Duplicate [type] in [loc] ([x], [y], [z])") warning("Duplicate [type] in [loc] ([x], [y], [z])")
qdel(C) return INITIALIZE_HINT_QDEL
update_icon() update_icon()
/obj/structure/catwalk/Destroy() /obj/structure/catwalk/Destroy()

2
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -24,7 +24,7 @@
var/list/will_contain var/list/will_contain
/obj/structure/closet/initialize() /obj/structure/closet/initialize()
..() . = ..()
if(will_contain) if(will_contain)
create_objects_in_loc(src, will_contain) create_objects_in_loc(src, will_contain)

2
code/game/objects/structures/crates_lockers/largecrate.dm
View File

@@ -6,7 +6,7 @@
density = 1 density = 1
/obj/structure/largecrate/initialize() /obj/structure/largecrate/initialize()
..() . = ..()
for(var/obj/I in src.loc) for(var/obj/I in src.loc)
if(I.density || I.anchored || I == src || !I.simulated) if(I.density || I.anchored || I == src || !I.simulated)
continue continue

4
code/game/objects/structures/flora.dm
View File

@@ -306,7 +306,7 @@
/obj/structure/flora/sif/subterranean/initialize() /obj/structure/flora/sif/subterranean/initialize()
icon_state = "[initial(icon_state)][rand(1,2)]" icon_state = "[initial(icon_state)][rand(1,2)]"
..() . = ..()
/obj/structure/flora/sif/eyes /obj/structure/flora/sif/eyes
name = "mysterious bulbs" name = "mysterious bulbs"
@@ -315,4 +315,4 @@
/obj/structure/flora/sif/eyes/initialize() /obj/structure/flora/sif/eyes/initialize()
icon_state = "[initial(icon_state)][rand(1,3)]" icon_state = "[initial(icon_state)][rand(1,3)]"
..() . = ..()

2
code/game/objects/structures/ghost_pods/ghost_pods.dm
View File

@@ -55,7 +55,7 @@
var/delay_to_try_again = 20 MINUTES // How long to wait if first attempt fails. Set to 0 to never try again. var/delay_to_try_again = 20 MINUTES // How long to wait if first attempt fails. Set to 0 to never try again.
/obj/structure/ghost_pod/automatic/initialize() /obj/structure/ghost_pod/automatic/initialize()
..() . = ..()
spawn(delay_to_self_open) spawn(delay_to_self_open)
if(src) if(src)
trigger() trigger()

8
code/game/objects/structures/lattice.dm
View File

@@ -10,15 +10,15 @@
// flags = CONDUCT // flags = CONDUCT
/obj/structure/lattice/initialize() /obj/structure/lattice/initialize()
..() . = ..()
if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral))) if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral)))
qdel(src) return INITIALIZE_HINT_QDEL
return
for(var/obj/structure/lattice/LAT in src.loc) for(var/obj/structure/lattice/LAT in src.loc)
if(LAT != src) if(LAT != src)
qdel(LAT) crash_with("Found multiple lattices at '[log_info_line(loc)]'")
return INITIALIZE_HINT_QDEL
icon = 'icons/obj/smoothlattice.dmi' icon = 'icons/obj/smoothlattice.dmi'
icon_state = "latticeblank" icon_state = "latticeblank"
updateOverlays() updateOverlays()

2
code/game/objects/structures/loot_piles.dm
View File

@@ -119,7 +119,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/structure/loot_pile/maint/initialize() /obj/structure/loot_pile/maint/initialize()
icon_state = pick(icon_states_to_use) icon_state = pick(icon_states_to_use)
..() . = ..()
// Has large amounts of possible items, most of which may or may not be useful. // Has large amounts of possible items, most of which may or may not be useful.
/obj/structure/loot_pile/maint/junk /obj/structure/loot_pile/maint/junk

1
code/game/objects/structures/noticeboard.dm
View File

@@ -26,6 +26,7 @@
I.loc = src I.loc = src
notices++ notices++
icon_state = "nboard0[notices]" icon_state = "nboard0[notices]"
. = ..()
//attaching papers!! //attaching papers!!
/obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) /obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob)

2
code/game/objects/structures/railing.dm
View File

@@ -24,7 +24,7 @@
verbs += /obj/structure/proc/climb_on verbs += /obj/structure/proc/climb_on
/obj/structure/railing/initialize() /obj/structure/railing/initialize()
..() . = ..()
if(src.anchored) if(src.anchored)
update_icon(0) update_icon(0)

6
code/game/objects/structures/safe.dm
View File

@@ -31,13 +31,13 @@ FLOOR SAFES
/obj/structure/safe/initialize() /obj/structure/safe/initialize()
. = ..()
for(var/obj/item/I in loc) for(var/obj/item/I in loc)
if(space >= maxspace) if(space >= maxspace)
return return
if(I.w_class + space <= maxspace) if(I.w_class + space <= maxspace)
space += I.w_class space += I.w_class
I.loc = src I.forceMove(src)
/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear) /obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear)
if(user && canhear) if(user && canhear)
@@ -175,7 +175,7 @@ obj/structure/safe/ex_act(severity)
layer = 2.5 layer = 2.5
/obj/structure/safe/floor/initialize() /obj/structure/safe/floor/initialize()
..() . = ..()
var/turf/T = loc var/turf/T = loc
if(istype(T) && !T.is_plating()) if(istype(T) && !T.is_plating())
hide(1) hide(1)

2
code/game/objects/structures/window_spawner.dm
View File

@@ -26,7 +26,7 @@
return FALSE return FALSE
/obj/effect/wingrille_spawn/initialize() /obj/effect/wingrille_spawn/initialize()
..() . = ..()
if(!win_path) if(!win_path)
return return
if(ticker && ticker.current_state < GAME_STATE_PLAYING) if(ticker && ticker.current_state < GAME_STATE_PLAYING)

2
code/game/shuttle_engines.dm
View File

@@ -18,7 +18,7 @@
else return ..() else return ..()
/obj/structure/shuttle/window/initialize() /obj/structure/shuttle/window/initialize()
..() . = ..()
auto_join() auto_join()
/obj/structure/shuttle/window/proc/auto_join() /obj/structure/shuttle/window/proc/auto_join()

8
code/game/turfs/flooring/flooring_decals.dm
View File

@@ -22,8 +22,8 @@ var/list/floor_decals = list()
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if(T) //VOREStation Edit if(T) //VOREStation Edit
T.apply_decals() T.apply_decals()
qdel(src) initialized = TRUE
return return INITIALIZE_HINT_QDEL
/obj/effect/floor_decal/reset /obj/effect/floor_decal/reset
name = "reset marker" name = "reset marker"
@@ -33,8 +33,8 @@ var/list/floor_decals = list()
if(T.decals && T.decals.len) if(T.decals && T.decals.len)
T.decals.Cut() T.decals.Cut()
T.update_icon() T.update_icon()
qdel(src) initialized = TRUE
return return INITIALIZE_HINT_QDEL
/obj/effect/floor_decal/corner /obj/effect/floor_decal/corner
icon_state = "corner_white" icon_state = "corner_white"

17
code/game/turfs/initialization/init.dm
View File

@@ -1,16 +1,11 @@
/datum/turf_initializer/proc/initialize(var/turf/T) /datum/turf_initializer/proc/InitializeTurf(var/turf/T)
return return
/area /area
var/datum/turf_initializer/turf_initializer = null var/datum/turf_initializer/turf_initializer = null
/area/initialize() /area/LateInitialize()
..() . = ..()
var/list/minerals = list() if(turf_initializer)
for(var/turf/simulated/T in src) for(var/turf/simulated/T in src)
if(T.initialize()) turf_initializer.InitializeTurf(T)
minerals += T
if(turf_initializer)
turf_initializer.initialize(T)
for(var/turf/simulated/mineral/M in minerals)
M.MineralSpread()

2
code/game/turfs/initialization/maintenance.dm
View File

@@ -1,4 +1,4 @@
/datum/turf_initializer/maintenance/initialize(var/turf/simulated/T) /datum/turf_initializer/maintenance/InitializeTurf(var/turf/simulated/T)
if(T.density) if(T.density)
return return
// Quick and dirty check to avoid placing things inside windows // Quick and dirty check to avoid placing things inside windows

3
code/game/turfs/simulated.dm
View File

@@ -59,9 +59,6 @@
holy = 1 holy = 1
levelupdate() levelupdate()
/turf/simulated/proc/initialize()
return
/turf/simulated/proc/AddTracks(var/typepath,var/bloodDNA,var/comingdir,var/goingdir,var/bloodcolor="#A10808") /turf/simulated/proc/AddTracks(var/typepath,var/bloodDNA,var/comingdir,var/goingdir,var/bloodcolor="#A10808")
var/obj/effect/decal/cleanable/blood/tracks/tracks = locate(typepath) in src var/obj/effect/decal/cleanable/blood/tracks/tracks = locate(typepath) in src
if(!tracks) if(!tracks)

2
code/game/turfs/simulated/floor_types.dm
View File

@@ -194,7 +194,7 @@
block_tele = TRUE block_tele = TRUE
/turf/simulated/shuttle/floor/alien/initialize() /turf/simulated/shuttle/floor/alien/initialize()
..() . = ..()
icon_state = "alienpod[rand(1, 9)]" icon_state = "alienpod[rand(1, 9)]"
/turf/simulated/shuttle/floor/alienplating /turf/simulated/shuttle/floor/alienplating

4
code/game/turfs/simulated/outdoors/grass.dm
View File

@@ -32,7 +32,7 @@ var/list/grass_types = list(
/turf/simulated/floor/outdoors/grass/sif/initialize() /turf/simulated/floor/outdoors/grass/sif/initialize()
if(tree_chance && prob(tree_chance)) if(tree_chance && prob(tree_chance))
new /obj/structure/flora/tree/sif(src) new /obj/structure/flora/tree/sif(src)
..() . = ..()
/turf/simulated/floor/outdoors/grass/initialize() /turf/simulated/floor/outdoors/grass/initialize()
if(prob(50)) if(prob(50))
@@ -42,7 +42,7 @@ var/list/grass_types = list(
if(grass_chance && prob(grass_chance)) if(grass_chance && prob(grass_chance))
var/grass_type = pick(grass_types) var/grass_type = pick(grass_types)
new grass_type(src) new grass_type(src)
..() . = ..()
/turf/simulated/floor/outdoors/grass/forest /turf/simulated/floor/outdoors/grass/forest
name = "thick grass" name = "thick grass"

2
code/game/turfs/simulated/outdoors/outdoors.dm
View File

@@ -22,7 +22,7 @@ var/list/outdoor_turfs = list()
/turf/simulated/floor/outdoors/initialize() /turf/simulated/floor/outdoors/initialize()
update_icon() update_icon()
..() . = ..()
/turf/simulated/floor/New() /turf/simulated/floor/New()
if(outdoors) if(outdoors)

1
code/game/turfs/simulated/outdoors/sky.dm
View File

@@ -13,6 +13,7 @@
phoron = 0 phoron = 0
/turf/simulated/sky/initialize() /turf/simulated/sky/initialize()
. = ..()
outdoor_turfs.Add(src) outdoor_turfs.Add(src)
set_light(2, 2, "#FFFFFF") set_light(2, 2, "#FFFFFF")

4
code/game/turfs/simulated/wall_types.dm
View File

@@ -132,7 +132,7 @@
name = true_name name = true_name
/turf/simulated/shuttle/wall/initialize() /turf/simulated/shuttle/wall/initialize()
..() . = ..()
if(join_group) if(join_group)
src.auto_join() src.auto_join()
@@ -213,7 +213,7 @@
stripe_color = "#00FF00" stripe_color = "#00FF00"
/turf/simulated/shuttle/wall/voidcraft/initialize() /turf/simulated/shuttle/wall/voidcraft/initialize()
..() . = ..()
update_icon() update_icon()
/turf/simulated/shuttle/wall/voidcraft/update_icon() /turf/simulated/shuttle/wall/voidcraft/update_icon()

5
code/game/turfs/simulated/water.dm
View File

@@ -11,11 +11,8 @@
outdoors = TRUE outdoors = TRUE
var/depth = 1 // Higher numbers indicates deeper water. var/depth = 1 // Higher numbers indicates deeper water.
/turf/simulated/floor/water/New()
update_icon()
..()
/turf/simulated/floor/water/initialize() /turf/simulated/floor/water/initialize()
. = ..()
update_icon() update_icon()
/turf/simulated/floor/water/update_icon() /turf/simulated/floor/water/update_icon()

4
code/modules/awaymissions/corpse.dm
View File

@@ -24,9 +24,12 @@
var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access. var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
var/corpseidicon = null //For setting it to be a gold, silver, CentCom etc ID var/corpseidicon = null //For setting it to be a gold, silver, CentCom etc ID
var/species = "Human" var/species = "Human"
delete_me = TRUE
/obj/effect/landmark/corpse/initialize() /obj/effect/landmark/corpse/initialize()
..()
createCorpse() createCorpse()
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/corpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. /obj/effect/landmark/corpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc) var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc)
@@ -76,7 +79,6 @@
W.assignment = corpseidjob W.assignment = corpseidjob
M.set_id_info(W) M.set_id_info(W)
M.equip_to_slot_or_del(W, slot_wear_id) M.equip_to_slot_or_del(W, slot_wear_id)
qdel(src)

12
code/modules/awaymissions/gateway.dm
View File

@@ -10,14 +10,9 @@
/obj/machinery/gateway/initialize() /obj/machinery/gateway/initialize()
update_icon() update_icon()
if(dir == 2 || dir == 6 || dir == 10) if(dir == SOUTH)
density = 0 density = 0
. = ..()
/obj/machinery/gateway/New() // Doesn't initialize in generated maps which is bad.
update_icon()
if(dir == 2 || dir == 6 || dir == 10)
density = 0
/obj/machinery/gateway/update_icon() /obj/machinery/gateway/update_icon()
if(active) if(active)
@@ -43,7 +38,7 @@
update_icon() update_icon()
wait = world.time + config.gateway_delay //+ thirty minutes default wait = world.time + config.gateway_delay //+ thirty minutes default
awaygate = locate(/obj/machinery/gateway/centeraway) awaygate = locate(/obj/machinery/gateway/centeraway)
. = ..()
/obj/machinery/gateway/centerstation/update_icon() /obj/machinery/gateway/centerstation/update_icon()
if(active) if(active)
@@ -172,6 +167,7 @@ obj/machinery/gateway/centerstation/process()
/obj/machinery/gateway/centeraway/initialize() /obj/machinery/gateway/centeraway/initialize()
update_icon() update_icon()
stationgate = locate(/obj/machinery/gateway/centerstation) stationgate = locate(/obj/machinery/gateway/centerstation)
. = ..()
/obj/machinery/gateway/centeraway/update_icon() /obj/machinery/gateway/centeraway/update_icon()

3
code/modules/awaymissions/loot.dm
View File

@@ -6,6 +6,7 @@
var/loot = "" //a list of possible items to spawn- a string of paths var/loot = "" //a list of possible items to spawn- a string of paths
/obj/effect/spawner/lootdrop/initialize() /obj/effect/spawner/lootdrop/initialize()
..()
var/list/things = params2list(loot) var/list/things = params2list(loot)
if(things && things.len) if(things && things.len)
@@ -21,4 +22,4 @@
continue continue
new loot_path(get_turf(src)) new loot_path(get_turf(src))
qdel(src) return INITIALIZE_HINT_QDEL

7
code/modules/hydroponics/seed_packets.dm
View File

@@ -13,10 +13,7 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/initialize() /obj/item/seeds/initialize()
update_seed() update_seed()
..() . = ..()
/obj/item/seeds/New()
..()
//Grabs the appropriate seed datum from the global list. //Grabs the appropriate seed datum from the global list.
/obj/item/seeds/proc/update_seed() /obj/item/seeds/proc/update_seed()
@@ -79,7 +76,7 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/random/initialize() /obj/item/seeds/random/initialize()
seed = plant_controller.create_random_seed() seed = plant_controller.create_random_seed()
seed_type = seed.name seed_type = seed.name
update_seed() . = ..()
/obj/item/seeds/replicapod /obj/item/seeds/replicapod
seed_type = "diona" seed_type = "diona"

9
code/modules/hydroponics/trays/tray.dm
View File

@@ -165,16 +165,19 @@
nymph.visible_message("<font color='blue'><b>[nymph]</b> rolls around in [src] for a bit.</font>","<font color='blue'>You roll around in [src] for a bit.</font>") nymph.visible_message("<font color='blue'><b>[nymph]</b> rolls around in [src] for a bit.</font>","<font color='blue'>You roll around in [src] for a bit.</font>")
return return
/obj/machinery/portable_atmospherics/hydroponics/New() /obj/machinery/portable_atmospherics/hydroponics/initialize()
..() . = ..()
temp_chem_holder = new() temp_chem_holder = new()
temp_chem_holder.create_reagents(10) temp_chem_holder.create_reagents(10)
create_reagents(200) create_reagents(200)
if(mechanical) if(mechanical)
connect() connect()
update_icon() update_icon()
return INITIALIZE_HINT_LATELOAD
/obj/machinery/portable_atmospherics/hydroponics/initialize() // Give the seeds time to initialize itself
/obj/machinery/portable_atmospherics/hydroponics/LateInitialize()
. = ..()
var/obj/item/seeds/S = locate() in loc var/obj/item/seeds/S = locate() in loc
if(S) if(S)
plant_seeds(S) plant_seeds(S)

2
code/modules/integrated_electronics/core/printer.dm
View File

@@ -20,7 +20,7 @@
can_clone = TRUE can_clone = TRUE
/obj/item/device/integrated_circuit_printer/initialize() /obj/item/device/integrated_circuit_printer/initialize()
..() . = ..()
if(!recipe_list.len) if(!recipe_list.len)
// Unfortunately this needed a lot of loops, but it should only be run once at init. // Unfortunately this needed a lot of loops, but it should only be run once at init.

2
code/modules/integrated_electronics/subtypes/input.dm
View File

@@ -335,7 +335,7 @@
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
/obj/item/integrated_circuit/input/signaler/initialize() /obj/item/integrated_circuit/input/signaler/initialize()
..() . = ..()
set_frequency(frequency) set_frequency(frequency)
// Set the pins so when someone sees them, they won't show as null // Set the pins so when someone sees them, they won't show as null
set_pin_data(IC_INPUT, 1, frequency) set_pin_data(IC_INPUT, 1, frequency)

1
code/modules/library/lib_items.dm
View File

@@ -20,6 +20,7 @@
opacity = 1 opacity = 1
/obj/structure/bookcase/initialize() /obj/structure/bookcase/initialize()
. = ..()
for(var/obj/item/I in loc) for(var/obj/item/I in loc)
if(istype(I, /obj/item/weapon/book)) if(istype(I, /obj/item/weapon/book))
I.loc = src I.loc = src

2
code/modules/lore_codex/codex.dm
View File

@@ -10,7 +10,7 @@
/obj/item/weapon/book/codex/initialize() /obj/item/weapon/book/codex/initialize()
tree = new(src, root_type) tree = new(src, root_type)
..() . = ..()
/obj/item/weapon/book/codex/attack_self(mob/user) /obj/item/weapon/book/codex/attack_self(mob/user)
if(!tree) if(!tree)

12
code/modules/maps/tg/map_template.dm
View File

@@ -81,7 +81,7 @@ var/list/global/map_templates = list()
admin_notice("<span class='danger'>Submap initializations finished.</span>", R_DEBUG) admin_notice("<span class='danger'>Submap initializations finished.</span>", R_DEBUG)
/datum/map_template/proc/load_new_z(var/centered = FALSE, var/dont_init = FALSE) /datum/map_template/proc/load_new_z(var/centered = FALSE)
var/x = 1 var/x = 1
var/y = 1 var/y = 1
@@ -96,13 +96,12 @@ var/list/global/map_templates = list()
// repopulate_sorted_areas() // repopulate_sorted_areas()
//initialize things that are normally initialized after map load //initialize things that are normally initialized after map load
if(!dont_init) initTemplateBounds(bounds)
initTemplateBounds(bounds)
log_game("Z-level [name] loaded at at [x],[y],[world.maxz]") log_game("Z-level [name] loaded at at [x],[y],[world.maxz]")
on_map_loaded(world.maxz) //VOREStation Edit on_map_loaded(world.maxz) //VOREStation Edit
return TRUE return TRUE
/datum/map_template/proc/load(turf/T, centered = FALSE, dont_init = FALSE) /datum/map_template/proc/load(turf/T, centered = FALSE)
var/old_T = T var/old_T = T
if(centered) if(centered)
T = locate(T.x - round(width/2) , T.y - round(height/2) , T.z) T = locate(T.x - round(width/2) , T.y - round(height/2) , T.z)
@@ -124,8 +123,7 @@ var/list/global/map_templates = list()
// repopulate_sorted_areas() // repopulate_sorted_areas()
//initialize things that are normally initialized after map load //initialize things that are normally initialized after map load
if(!dont_init) initTemplateBounds(bounds)
initTemplateBounds(bounds)
log_game("[name] loaded at at [T.x],[T.y],[T.z]") log_game("[name] loaded at at [T.x],[T.y],[T.z]")
loaded++ loaded++
@@ -240,7 +238,7 @@ var/list/global/map_templates = list()
admin_notice("Submap \"[chosen_template.name]\" placed at ([T.x], [T.y], [T.z])", R_DEBUG) admin_notice("Submap \"[chosen_template.name]\" placed at ([T.x], [T.y], [T.z])", R_DEBUG)
// Do loading here. // Do loading here.
chosen_template.load(T, centered = TRUE, dont_init = TRUE) // This is run before the main map's initialization routine, so that can initilize our submaps for us instead. chosen_template.load(T, centered = TRUE) // This is run before the main map's initialization routine, so that can initilize our submaps for us instead.
CHECK_TICK CHECK_TICK

8
code/modules/mining/mine_turfs.dm
View File

@@ -97,10 +97,16 @@ var/list/mining_overlay_cache = list()
return return
/turf/simulated/mineral/initialize() /turf/simulated/mineral/initialize()
. = ..()
if(prob(20)) if(prob(20))
overlay_detail = "asteroid[rand(0,9)]" overlay_detail = "asteroid[rand(0,9)]"
update_icon(1) update_icon(1)
return density && mineral if(density && mineral)
. = INITIALIZE_HINT_LATELOAD
/turf/simulated/mineral/LateInitialize()
if(density && mineral)
MineralSpread()
/turf/simulated/mineral/update_icon(var/update_neighbors) /turf/simulated/mineral/update_icon(var/update_neighbors)

2
code/modules/mob/living/bot/bot.dm
View File

@@ -51,7 +51,7 @@
// Make sure mapped in units start turned on. // Make sure mapped in units start turned on.
/mob/living/bot/initialize() /mob/living/bot/initialize()
..() . = ..()
if(on) if(on)
turn_on() // Update lights and other stuff turn_on() // Update lights and other stuff

2
code/modules/mob/living/simple_animal/aliens/mimic.dm
View File

@@ -63,7 +63,7 @@
// Pickup loot // Pickup loot
/mob/living/simple_animal/hostile/mimic/crate/initialize() /mob/living/simple_animal/hostile/mimic/crate/initialize()
..() . = ..()
for(var/obj/item/I in loc) for(var/obj/item/I in loc)
I.forceMove(src) I.forceMove(src)

2
code/modules/mob/living/simple_animal/animals/slime.dm
View File

@@ -27,7 +27,7 @@
icon_dead = "rainbow baby slime dead" icon_dead = "rainbow baby slime dead"
/mob/living/simple_animal/slime/science/initialize() /mob/living/simple_animal/slime/science/initialize()
..() . = ..()
overlays.Cut() overlays.Cut()
overlays += "aslime-:33" overlays += "aslime-:33"

1
code/modules/mob/new_player/login.dm
View File

@@ -19,6 +19,7 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image
icon_state = pick(using_map.lobby_screens) icon_state = pick(using_map.lobby_screens)
else else
icon_state = known_icon_states[1] icon_state = known_icon_states[1]
. = ..()
/mob/new_player /mob/new_player
var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled

6
code/modules/multiz/open_space_controller.dm
View File

@@ -61,12 +61,6 @@
add_turf(T) add_turf(T)
open_space_initialised = TRUE open_space_initialised = TRUE
/turf/simulated/open/initialize()
. = ..()
if(open_space_initialised)
// log_debug("[src] ([x],[y],[z]) queued for update for initialize()")
OS_controller.add_turf(src)
/turf/Entered(atom/movable/AM) /turf/Entered(atom/movable/AM)
. = ..() . = ..()
if(open_space_initialised && !AM.invisibility && isobj(AM)) if(open_space_initialised && !AM.invisibility && isobj(AM))

2
code/modules/multiz/structures.dm
View File

@@ -18,6 +18,7 @@
var/const/climb_time = 2 SECONDS var/const/climb_time = 2 SECONDS
/obj/structure/ladder/initialize() /obj/structure/ladder/initialize()
. = ..()
// the upper will connect to the lower // the upper will connect to the lower
if(allowed_directions & DOWN) //we only want to do the top one, as it will initialize the ones before it. if(allowed_directions & DOWN) //we only want to do the top one, as it will initialize the ones before it.
for(var/obj/structure/ladder/L in GetBelow(src)) for(var/obj/structure/ladder/L in GetBelow(src))
@@ -132,6 +133,7 @@
layer = 2.4 // Above turf, but they're sort of the floor, so below objects. layer = 2.4 // Above turf, but they're sort of the floor, so below objects.
/obj/structure/stairs/initialize() /obj/structure/stairs/initialize()
. = ..()
for(var/turf/turf in locs) for(var/turf/turf in locs)
var/turf/simulated/open/above = GetAbove(turf) var/turf/simulated/open/above = GetAbove(turf)
if(!above) if(!above)

2
code/modules/multiz/turf.dm
View File

@@ -34,7 +34,7 @@
update() update()
/turf/simulated/open/initialize() /turf/simulated/open/initialize()
..() . = ..()
ASSERT(HasBelow(z)) ASSERT(HasBelow(z))
update() update()

1
code/modules/overmap/ships/computers/engine_control.dm
View File

@@ -9,6 +9,7 @@
var/obj/effect/map/ship/linked var/obj/effect/map/ship/linked
/obj/machinery/computer/engines/initialize() /obj/machinery/computer/engines/initialize()
. = ..()
linked = map_sectors["[z]"] linked = map_sectors["[z]"]
if (linked) if (linked)
if (!linked.eng_control) if (!linked.eng_control)

1
code/modules/overmap/ships/computers/helm.dm
View File

@@ -11,6 +11,7 @@
var/dy //coordinates var/dy //coordinates
/obj/machinery/computer/helm/initialize() /obj/machinery/computer/helm/initialize()
. = ..()
linked = map_sectors["[z]"] linked = map_sectors["[z]"]
if (linked) if (linked)
if(!linked.nav_control) if(!linked.nav_control)

2
code/modules/overmap/ships/computers/shuttle.dm
View File

@@ -9,7 +9,7 @@
var/obj/effect/map/home //current destination var/obj/effect/map/home //current destination
/obj/machinery/computer/shuttle_control/explore/initialize() /obj/machinery/computer/shuttle_control/explore/initialize()
..() . = ..()
home = map_sectors["[z]"] home = map_sectors["[z]"]
shuttle_tag = "[shuttle_tag]-[z]" shuttle_tag = "[shuttle_tag]-[z]"
if(!shuttle_controller.shuttles[shuttle_tag]) if(!shuttle_controller.shuttles[shuttle_tag])

2
code/modules/overmap/ships/engines/thermal.dm
View File

@@ -54,7 +54,7 @@
var/datum/ship_engine/thermal/controller var/datum/ship_engine/thermal/controller
/obj/machinery/atmospherics/unary/engine/initialize() /obj/machinery/atmospherics/unary/engine/initialize()
..() . = ..()
controller = new(src) controller = new(src)
/obj/machinery/atmospherics/unary/engine/Destroy() /obj/machinery/atmospherics/unary/engine/Destroy()

1
code/modules/overmap/ships/ship.dm
View File

@@ -15,6 +15,7 @@
var/obj/machinery/computer/engines/eng_control var/obj/machinery/computer/engines/eng_control
/obj/effect/map/ship/initialize() /obj/effect/map/ship/initialize()
. = ..()
for(var/obj/machinery/computer/engines/E in machines) for(var/obj/machinery/computer/engines/E in machines)
if (E.z == map_z) if (E.z == map_z)
eng_control = E eng_control = E

Some files were not shown because too many files have changed in this diff Show More