cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert most of /obj/machinery to use Initialize rather than New (#17845)

Browse Source 
* Switch a bunch of /obj/machinery from /New to /Initialize

This is an easy and uncontroversial batch.
No globs, no late init, and stuff.

* Move more machinery to Initialize

This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.

* More tricky New -> Initialize migrations

* The last of machinery Initialize conversion

* fixups

* Newscaster armor fix

* styling

* Comment on armor handling

* Move newscaster armor definition back to datum

* farie82 review

* kill extra .=

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* farie's review part 2

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
moxian
2022-06-29 08:33:52 +02:00
committed by GitHub
co-authored by Farie82
parent 3807bf43c7
commit 09e7f54a43
101 changed files with 410 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/dna/dna_modifier.dm
+4 -4
View File
@@ -73,8 +73,8 @@
var/scan_level
var/precision_coeff
/obj/machinery/dna_scannernew/New()
..()
/obj/machinery/dna_scannernew/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/clonescanner(null)
component_parts += new /obj/item/stock_parts/scanning_module(null)
@@ -85,8 +85,8 @@
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
/obj/machinery/dna_scannernew/upgraded/New()
..()
/obj/machinery/dna_scannernew/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/clonescanner(null)
component_parts += new /obj/item/stock_parts/scanning_module/phasic(null)
code/game/gamemodes/miniantags/abduction/machinery/camera.dm
+2 -2
View File
@@ -14,9 +14,9 @@
icon_state = "camera"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/machinery/computer/camera_advanced/abductor/New()
/obj/machinery/computer/camera_advanced/abductor/Initialize(mapload)
. = ..()
GLOB.abductor_equipment.Add(src)
..()
/obj/machinery/computer/camera_advanced/abductor/CreateEye()
..()
code/game/gamemodes/miniantags/abduction/machinery/console.dm
+8 -2
View File
@@ -4,9 +4,9 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/team = 0
/obj/machinery/abductor/New()
/obj/machinery/abductor/Initialize(mapload)
. = ..()
GLOB.abductor_equipment.Add(src)
..()
/obj/machinery/abductor/Destroy()
GLOB.abductor_equipment.Remove(src)
@@ -30,6 +30,12 @@
/obj/machinery/abductor/console/Initialize()
..()
return INITIALIZE_HINT_LATELOAD
/obj/machinery/abductor/console/LateInitialize()
..()
// GLOB.abductor_equipment is populated in Initialize;
// delaying linkage until after.
Link_Abduction_Equipment()
/obj/machinery/abductor/console/attack_hand(mob/user)
code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm
+2 -2
View File
@@ -13,8 +13,8 @@
//TODO : replace with presets or spectrum
return rgb(rand(0,255),rand(0,255),rand(0,255))
/obj/machinery/abductor/gland_dispenser/New()
..()
/obj/machinery/abductor/gland_dispenser/Initialize(mapload)
. = ..()
gland_types = subtypesof(/obj/item/organ/internal/heart/gland)
gland_types = shuffle(gland_types)
gland_colors = new/list(gland_types.len)
code/game/machinery/Beacon.dm
+6 -6
View File
@@ -15,8 +15,8 @@
var/enabled = TRUE
var/cc_beacon = FALSE //can be teleported to even if on zlevel2
/obj/machinery/bluespace_beacon/New()
..()
/obj/machinery/bluespace_beacon/Initialize(mapload)
. = ..()
create_beacon()
/obj/machinery/bluespace_beacon/proc/create_beacon()
@@ -73,8 +73,8 @@
area_bypass = TRUE // This enables teleports to this beacon to bypass the tele_proof flag of /area/s. Intended for depot syndi teleport computer.
var/obj/machinery/computer/syndicate_depot/teleporter/mycomputer
/obj/machinery/bluespace_beacon/syndicate/New()
..()
/obj/machinery/bluespace_beacon/syndicate/Initialize(mapload)
. = ..()
if(!GAMEMODE_IS_NUCLEAR && prob(50))
enabled = TRUE
@@ -86,6 +86,6 @@
/obj/machinery/bluespace_beacon/syndicate/infiltrator //beacon guaranteed offline at roundstart for infiltrator base
cc_beacon = TRUE
/obj/machinery/bluespace_beacon/syndicate/infiltrator/New()
..()
/obj/machinery/bluespace_beacon/syndicate/infiltrator/Initialize(mapload)
. = ..()
enabled = FALSE
code/game/machinery/OpTable.dm
+2 -2
View File
@@ -16,8 +16,8 @@
var/reagent_target_amount = 1
var/inject_amount = 1
/obj/machinery/optable/New()
..()
/obj/machinery/optable/Initialize(mapload)
. = ..()
for(dir in list(NORTH,EAST,SOUTH,WEST))
computer = locate(/obj/machinery/computer/operating, get_step(src, dir))
if(computer)
code/game/machinery/PDApainter.dm
+2 -2
View File
@@ -27,8 +27,8 @@
return
/obj/machinery/pdapainter/New()
..()
/obj/machinery/pdapainter/Initialize(mapload)
. = ..()
var/blocked = list(/obj/item/pda/silicon/ai, /obj/item/pda/silicon/robot, /obj/item/pda/silicon/pai, /obj/item/pda/heads,
/obj/item/pda/clear, /obj/item/pda/syndicate, /obj/item/pda/chameleon, /obj/item/pda/chameleon/broken)
code/game/machinery/Sleeper.dm
+6 -6
View File
@@ -50,8 +50,8 @@
else
set_light(0)
/obj/machinery/sleeper/New()
..()
/obj/machinery/sleeper/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/sleeper(null)
@@ -66,8 +66,8 @@
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
/obj/machinery/sleeper/upgraded/New()
..()
/obj/machinery/sleeper/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/sleeper(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
@@ -591,8 +591,8 @@
light_color = LIGHT_COLOR_DARKRED
/obj/machinery/sleeper/syndie/New()
..()
/obj/machinery/sleeper/syndie/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/sleeper/syndicate(null)
var/obj/item/stock_parts/matter_bin/B = new(null)
code/game/machinery/adv_med.dm
+2 -2
View File
@@ -38,8 +38,8 @@
else
M.forceMove(loc)
/obj/machinery/bodyscanner/New()
..()
/obj/machinery/bodyscanner/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/bodyscanner(null)
component_parts += new /obj/item/stock_parts/scanning_module(null)
code/game/machinery/buttons.dm
+2 -2
View File
@@ -38,8 +38,8 @@
if(SSradio)
set_frequency(frequency)
/obj/machinery/driver_button/Initialize()
..()
/obj/machinery/driver_button/Initialize(mapload)
. = ..()
set_frequency(frequency)
/obj/machinery/driver_button/set_frequency(new_frequency)
code/game/machinery/camera/presets.dm
+13 -13
View File
@@ -39,19 +39,19 @@
var/number = 0 //camera number in area
//This camera type automatically sets it's name to whatever the area that it's in is called.
/obj/machinery/camera/autoname/New()
..()
spawn(10)
number = 1
var/area/A = get_area(src)
if(A)
for(var/obj/machinery/camera/autoname/C in GLOB.machines)
if(C == src) continue
var/area/CA = get_area(C)
if(CA.type == A.type)
if(C.number)
number = max(number, C.number+1)
c_tag = "[A.name] #[number]"
/obj/machinery/camera/autoname/Initialize(mapload)
. = ..()
number = 1
var/area/A = get_area(src)
if(A)
for(var/obj/machinery/camera/autoname/C in GLOB.machines)
if(C == src)
continue
var/area/CA = get_area(C)
if(CA.type == A.type)
if(C.number)
number = max(number, C.number + 1)
c_tag = "[A.name] #[number]"
// CHECKS
code/game/machinery/cloning.dm
+4 -4
View File
@@ -63,8 +63,8 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
/obj/machinery/clonepod/biomass
biomass = CLONE_BIOMASS
/obj/machinery/clonepod/New()
..()
/obj/machinery/clonepod/Initialize(mapload)
. = ..()
countdown = new(src)
Radio = new /obj/item/radio(src)
@@ -83,8 +83,8 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
RefreshParts()
update_icon()
/obj/machinery/clonepod/upgraded/New()
..()
/obj/machinery/clonepod/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/clonepod(null)
component_parts += new /obj/item/stock_parts/scanning_module/phasic(null)
code/game/machinery/computer/HolodeckControl.dm
+2 -2
View File
@@ -171,8 +171,8 @@
log_game("[key_name(usr)] emagged the Holodeck Control Computer")
src.updateUsrDialog()
/obj/machinery/computer/HolodeckControl/New()
..()
/obj/machinery/computer/HolodeckControl/Initialize(mapload)
. = ..()
linkedholodeck = locate(/area/holodeck/alphadeck)
//if(linkedholodeck)
// target = locate(/area/holodeck/source_emptycourt)
code/game/machinery/computer/Operating.dm
+2 -2
View File
@@ -23,8 +23,8 @@
var/mob/living/carbon/currentPatient
var/patientStatusHolder //Hold the last instance of table.patient.status. When table.patient.status no longer matches this variable, the computer should tell the doctor
/obj/machinery/computer/operating/New()
..()
/obj/machinery/computer/operating/Initialize(mapload)
. = ..()
table = locate(/obj/machinery/optable, orange(1, src))
if(table)
table.computer = src
code/game/machinery/computer/arcade.dm
+3 -4
View File
@@ -11,14 +11,13 @@
/obj/machinery/computer/arcade/proc/Reset()
return
/obj/machinery/computer/arcade/New()
..()
/obj/machinery/computer/arcade/Initialize(mapload)
. = ..()
if(!circuit)
var/choice = pick(subtypesof(/obj/machinery/computer/arcade))
var/obj/machinery/computer/arcade/chosen = new choice(loc)
chosen.dir = dir
qdel(src)
return
return INITIALIZE_HINT_QDEL
Reset()
code/game/machinery/computer/communications.dm
+3
View File
@@ -43,6 +43,9 @@
/obj/machinery/computer/communications/New()
GLOB.shuttle_caller_list += src
..()
/obj/machinery/computer/communications/Initialize(mapload)
. = ..()
crew_announcement.newscast = 0
/obj/machinery/computer/communications/proc/is_authenticated(mob/user, message = 1)
code/game/machinery/computer/crew.dm
+2 -2
View File
@@ -10,9 +10,9 @@
circuit = /obj/item/circuitboard/crew
var/datum/ui_module/crew_monitor/crew_monitor
/obj/machinery/computer/crew/New()
/obj/machinery/computer/crew/Initialize()
. = ..()
crew_monitor = new(src)
..()
/obj/machinery/computer/crew/Destroy()
QDEL_NULL(crew_monitor)
code/game/machinery/computer/power.dm
+2 -4
View File
@@ -27,14 +27,12 @@
circuit = /obj/item/circuitboard/powermonitor/secret
is_secret_monitor = TRUE
/obj/machinery/computer/monitor/New()
..()
/obj/machinery/computer/monitor/Initialize(mapload)
. = ..()
GLOB.power_monitors += src
GLOB.power_monitors = sortAtom(GLOB.power_monitors)
power_monitor = new(src)
/obj/machinery/computer/monitor/Initialize()
..()
GLOB.powermonitor_repository.update_cache()
powernet = find_powernet()
history["supply"] = list()
code/game/machinery/computer/prisoner.dm
+3 -3
View File
@@ -18,9 +18,9 @@
/obj/machinery/computer/prisoner/attack_ai(mob/user as mob)
return src.attack_hand(user)
/obj/machinery/computer/prisoner/New()
GLOB.prisoncomputer_list += src
return ..()
/obj/machinery/computer/prisoner/Initialize(mapload)
. = ..()
GLOB.prisoncomputer_list += src
/obj/machinery/computer/prisoner/Destroy()
GLOB.prisoncomputer_list -= src
code/game/machinery/computer/store.dm
-3
View File
@@ -10,9 +10,6 @@
name = "\improper Merchandise Computer Circuitboard"
build_path = /obj/machinery/computer/merch
/obj/machinery/computer/merch/New()
..()
/obj/machinery/computer/merch/attack_ai(mob/user as mob)
src.add_hiddenprint(user)
return attack_hand(user)
code/game/machinery/cryopod.dm
+4 -8
View File
@@ -42,8 +42,8 @@
var/allow_items = 1
/obj/machinery/computer/cryopod/New()
..()
/obj/machinery/computer/cryopod/Initialize(mapload)
. = ..()
for(var/T in GLOB.potential_theft_objectives)
theft_cache += new T
@@ -244,14 +244,10 @@
/obj/machinery/cryopod/right
dir = EAST
/obj/machinery/cryopod/New()
/obj/machinery/cryopod/Initialize(mapload)
. = ..()
announce = new /obj/item/radio/intercom(src)
icon_state = base_icon_state
..()
/obj/machinery/cryopod/Initialize()
..()
find_control_computer()
/obj/machinery/cryopod/proc/find_control_computer(urgent=0)
code/game/machinery/dance_machine.dm
+1 -1
View File
@@ -46,7 +46,7 @@
var/datum/track/T = new /datum/track(name, file, length, beat)
songs += T
/obj/machinery/disco/New()
/obj/machinery/disco/Initialize(mapload)
. = ..()
selection = songs[1]
code/game/machinery/doors/airlock.dm
+16 -18
View File
@@ -108,24 +108,6 @@ GLOBAL_LIST_EMPTY(airlock_overlays)
/obj/machinery/door/airlock/welded
welded = TRUE
/*
About the new airlock wires panel:
* An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires.
* one wire from the ID scanner. Sending a pulse through this flashes the red light on the door (if the door has power). If you cut this wire, the door will stop recognizing valid IDs. (If the door has 0000 access, it still opens and closes, though)
* two wires for power. Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be open, but bolts-raising will not work. Cutting these wires may electrocute the user.
* one wire for door bolts. Sending a pulse through this drops door bolts (whether the door is powered or not) or raises them (if it is). Cutting this wire also drops the door bolts, and mending it does not raise them. If the wire is cut, trying to raise the door bolts will not work.
* two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter). Cutting either one disables the backup door power (allowing it to be crowbarred open, but disabling bolts-raising), but may electocute the user.
* one wire for opening the door. Sending a pulse through this while the door has power makes it open the door if no access is required.
* one wire for AI control. Sending a pulse through this blocks AI control for a second or so (which is enough to see the AI control light on the panel dialog go off and back on again). Cutting this prevents the AI from controlling the door unless it has hacked the door through the power connection (which takes about a minute). If both main and backup power are cut, as well as this wire, then the AI cannot operate or hack the door at all.
* one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds. Cutting this wire electrifies the door, so that the next person to touch the door without insulated gloves gets electrocuted. (Currently it is also STAYING electrified until someone mends the wire)
* one wire for controling door safetys. When active, door does not close on someone. When cut, door will ruin someone's shit. When pulsed, door will immedately ruin someone's shit.
* one wire for controlling door speed. When active, dor closes at normal rate. When cut, door does not close manually. When pulsed, door attempts to close every tick.
*/
// You can find code for the airlock wires in the wire datum folder.
/obj/machinery/door/airlock/New()
..()
wires = new(src)
/*
* reimp, imitate an access denied event.
@@ -138,6 +120,22 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/Initialize()
. = ..()
/*
About the new airlock wires panel:
* An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires.
* one wire from the ID scanner. Sending a pulse through this flashes the red light on the door (if the door has power). If you cut this wire, the door will stop recognizing valid IDs. (If the door has 0000 access, it still opens and closes, though)
* two wires for power. Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be open, but bolts-raising will not work. Cutting these wires may electrocute the user.
* one wire for door bolts. Sending a pulse through this drops door bolts (whether the door is powered or not) or raises them (if it is). Cutting this wire also drops the door bolts, and mending it does not raise them. If the wire is cut, trying to raise the door bolts will not work.
* two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter). Cutting either one disables the backup door power (allowing it to be crowbarred open, but disabling bolts-raising), but may electocute the user.
* one wire for opening the door. Sending a pulse through this while the door has power makes it open the door if no access is required.
* one wire for AI control. Sending a pulse through this blocks AI control for a second or so (which is enough to see the AI control light on the panel dialog go off and back on again). Cutting this prevents the AI from controlling the door unless it has hacked the door through the power connection (which takes about a minute). If both main and backup power are cut, as well as this wire, then the AI cannot operate or hack the door at all.
* one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds. Cutting this wire electrifies the door, so that the next person to touch the door without insulated gloves gets electrocuted. (Currently it is also STAYING electrified until someone mends the wire)
* one wire for controling door safetys. When active, door does not close on someone. When cut, door will ruin someone's shit. When pulsed, door will immedately ruin someone's shit.
* one wire for controlling door speed. When active, dor closes at normal rate. When cut, door does not close manually. When pulsed, door attempts to close every tick.
*/
// You can find code for the airlock wires in the wire datum folder.
wires = new(src)
if(closeOtherId != null)
addtimer(CALLBACK(src, .proc/update_other_id), 5)
if(glass)
code/game/machinery/doors/airlock_control.dm
+6 -23
View File
@@ -129,20 +129,14 @@
frequency = new_frequency
radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK)
// this is an override, in addition to the one in airlock_control.dm
/obj/machinery/door/airlock/Initialize()
..()
. = ..()
if(frequency)
set_frequency(frequency)
update_icon()
/obj/machinery/door/airlock/New()
..()
if(SSradio)
set_frequency(frequency)
/obj/machinery/airlock_sensor
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off"
@@ -204,15 +198,10 @@
frequency = new_frequency
radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK)
/obj/machinery/airlock_sensor/Initialize()
..()
/obj/machinery/airlock_sensor/Initialize(mapload)
. = ..()
set_frequency(frequency)
/obj/machinery/airlock_sensor/New()
..()
if(SSradio)
set_frequency(frequency)
/obj/machinery/airlock_sensor/Destroy()
if(SSradio)
SSradio.remove_object(src, frequency)
@@ -274,16 +263,10 @@
frequency = new_frequency
radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK)
/obj/machinery/access_button/Initialize()
..()
/obj/machinery/access_button/Initialize(mapload)
. = ..()
set_frequency(frequency)
/obj/machinery/access_button/New()
..()
if(SSradio)
set_frequency(frequency)
/obj/machinery/access_button/Destroy()
if(SSradio)
SSradio.remove_object(src, frequency)
code/game/machinery/doors/alarmlock.dm
+2 -5
View File
@@ -8,10 +8,6 @@
var/datum/radio_frequency/air_connection
var/air_frequency = ATMOS_FIRE_FREQ
/obj/machinery/door/airlock/alarmlock/New()
..()
air_connection = new
/obj/machinery/door/airlock/alarmlock/Destroy()
if(SSradio)
SSradio.remove_object(src,air_frequency)
@@ -19,7 +15,8 @@
return ..()
/obj/machinery/door/airlock/alarmlock/Initialize()
..()
. = ..()
air_connection = new
SSradio.remove_object(src, air_frequency)
air_connection = SSradio.add_object(src, air_frequency, RADIO_TO_AIRALARM)
open()
code/game/machinery/doors/brigdoors.dm
+20 -21
View File
@@ -42,10 +42,6 @@
var/prisoner_time
var/prisoner_hasrecord = FALSE
/obj/machinery/door_timer/New()
GLOB.celltimers_list += src
return ..()
/obj/machinery/door_timer/Destroy()
GLOB.celltimers_list -= src
return ..()
@@ -118,34 +114,37 @@
return
atom_say("[src] beeps, \"[occupant]: [notifytext]\"")
/obj/machinery/door_timer/Initialize()
/obj/machinery/door_timer/Initialize(mapload)
..()
GLOB.celltimers_list += src
Radio = new /obj/item/radio(src)
Radio.listening = 0
Radio.config(list("Security" = 0))
Radio.follow_target = src
return INITIALIZE_HINT_LATELOAD
spawn(20)
for(var/obj/machinery/door/window/brigdoor/M in GLOB.airlocks)
if(M.id == id)
targets += M
/obj/machinery/door_timer/LateInitialize()
..()
for(var/obj/machinery/door/window/brigdoor/M in GLOB.airlocks)
if(M.id == id)
targets += M
for(var/obj/machinery/flasher/F in GLOB.machines)
if(F.id == id)
targets += F
for(var/obj/machinery/flasher/F in GLOB.machines)
if(F.id == id)
targets += F
for(var/obj/structure/closet/secure_closet/brig/C in world)
if(C.id == id)
targets += C
for(var/obj/structure/closet/secure_closet/brig/C in world)
if(C.id == id)
targets += C
for(var/obj/machinery/treadmill_monitor/T in GLOB.machines)
if(T.id == id)
targets += T
for(var/obj/machinery/treadmill_monitor/T in GLOB.machines)
if(T.id == id)
targets += T
if(targets.len==0)
stat |= BROKEN
update_icon()
if(targets.len==0)
stat |= BROKEN
update_icon()
/obj/machinery/door_timer/Destroy()
QDEL_NULL(Radio)
code/game/machinery/doors/door.dm
+7 -6
View File
@@ -39,10 +39,13 @@
/obj/machinery/door/New()
..()
GLOB.airlocks += src
update_freelook_sight()
/obj/machinery/door/Initialize(mapload)
. = ..()
set_init_door_layer()
update_dir()
update_freelook_sight()
GLOB.airlocks += src
spark_system = new /datum/effect_system/spark_spread
spark_system.set_up(2, 1, src)
@@ -50,6 +53,8 @@
real_explosion_block = explosion_block
explosion_block = EXPLOSION_BLOCK_PROC
air_update_turf(1)
/obj/machinery/door/proc/set_init_door_layer()
if(density)
layer = closingLayer
@@ -73,10 +78,6 @@
bound_width = world.icon_size
bound_height = width * world.icon_size
/obj/machinery/door/Initialize()
air_update_turf(1)
..()
/obj/machinery/door/Destroy()
density = 0
air_update_turf(1)
code/game/machinery/doors/windowdoor.dm
+3
View File
@@ -24,6 +24,9 @@
..()
if(set_dir)
setDir(set_dir)
/obj/machinery/door/window/Initialize(mapload)
. = ..()
if(req_access && req_access.len)
icon_state = "[icon_state]"
base_state = icon_state
code/game/machinery/doppler_array.dm
+2 -2
View File
@@ -26,8 +26,8 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
actual_size_message = log_actual_size_message
theoretical_size_message = log_theoretical_size_message
/obj/machinery/doppler_array/New()
..()
/obj/machinery/doppler_array/Initialize(mapload)
. = ..()
GLOB.doppler_arrays += src
explosion_target = rand(8, 20)
toxins_tech = new /datum/tech/toxins(src)
code/game/machinery/firealarm.dm
+1 -1
View File
@@ -273,11 +273,11 @@ FIRE ALARM
myArea = get_area(src)
LAZYADD(myArea.firealarms, src)
update_icon()
/obj/machinery/firealarm/Initialize(mapload)
. = ..()
name = "fire alarm"
update_icon()
/obj/machinery/firealarm/Destroy()
LAZYREMOVE(GLOB.firealarm_soundloop.output_atoms, src)
code/game/machinery/gameboard.dm
+2 -2
View File
@@ -9,8 +9,8 @@
var/cooling_down = 0
light_color = LIGHT_COLOR_LIGHTBLUE
/obj/machinery/gameboard/New()
..()
/obj/machinery/gameboard/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/gameboard(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
code/game/machinery/hologram.dm
+2 -2
View File
@@ -59,8 +59,8 @@ GLOBAL_LIST_EMPTY(holopads)
var/ringing = FALSE
var/dialling_input = FALSE //The user is currently selecting where to send their call
/obj/machinery/hologram/holopad/New()
..()
/obj/machinery/hologram/holopad/Initialize(mapload)
. = ..()
GLOB.holopads += src
component_parts = list()
component_parts += new /obj/item/circuitboard/holopad(null)
code/game/machinery/igniter.dm
+2 -5
View File
@@ -38,8 +38,8 @@
location.hotspot_expose(1000,500,1)
return 1
/obj/machinery/igniter/New()
..()
/obj/machinery/igniter/Initialize(mapload)
. = ..()
icon_state = "igniter[on]"
/obj/machinery/igniter/power_change()
@@ -62,9 +62,6 @@
var/base_state = "migniter"
anchored = 1
/obj/machinery/sparker/New()
..()
/obj/machinery/sparker/power_change()
if( powered() && disable == 0 )
stat &= ~NOPOWER
code/game/machinery/magnet.dm
+18 -19
View File
@@ -29,16 +29,14 @@
var/center_y = 0
var/max_dist = 20 // absolute value of center_x,y cannot exceed this integer
/obj/machinery/magnetic_module/New()
..()
/obj/machinery/magnetic_module/Initialize(mapload)
. = ..()
var/turf/T = loc
if(!T.transparent_floor)
hide(T.intact)
center = T
spawn(10) // must wait for map loading to finish
if(SSradio)
SSradio.add_object(src, freq, RADIO_MAGNETS)
SSradio.add_object(src, freq, RADIO_MAGNETS)
spawn()
magnetic_process()
@@ -197,27 +195,28 @@
var/looping = 0 // 1 if looping
/obj/machinery/magnetic_controller/New()
..()
if(autolink)
for(var/obj/machinery/magnetic_module/M in GLOB.machines)
if(M.freq == frequency && M.code == code)
magnets.Add(M)
spawn(45) // must wait for map loading to finish
if(SSradio)
radio_connection = SSradio.add_object(src, frequency, RADIO_MAGNETS)
/obj/machinery/magnetic_controller/Initialize(mapload)
. = ..()
radio_connection = SSradio.add_object(src, frequency, RADIO_MAGNETS)
if(path) // check for default path
filter_path() // renders rpath
if(autolink)
return INITIALIZE_HINT_LATELOAD
/obj/machinery/magnetic_controller/LateInitialize()
..()
if(autolink)
// GLOB.machines is populated in /machinery/Initialize
// so linkage gets delayed until that one finished.
for(var/obj/machinery/magnetic_module/M in GLOB.machines)
if(M.freq == frequency && M.code == code)
magnets.Add(M)
/obj/machinery/magnetic_controller/Destroy()
if(SSradio)
SSradio.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
radio_connection = null
return ..()
code/game/machinery/navbeacon.dm
+2 -2
View File
@@ -21,8 +21,8 @@
req_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS)
/obj/machinery/navbeacon/New()
..()
/obj/machinery/navbeacon/Initialize(mapload)
. = ..()
set_codes()
code/game/machinery/quantum_pad.dm
+2 -2
View File
@@ -14,8 +14,8 @@
var/power_efficiency = 1
var/obj/machinery/quantumpad/linked_pad = null
/obj/machinery/quantumpad/New()
..()
/obj/machinery/quantumpad/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/quantumpad(null)
component_parts += new /obj/item/stack/ore/bluespace_crystal/artificial(null)
code/game/machinery/recharger.dm
+2 -2
View File
@@ -22,8 +22,8 @@
var/obj/item/charging = null // The item that is being charged
var/using_power = FALSE // Whether the recharger is actually transferring power or not, used for icon
/obj/machinery/recharger/New()
..()
/obj/machinery/recharger/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/recharger(null)
component_parts += new /obj/item/stock_parts/capacitor(null)
code/game/machinery/rechargestation.dm
+4 -4
View File
@@ -24,8 +24,8 @@
go_out()
return ..()
/obj/machinery/recharge_station/New()
..()
/obj/machinery/recharge_station/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/cyborgrecharger(null)
component_parts += new /obj/item/stock_parts/capacitor(null)
@@ -35,8 +35,8 @@
RefreshParts()
build_icon()
/obj/machinery/recharge_station/upgraded/New()
..()
/obj/machinery/recharge_station/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/cyborgrecharger(null)
component_parts += new /obj/item/stock_parts/capacitor/super(null)
code/game/machinery/recycler.dm
+6 -3
View File
@@ -18,9 +18,8 @@
var/eat_victim_items = 1
var/item_recycle_sound = 'sound/machines/recycler.ogg'
/obj/machinery/recycler/New()
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_PLASTIC, MAT_BLUESPACE), 0, TRUE, null, null, null, TRUE)
..()
/obj/machinery/recycler/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/recycler(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -28,6 +27,10 @@
RefreshParts()
update_icon()
/obj/machinery/recycler/ComponentInitialize()
..()
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_PLASTIC, MAT_BLUESPACE), 0, TRUE, null, null, null, TRUE)
/obj/machinery/recycler/RefreshParts()
var/amt_made = 0
var/mat_mod = 0
code/game/machinery/shieldgen.dm
+2 -5
View File
@@ -11,13 +11,10 @@
flags_2 = RAD_NO_CONTAMINATE_2
max_integrity = 200
/obj/machinery/shield/New()
/obj/machinery/shield/Initialize(mapload)
. = ..()
dir = pick(NORTH, SOUTH, EAST, WEST)
..()
/obj/machinery/shield/Initialize()
air_update_turf(1)
..()
/obj/machinery/shield/Destroy()
opacity = FALSE
code/game/machinery/snow_machine.dm
+2 -2
View File
@@ -12,8 +12,8 @@
var/lower_temperature_limit = T0C - 10 //Set lower for a bigger freeze
var/infinite_snow = FALSE //Set this to have it not use water
/obj/machinery/snow_machine/New()
..()
/obj/machinery/snow_machine/Initialize(mapload)
. = ..()
create_reagents(300) //Makes 100 snow tiles!
reagents.add_reagent("water", 300) //But any reagent will do
reagents.flags |= REAGENT_NOREACT //Because a) this doesn't need to process and b) this way we can use any reagents without needing to worry about explosions and shit
code/game/machinery/spaceheater.dm
+2 -2
View File
@@ -16,8 +16,8 @@
/obj/machinery/space_heater/get_cell()
return cell
/obj/machinery/space_heater/New()
..()
/obj/machinery/space_heater/Initialize(mapload)
. = ..()
cell = new /obj/item/stock_parts/cell(src)
update_icon()
return
code/game/machinery/suit_storage_unit.dm
+1 -5
View File
@@ -274,13 +274,9 @@
suit_type = /obj/item/clothing/suit/space/nasavoid/ltblue
..()
/obj/machinery/suit_storage_unit/New()
..()
wires = new(src)
/obj/machinery/suit_storage_unit/Initialize()
. = ..()
wires = new(src)
if(suit_type)
suit = new suit_type(src)
if(helmet_type)
code/game/machinery/syndicatebomb.dm
+5 -5
View File
@@ -82,13 +82,13 @@
if(payload in src)
payload.defuse()
/obj/machinery/syndicatebomb/New()
wires = new(src)
/obj/machinery/syndicatebomb/Initialize(mapload)
. = ..()
wires = new(src)
if(payload)
payload = new payload(src)
update_icon()
countdown = new(src)
..()
/obj/machinery/syndicatebomb/Destroy()
SStgui.close_uis(wires)
@@ -299,8 +299,8 @@
open_panel = TRUE
timer_set = 120
/obj/machinery/syndicatebomb/empty/New()
..()
/obj/machinery/syndicatebomb/empty/Initialize(mapload)
. = ..()
wires.cut_all()
code/game/machinery/teleporter.dm
+6 -14
View File
@@ -319,8 +319,8 @@
var/calibrated //Calibration prevents mutation
var/admin_usage = FALSE // if 1, works on CC level. If 0, doesn't. Used for admin room teleport.
/obj/machinery/teleport/hub/New()
..()
/obj/machinery/teleport/hub/Initialize(mapload)
. = ..()
link_power_station()
component_parts = list()
component_parts += new /obj/item/circuitboard/teleporter_hub(null)
@@ -328,18 +328,14 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
RefreshParts()
/obj/machinery/teleport/hub/upgraded/New()
..()
/obj/machinery/teleport/hub/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/teleporter_hub(null)
component_parts += new /obj/item/stack/ore/bluespace_crystal/artificial(null, 3)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
RefreshParts()
/obj/machinery/teleport/hub/Initialize()
..()
link_power_station()
/obj/machinery/teleport/hub/Destroy()
if(power_station)
power_station.teleporter_hub = null
@@ -513,8 +509,8 @@
var/list/linked_stations = list()
var/efficiency = 0
/obj/machinery/teleport/station/New()
..()
/obj/machinery/teleport/station/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/teleporter_station(null)
component_parts += new /obj/item/stack/ore/bluespace_crystal/artificial(null, 2)
@@ -524,10 +520,6 @@
RefreshParts()
link_console_and_hub()
/obj/machinery/teleport/station/Initialize()
..()
link_console_and_hub()
/obj/machinery/teleport/station/RefreshParts()
var/E
for(var/obj/item/stock_parts/capacitor/C in component_parts)
code/game/mecha/mech_bay.dm
+4 -4
View File
@@ -22,8 +22,8 @@
var/on = 0
var/turf/recharging_turf = null
/obj/machinery/mech_bay_recharge_port/New()
..()
/obj/machinery/mech_bay_recharge_port/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/mech_recharger(null)
component_parts += new /obj/item/stock_parts/capacitor(null)
@@ -38,8 +38,8 @@
/obj/machinery/mech_bay_recharge_port/proc/update_recharge_turf()
recharging_turf = get_step(loc, dir)
/obj/machinery/mech_bay_recharge_port/upgraded/New()
..()
/obj/machinery/mech_bay_recharge_port/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/mech_recharger(null)
component_parts += new /obj/item/stock_parts/capacitor/super(null)
code/game/mecha/mech_fabricator.dm
+5 -6
View File
@@ -49,12 +49,13 @@
/// Whether the queue is currently being processed.
var/processing_queue = FALSE
/obj/machinery/mecha_part_fabricator/New()
/obj/machinery/mecha_part_fabricator/Initialize(mapload)
. = ..()
// Set up some datums
var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE), 0, FALSE, /obj/item/stack, CALLBACK(src, .proc/can_insert_materials), CALLBACK(src, .proc/on_material_insert))
materials.precise_insertion = TRUE
local_designs = new /datum/research(src)
..()
// Components
component_parts = list()
component_parts += new /obj/item/circuitboard/mechfab(null)
@@ -65,8 +66,6 @@
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mecha_part_fabricator/Initialize(mapload)
. = ..()
categories = list(
"Cyborg",
"Cyborg Repair",
@@ -458,8 +457,8 @@
*
* Upgraded variant of [/obj/machinery/mecha_part_fabricator].
*/
/obj/machinery/mecha_part_fabricator/upgraded/New()
..()
/obj/machinery/mecha_part_fabricator/upgraded/Initialize(mapload)
. = ..()
// Upgraded components
QDEL_LIST(component_parts)
component_parts = list()
code/game/objects/items/weapons/implants/implantchair.dm
+2 -2
View File
@@ -17,8 +17,8 @@
var/mob/living/carbon/occupant = null
var/injecting = 0
/obj/machinery/implantchair/New()
..()
/obj/machinery/implantchair/Initialize(mapload)
. = ..()
add_implants()
code/game/objects/objs.dm
+3
View File
@@ -7,6 +7,9 @@
var/in_use = FALSE // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
var/damtype = "brute"
var/force = 0
// You can define armor as a list in datum definition (e.g. `armor = list("fire" = 80, "brute" = 10)`),
// which would be converted to armor datum during initialization.
// Setting `armor` to a list on an *existing* object would inevitably runtime. Use `getArmor()` instead.
var/datum/armor/armor
var/obj_integrity //defaults to max_integrity
var/max_integrity = 500
code/modules/arcade/arcade_base.dm
+3 -3
View File
@@ -14,12 +14,12 @@
var/last_winner = null //for letting people who to hunt down and steal prizes from
var/window_name = "arcade" //in case you want to change the window name for certain machines
/obj/machinery/arcade/New()
..()
/obj/machinery/arcade/Initialize(mapload)
. = ..()
if(type == /obj/machinery/arcade) //if you spawn the base-type, it will replace itself with a random subtype for randomness
var/choice = pick(subtypesof(/obj/machinery/arcade))
new choice(loc)
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/machinery/arcade/examine(mob/user)
. = ..()
code/modules/arcade/claw_game.dm
+2 -2
View File
@@ -17,8 +17,8 @@ GLOBAL_VAR(claw_game_html)
'icons/obj/arcade_images/prize_inside.png',
'icons/obj/arcade_images/prizeorbs.png')
/obj/machinery/arcade/claw/New()
..()
/obj/machinery/arcade/claw/Initialize(mapload)
. = ..()
machine_image = pick("_1", "_2")
update_icon()
code/modules/arcade/prize_counter.dm
+2 -2
View File
@@ -10,8 +10,8 @@
idle_power_usage = 40
var/tickets = 0
/obj/machinery/prize_counter/New()
..()
/obj/machinery/prize_counter/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/prize_counter(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
code/modules/awaymissions/gateway.dm
+2 -4
View File
@@ -40,13 +40,11 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null)
var/wait = 0 //this just grabs world.time at world start
var/obj/machinery/gateway/centeraway/awaygate = null
/obj/machinery/gateway/centerstation/New()
..()
/obj/machinery/gateway/centerstation/Initialize(mapload)
. = ..()
if(!GLOB.the_gateway)
GLOB.the_gateway = src
/obj/machinery/gateway/centerstation/Initialize()
..()
update_icon()
wait = world.time + GLOB.configuration.gateway.away_mission_delay
return INITIALIZE_HINT_LATELOAD
code/modules/economy/ATM.dm
+3 -5
View File
@@ -35,12 +35,10 @@ log transactions
var/view_screen = DEFAULT_SCREEN
var/lastprint = 0 // Printer needs time to cooldown
/obj/machinery/atm/New()
..()
machine_id = "[station_name()] RT #[GLOB.num_financial_terminals++]"
/obj/machinery/atm/Initialize()
..()
/obj/machinery/atm/Initialize(mapload)
. = ..()
machine_id = "[station_name()] RT #[GLOB.num_financial_terminals++]"
reconnect_database()
/obj/machinery/atm/process()
code/modules/fish/fishtank.dm
+4 -4
View File
@@ -114,14 +114,14 @@
// NEW() PROCS //
//////////////////////////////
/obj/machinery/fishtank/New()
..()
/obj/machinery/fishtank/Initialize(mapload)
. = ..()
if(!has_lid) //Tank doesn't have a lid/light, remove the verbs for then
verbs -= /obj/machinery/fishtank/verb/toggle_lid_verb
verbs -= /obj/machinery/fishtank/verb/toggle_light_verb
/obj/machinery/fishtank/tank/New()
..()
/obj/machinery/fishtank/tank/Initialize(mapload)
. = ..()
if(prob(5)) //5% chance to get the castle decoration
icon_state = "tank2"
code/modules/food_and_drinks/drinks/bottler/bottler.dm
+1 -1
View File
@@ -22,7 +22,7 @@
var/list/containers = list("glass bottle" = 10, "plastic bottle" = 20, "metal can" = 25)
var/bottling = 0
/obj/machinery/bottler/New()
/obj/machinery/bottler/Initialize(mapload)
. = ..()
if(!available_recipes)
available_recipes = list()
code/modules/food_and_drinks/kitchen_machinery/candy_maker.dm
+4 -4
View File
@@ -18,8 +18,8 @@
* Initialising
********************/
/obj/machinery/kitchen_machine/candy_maker/New()
..()
/obj/machinery/kitchen_machine/candy_maker/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/candy_maker(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
@@ -27,8 +27,8 @@
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
/obj/machinery/kitchen_machine/candy_maker/upgraded/New()
..()
/obj/machinery/kitchen_machine/candy_maker/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/candy_maker(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+4 -4
View File
@@ -14,8 +14,8 @@
has_specials = 1
upgradeable = 1
/obj/machinery/cooker/deepfryer/New()
..()
/obj/machinery/cooker/deepfryer/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/deepfryer(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
@@ -23,8 +23,8 @@
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
/obj/machinery/cooker/deepfryer/upgraded/New()
..()
/obj/machinery/cooker/deepfryer/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/deepfryer(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+7 -6
View File
@@ -326,12 +326,13 @@
var/consumption_delay = 3 SECONDS
var/list/victim_targets = list()
/obj/machinery/gibber/autogibber/New()
..()
spawn(5)
var/turf/T = get_step(src, acceptdir)
if(istype(T))
lturf = T
/obj/machinery/gibber/autogibber/Initialize(mapload)
. = ..()
var/turf/T = get_step(src, acceptdir)
if(istype(T))
lturf = T
component_parts = list()
component_parts += new /obj/item/circuitboard/gibber(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
+4 -4
View File
@@ -18,8 +18,8 @@
* Initialising
********************/
/obj/machinery/kitchen_machine/grill/New()
..()
/obj/machinery/kitchen_machine/grill/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/grill(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
@@ -28,8 +28,8 @@
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
/obj/machinery/kitchen_machine/grill/upgraded/New()
..()
/obj/machinery/kitchen_machine/grill/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/grill(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+2 -2
View File
@@ -24,8 +24,8 @@
return cone_name
/obj/machinery/icemachine/New()
..()
/obj/machinery/icemachine/Initialize(mapload)
. = ..()
create_reagents(500)
/obj/machinery/icemachine/attackby(obj/item/I, mob/user, params)
code/modules/food_and_drinks/kitchen_machinery/juicer.dm
+1 -1
View File
@@ -30,7 +30,7 @@
/obj/item/reagent_containers/food/snacks/grown/pineapple = "pineapplejuice"
)
/obj/machinery/juicer/New()
/obj/machinery/juicer/Initialize(mapload)
. = ..()
beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+2 -2
View File
@@ -28,8 +28,8 @@
* Initialising
********************/
/obj/machinery/kitchen_machine/New()
..()
/obj/machinery/kitchen_machine/Initialize(mapload)
. = ..()
create_reagents(100)
reagents.set_reacting(FALSE)
init_lists()
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+4 -4
View File
@@ -19,8 +19,8 @@
* Initialising
********************/
/obj/machinery/kitchen_machine/microwave/New()
..()
/obj/machinery/kitchen_machine/microwave/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/microwave(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
@@ -28,8 +28,8 @@
component_parts += new /obj/item/stack/cable_coil(null, 2)
RefreshParts()
/obj/machinery/kitchen_machine/microwave/upgraded/New()
..()
/obj/machinery/kitchen_machine/microwave/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/microwave(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+2 -2
View File
@@ -18,8 +18,8 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
var/obj/item/reagent_containers/food/snacks/monkeycube/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
var/list/connected = list()
/obj/machinery/monkey_recycler/New()
..()
/obj/machinery/monkey_recycler/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/monkey_recycler(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
code/modules/food_and_drinks/kitchen_machinery/oven.dm
+3 -2
View File
@@ -11,8 +11,9 @@
idle_power_usage = 5
var/on = FALSE //Is it making food already?
var/list/food_choices = list()
/obj/machinery/cooking/New()
..()
/obj/machinery/cooking/Initialize(mapload)
. = ..()
updatefood()
/obj/machinery/cooking/attackby(obj/item/I, mob/user, params)
code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
+4 -4
View File
@@ -18,8 +18,8 @@
* Initialising
********************/
/obj/machinery/kitchen_machine/oven/New()
..()
/obj/machinery/kitchen_machine/oven/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/oven(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
@@ -28,8 +28,8 @@
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
/obj/machinery/kitchen_machine/oven/upgraded/New()
..()
/obj/machinery/kitchen_machine/oven/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/oven(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
code/modules/food_and_drinks/kitchen_machinery/processor.dm
+7 -7
View File
@@ -15,13 +15,13 @@
var/rating_speed = 1
var/rating_amount = 1
/obj/machinery/processor/New()
..()
component_parts = list()
component_parts += new /obj/item/circuitboard/processor(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
RefreshParts()
/obj/machinery/processor/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/processor(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
RefreshParts()
/obj/machinery/processor/RefreshParts()
for(var/obj/item/stock_parts/matter_bin/B in component_parts)
code/modules/hydroponics/biogenerator.dm
+2 -2
View File
@@ -18,8 +18,8 @@
var/list/show_categories = list("Food", "Botany Chemicals", "Organic Materials", "Leather and Cloth")
var/list/timesFiveCategories = list("Food", "Botany Chemicals", "Organic Materials")
/obj/machinery/biogenerator/New()
..()
/obj/machinery/biogenerator/Initialize(mapload)
. = ..()
files = new /datum/research/biogenerator(src)
create_reagents(1000)
component_parts = list()
code/modules/hydroponics/gene_modder.dm
+4 -4
View File
@@ -23,8 +23,8 @@
var/min_wchance = 67
var/min_wrate = 10
/obj/machinery/plantgenes/New()
..()
/obj/machinery/plantgenes/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/plantgenes(null)
component_parts += new /obj/item/stack/sheet/glass(null)
@@ -33,8 +33,8 @@
component_parts += new /obj/item/stock_parts/manipulator(null)
RefreshParts()
/obj/machinery/plantgenes/seedvault/New()
..()
/obj/machinery/plantgenes/seedvault/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/plantgenes/vault(null)
component_parts += new /obj/item/stack/sheet/glass(null)
code/modules/hydroponics/hydroponics.dm
+4 -4
View File
@@ -32,8 +32,8 @@
var/self_sustaining = FALSE //If the tray generates nutrients and water on its own
hud_possible = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD)
/obj/machinery/hydroponics/New()
..()
/obj/machinery/hydroponics/Initialize(mapload)
. = ..()
var/datum/atom_hud/data/hydroponic/hydro_hud = GLOB.huds[DATA_HUD_HYDROPONIC]
prepare_huds()
hydro_hud.add_to_hud(src)
@@ -50,8 +50,8 @@
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "hydrotray3"
/obj/machinery/hydroponics/constructable/New()
..()
/obj/machinery/hydroponics/constructable/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/hydroponics(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
code/modules/hydroponics/seed_extractor.dm
+2 -2
View File
@@ -48,8 +48,8 @@
var/max_seeds = 1000
var/seed_multiplier = 1
/obj/machinery/seed_extractor/New()
..()
/obj/machinery/seed_extractor/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/seed_extractor(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
code/modules/mining/equipment/survival_pod.dm
+2 -2
View File
@@ -153,8 +153,8 @@
icon_state = "sleeper-open"
density = FALSE
/obj/machinery/sleeper/survival_pod/New()
..()
/obj/machinery/sleeper/survival_pod/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/sleeper/survival(null)
var/obj/item/stock_parts/matter_bin/B = new(null)
code/modules/mining/lavaland/loot/colossus_loot.dm
+11 -10
View File
@@ -33,9 +33,10 @@
var/list/affected_targets = list()
var/activation_sound = 'sound/effects/break_stone.ogg'
/obj/machinery/anomalous_crystal/New()
/obj/machinery/anomalous_crystal/Initialize(mapload)
. = ..()
activation_method = pick("touch","laser","bullet","energy","bomb","mob_bump","weapon","speech") // "heat" removed due to lack of is_hot()
..()
/obj/machinery/anomalous_crystal/hear_talk(mob/speaker, list/message_pieces)
..()
@@ -76,11 +77,11 @@
/obj/machinery/anomalous_crystal/ex_act()
ActivationReaction(null,"bomb")
/obj/machinery/anomalous_crystal/random/New() //Just a random crysal spawner for loot
/obj/machinery/anomalous_crystal/random/Initialize() //Just a random crysal spawner for loot
. = ..()
var/random_crystal = pick(typesof(/obj/machinery/anomalous_crystal) - /obj/machinery/anomalous_crystal/random - /obj/machinery/anomalous_crystal)
new random_crystal(loc)
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/machinery/anomalous_crystal/theme_warp //Warps the area you're in to look like a new one
activation_method = "touch"
@@ -93,8 +94,8 @@
var/list/NewFlora = list()
var/florachance = 8
/obj/machinery/anomalous_crystal/theme_warp/New()
..()
/obj/machinery/anomalous_crystal/theme_warp/Initialize(mapload)
. = ..()
terrain_theme = pick("lavaland","winter","jungle","alien")
switch(terrain_theme)
if("lavaland")//Depressurizes the place... and free cult metal, I guess.
@@ -161,8 +162,8 @@
cooldown_add = 50
var/generated_projectile = /obj/item/projectile/beam/emitter
/obj/machinery/anomalous_crystal/emitter/New()
..()
/obj/machinery/anomalous_crystal/emitter/Initialize(mapload)
. = ..()
generated_projectile = pick(/obj/item/projectile/magic/fireball/infernal,
/obj/item/projectile/bullet/meteorshot, /obj/item/projectile/beam/xray, /obj/item/projectile/colossus)
@@ -299,8 +300,8 @@
var/list/banned_items_typecache = list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear,
/obj/item/projectile, /obj/item/spellbook, /obj/item/clothing/mask/facehugger, /obj/item/contractor_uplink)
/obj/machinery/anomalous_crystal/refresher/New()
..()
/obj/machinery/anomalous_crystal/refresher/Initialize(mapload)
. = ..()
banned_items_typecache = typecacheof(banned_items_typecache)
code/modules/mining/machine_redemption.dm
+11 -9
View File
@@ -55,11 +55,13 @@
/// The currently inserted design disk.
var/obj/item/disk/design_disk/inserted_disk
/obj/machinery/mineral/ore_redemption/New()
/obj/machinery/mineral/ore_redemption/ComponentInitialize()
..()
ore_buffer = list()
// Components
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, FALSE, /obj/item/stack, null, CALLBACK(src, .proc/on_material_insert))
/obj/machinery/mineral/ore_redemption/Initialize(mapload)
. = ..()
ore_buffer = list()
files = new /datum/research/smelter(src)
// Stock parts
component_parts = list()
@@ -71,8 +73,8 @@
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mineral/ore_redemption/upgraded/New()
..()
/obj/machinery/mineral/ore_redemption/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/ore_redemption(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
@@ -91,8 +93,8 @@
req_access = list(ACCESS_FREE_GOLEMS)
req_access_claim = ACCESS_FREE_GOLEMS
/obj/machinery/mineral/ore_redemption/golem/New()
..()
/obj/machinery/mineral/ore_redemption/golem/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/ore_redemption/golem(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -112,8 +114,8 @@
req_access = list()
anyone_claim = TRUE
/obj/machinery/mineral/ore_redemption/labor/New()
..()
/obj/machinery/mineral/ore_redemption/labor/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/ore_redemption/labor(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
code/modules/mining/machine_vending.dm
+6 -6
View File
@@ -17,8 +17,8 @@
var/list/prize_list // Initialized just below! (if you're wondering why - check CONTRIBUTING.md, look for: "hidden" init proc)
var/dirty_items = FALSE // Used to refresh the static/redundant data in case the machine gets VV'd
/obj/machinery/mineral/equipment_vendor/New()
..()
/obj/machinery/mineral/equipment_vendor/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/mining_equipment_vendor(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -277,8 +277,8 @@
/obj/machinery/mineral/equipment_vendor/golem
name = "golem ship equipment vendor"
/obj/machinery/mineral/equipment_vendor/golem/New()
..()
/obj/machinery/mineral/equipment_vendor/golem/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/mining_equipment_vendor/golem(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -308,8 +308,8 @@
name = "labor camp equipment vendor"
desc = "An equipment vendor for scum, points collected at an ore redemption machine can be spent here."
/obj/machinery/mineral/equipment_vendor/labor/New()
..()
/obj/machinery/mineral/equipment_vendor/labor/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/mining_equipment_vendor/labor(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
code/modules/mining/mint.dm
+1 -1
View File
@@ -14,7 +14,7 @@
speed_process = TRUE
/obj/machinery/mineral/mint/New()
/obj/machinery/mineral/mint/ComponentInitialize()
..()
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM, MAT_TRANQUILLITE), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack)
code/modules/newscaster/obj/newscaster.dm
+4 -5
View File
@@ -19,6 +19,7 @@
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!"
icon = 'icons/obj/terminals.dmi'
icon_state = "newscaster_normal"
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)
max_integrity = 200
integrity_failure = 50
light_range = 0
@@ -54,17 +55,15 @@
name = "security newscaster"
is_security = TRUE
/obj/machinery/newscaster/New()
/obj/machinery/newscaster/Initialize(mapload)
. = ..()
GLOB.allNewscasters += src
unit_number = length(GLOB.allNewscasters)
update_icon() //for any custom ones on the map...
if(!last_views)
last_views = list()
armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
..()
/obj/machinery/newscaster/Initialize(mapload)
. = ..()
if(is_security)
name = "security newscaster"
else
code/modules/power/generator.dm
+3 -6
View File
@@ -16,9 +16,10 @@
var/lastgenlev = -1
var/lastcirc = "00"
/obj/machinery/power/generator/New()
..()
/obj/machinery/power/generator/Initialize(mapload)
. = ..()
update_desc()
connect()
/obj/machinery/power/generator/proc/update_desc()
desc = initial(desc) + " Its cold circulator is located on the [dir2text(cold_dir)] side, and its heat circulator is located on the [dir2text(hot_dir)] side."
@@ -35,10 +36,6 @@
if(powernet)
disconnect_from_network()
/obj/machinery/power/generator/Initialize()
..()
connect()
/obj/machinery/power/generator/proc/connect()
connect_to_network()
code/modules/power/port_gen.dm
+8 -10
View File
@@ -114,13 +114,11 @@
var/temperature = 0 //The current temperature
var/overheating = 0 //if this gets high enough the generator explodes
/obj/machinery/power/port_gen/pacman/Initialize()
..()
/obj/machinery/power/port_gen/pacman/Initialize(mapload)
. = ..()
if(anchored)
connect_to_network()
/obj/machinery/power/port_gen/pacman/New()
..()
component_parts = list()
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
@@ -130,8 +128,8 @@
component_parts += new board_path(null)
RefreshParts()
/obj/machinery/power/port_gen/pacman/upgraded/New()
..()
/obj/machinery/power/port_gen/pacman/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
@@ -390,8 +388,8 @@
time_per_sheet = 576 //same power output, but a 50 sheet stack will last 2 hours at max safe power
board_path = /obj/item/circuitboard/pacman/super
/obj/machinery/power/port_gen/pacman/super/upgraded/New()
..()
/obj/machinery/power/port_gen/pacman/super/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
@@ -431,8 +429,8 @@
temperature_gain = 90
board_path = /obj/item/circuitboard/pacman/mrs
/obj/machinery/power/port_gen/pacman/mrs/upgraded/New()
..()
/obj/machinery/power/port_gen/pacman/mrs/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+14 -14
View File
@@ -28,8 +28,8 @@
/obj/machinery/chem_dispenser/get_cell()
return cell
/obj/machinery/chem_dispenser/New()
..()
/obj/machinery/chem_dispenser/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/chem_dispenser(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -41,8 +41,8 @@
RefreshParts()
dispensable_reagents = sortList(dispensable_reagents)
/obj/machinery/chem_dispenser/upgraded/New()
..()
/obj/machinery/chem_dispenser/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/chem_dispenser(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
@@ -73,8 +73,8 @@
"diethylamine")
upgrade_reagents = null
/obj/machinery/chem_dispenser/mutagensaltpeter/New()
..()
/obj/machinery/chem_dispenser/mutagensaltpeter/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/chem_dispenser(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
@@ -346,8 +346,8 @@
unhack_message = "You change the mode from 'Pizza King' to 'McNano'."
is_drink = TRUE
/obj/machinery/chem_dispenser/soda/New()
..()
/obj/machinery/chem_dispenser/soda/Initialize(mapload)
. = ..()
QDEL_LIST(component_parts)
component_parts += new /obj/item/circuitboard/chem_dispenser/soda(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -358,8 +358,8 @@
component_parts += new cell_type(null)
RefreshParts()
/obj/machinery/chem_dispenser/soda/upgraded/New()
..()
/obj/machinery/chem_dispenser/soda/upgraded/Initialize(mapload)
. = ..()
QDEL_LIST(component_parts)
component_parts += new /obj/item/circuitboard/chem_dispenser/soda(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
@@ -382,8 +382,8 @@
unhack_message = "You re-enable the 'nanotrasen-are-cheap-bastards' lock, disabling hidden and very expensive boozes."
is_drink = TRUE
/obj/machinery/chem_dispenser/beer/New()
..()
/obj/machinery/chem_dispenser/beer/Initialize(mapload)
. = ..()
QDEL_LIST(component_parts)
component_parts += new /obj/item/circuitboard/chem_dispenser/beer(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -394,8 +394,8 @@
component_parts += new cell_type(null)
RefreshParts()
/obj/machinery/chem_dispenser/beer/upgraded/New()
..()
/obj/machinery/chem_dispenser/beer/upgraded/Initialize(mapload)
. = ..()
QDEL_LIST(component_parts)
component_parts += new /obj/item/circuitboard/chem_dispenser/beer(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
code/modules/reagents/chemistry/machinery/chem_heater.dm
+2 -2
View File
@@ -15,8 +15,8 @@
/// The higher this number, the faster reagents will heat/cool.
var/speed_increase = 0
/obj/machinery/chem_heater/New()
..()
/obj/machinery/chem_heater/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/chem_heater(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
code/modules/reagents/chemistry/machinery/chem_master.dm
+4 -4
View File
@@ -27,8 +27,8 @@
var/static/list/pill_bottle_wrappers
var/static/list/bottle_styles
/obj/machinery/chem_master/New()
..()
/obj/machinery/chem_master/Initialize(mapload)
. = ..()
create_reagents(100)
component_parts = list()
component_parts += new /obj/item/circuitboard/chem_master(null)
@@ -547,8 +547,8 @@
name = "\improper CondiMaster 3000"
condi = TRUE
/obj/machinery/chem_master/condimaster/New()
..()
/obj/machinery/chem_master/condimaster/Initialize(mapload)
. = ..()
QDEL_LIST(component_parts)
component_parts += new /obj/item/circuitboard/chem_master/condi_master(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
code/modules/reagents/chemistry/machinery/pandemic.dm
+2 -2
View File
@@ -14,8 +14,8 @@
var/wait = null
var/obj/item/reagent_containers/beaker = null
/obj/machinery/computer/pandemic/New()
..()
/obj/machinery/computer/pandemic/Initialize(mapload)
. = ..()
update_icon()
/obj/machinery/computer/pandemic/set_broken()
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+2 -2
View File
@@ -95,8 +95,8 @@
icon_state = "juicer0"
beaker = null
/obj/machinery/reagentgrinder/New()
..()
/obj/machinery/reagentgrinder/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/reagentgrinder(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
code/modules/recycling/disposal.dm
+3 -11
View File
@@ -32,15 +32,6 @@
active_power_usage = 600
idle_power_usage = 100
// create a new disposal
// find the attached trunk (if present)
/obj/machinery/disposal/New()
..()
trunk_check()
//gas.volume = 1.05 * CELLSTANDARD
update()
/obj/machinery/disposal/proc/trunk_check()
var/obj/structure/disposalpipe/trunk/T = locate() in loc
if(!T)
@@ -82,9 +73,9 @@
if(current_size >= STAGE_FIVE)
deconstruct()
/obj/machinery/disposal/Initialize()
/obj/machinery/disposal/Initialize(mapload)
// this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
..()
. = ..()
var/atom/L = loc
var/datum/gas_mixture/env = new
env.copy_from(L.return_air())
@@ -92,6 +83,7 @@
air_contents = new
air_contents.merge(removed)
trunk_check()
update()
// attack by item places it in to disposal
/obj/machinery/disposal/attackby(obj/item/I, mob/user, params)
code/modules/recycling/sortingmachinery.dm
+6 -6
View File
@@ -274,12 +274,12 @@
deconstructs_to = PIPE_DISPOSALS_CHUTE
var/can_deconstruct = FALSE
/obj/machinery/disposal/deliveryChute/New()
..()
spawn(5)
trunk = locate() in src.loc
if(trunk)
trunk.linked = src // link the pipe trunk to self
/obj/machinery/disposal/deliveryChute/Initialize(mapload)
. = ..()
trunk = locate() in src.loc
if(trunk)
trunk.linked = src // link the pipe trunk to self
/obj/machinery/disposal/deliveryChute/interact()
return
code/modules/research/circuitprinter.dm
+4 -4
View File
@@ -23,8 +23,8 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
"Teleportation Machinery"
)
/obj/machinery/r_n_d/circuit_imprinter/New()
..()
/obj/machinery/r_n_d/circuit_imprinter/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/circuit_imprinter(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -34,8 +34,8 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
create_reagents()
RefreshParts()
/obj/machinery/r_n_d/circuit_imprinter/upgraded/New()
..()
/obj/machinery/r_n_d/circuit_imprinter/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/circuit_imprinter(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
code/modules/research/destructive_analyzer.dm
+4 -4
View File
@@ -11,8 +11,8 @@ Note: Must be placed within 3 tiles of the R&D Console
icon_state = "d_analyzer"
var/decon_mod = 0
/obj/machinery/r_n_d/destructive_analyzer/New()
..()
/obj/machinery/r_n_d/destructive_analyzer/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/destructive_analyzer(null)
component_parts += new /obj/item/stock_parts/scanning_module(null)
@@ -20,8 +20,8 @@ Note: Must be placed within 3 tiles of the R&D Console
component_parts += new /obj/item/stock_parts/micro_laser(null)
RefreshParts()
/obj/machinery/r_n_d/destructive_analyzer/upgraded/New()
..()
/obj/machinery/r_n_d/destructive_analyzer/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/destructive_analyzer(null)
component_parts += new /obj/item/stock_parts/scanning_module/phasic(null)
code/modules/research/experimentor.dm
+9 -5
View File
@@ -78,8 +78,7 @@
if(initial(tempCheck.icon_state) != null)
critical_items += I
/obj/machinery/r_n_d/experimentor/New()
/obj/machinery/r_n_d/experimentor/Initialize(mapload)
..()
component_parts = list()
component_parts += new /obj/item/circuitboard/experimentor(src)
@@ -88,11 +87,16 @@
component_parts += new /obj/item/stock_parts/manipulator(src)
component_parts += new /obj/item/stock_parts/micro_laser(src)
component_parts += new /obj/item/stock_parts/micro_laser(src)
spawn(1)
trackedIan = locate(/mob/living/simple_animal/pet/dog/corgi/Ian) in GLOB.mob_living_list
trackedRuntime = locate(/mob/living/simple_animal/pet/cat/Runtime) in GLOB.mob_living_list
SetTypeReactions()
RefreshParts()
return INITIALIZE_HINT_LATELOAD
/obj/machinery/r_n_d/experimentor/LateInitialize()
..()
// GLOB.mob_living_list gets populated in /mob/Initialize()
// so we need to delay searching for those until after the Initialize()
trackedIan = locate(/mob/living/simple_animal/pet/dog/corgi/Ian) in GLOB.mob_living_list
trackedRuntime = locate(/mob/living/simple_animal/pet/cat/Runtime) in GLOB.mob_living_list
/obj/machinery/r_n_d/experimentor/RefreshParts()
for(var/obj/item/stock_parts/manipulator/M in component_parts)
code/modules/research/protolathe.dm
+4 -4
View File
@@ -25,8 +25,8 @@ Note: Must be placed west/left of and R&D console to function.
"Weapons"
)
/obj/machinery/r_n_d/protolathe/New()
..()
/obj/machinery/r_n_d/protolathe/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/protolathe(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -38,8 +38,8 @@ Note: Must be placed west/left of and R&D console to function.
create_reagents()
RefreshParts()
/obj/machinery/r_n_d/protolathe/upgraded/New()
..()
/obj/machinery/r_n_d/protolathe/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/protolathe(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
code/modules/research/rdconsole.dm
+2 -9
View File
@@ -162,17 +162,10 @@ won't update every console in existence) but it's more of a hassle to do. Also,
KT.level=KT.max_level
files.RefreshResearch()
/obj/machinery/computer/rdconsole/New()
..()
/obj/machinery/computer/rdconsole/Initialize(mapload)
. = ..()
files = new /datum/research(src) //Setup the research data holder.
matching_designs = list()
if(!id)
for(var/obj/machinery/r_n_d/server/centcom/S in GLOB.machines)
S.initialize_serv()
break
/obj/machinery/computer/rdconsole/Initialize()
..()
SyncRDevices()
/obj/machinery/computer/rdconsole/Destroy()
code/modules/research/rdmachines.dm
+9 -4
View File
@@ -21,10 +21,10 @@
var/efficiency_coeff = 1
var/list/categories = list()
/obj/machinery/r_n_d/New()
materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), 0, TRUE, /obj/item/stack, CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
materials.precise_insertion = TRUE
..()
/obj/machinery/r_n_d/Initialize(mapload)
. = ..()
wires["Red"] = 0
wires["Blue"] = 0
wires["Green"] = 0
@@ -36,6 +36,11 @@
shock_wire = pick_n_take(w)
disable_wire = pick_n_take(w)
/obj/machinery/r_n_d/ComponentInitialize()
..()
materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), 0, TRUE, /obj/item/stack, CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
materials.precise_insertion = TRUE
/obj/machinery/r_n_d/Destroy()
if(loaded_item)
loaded_item.forceMove(get_turf(src))
code/modules/research/server.dm
+4 -4
View File
@@ -15,8 +15,8 @@
req_access = list(ACCESS_RD) //Only the R&D can change server settings.
var/plays_sound = 0
/obj/machinery/r_n_d/server/New()
..()
/obj/machinery/r_n_d/server/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/rdserver(null)
component_parts += new /obj/item/stock_parts/scanning_module(null)
@@ -25,8 +25,8 @@
RefreshParts()
initialize_serv(); //Agouri // fuck you agouri
/obj/machinery/r_n_d/server/upgraded/New()
..()
/obj/machinery/r_n_d/server/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/rdserver(null)
component_parts += new /obj/item/stock_parts/scanning_module/phasic(null)
code/modules/research/xenobiology/xenobio_camera.dm
+5 -1
View File
@@ -41,7 +41,11 @@
icon_screen = "slime_comp"
icon_keyboard = "rd_key"
/obj/machinery/computer/camera_advanced/xenobio/New()
/obj/machinery/computer/camera_advanced/xenobio/Initialize(mapload)
..()
return INITIALIZE_HINT_LATELOAD
/obj/machinery/computer/camera_advanced/xenobio/LateInitialize()
..()
for(var/obj/machinery/monkey_recycler/recycler in GLOB.monkey_recyclers)
if(get_area(recycler.loc) == get_area(loc))
code/modules/shuttle/shuttle_manipulator.dm
+1 -1
View File
@@ -21,7 +21,7 @@
var/list/templates = list()
var/list/shuttle_data = list()
/obj/machinery/shuttle_manipulator/New()
/obj/machinery/shuttle_manipulator/Initialize(mapload)
. = ..()
update_icon()
code/modules/station_goals/bluespace_tap.dm
+2 -2
View File
@@ -232,8 +232,8 @@
var/safe_levels = 10
/obj/machinery/power/bluespace_tap/New()
..()
/obj/machinery/power/bluespace_tap/Initialize(mapload)
. = ..()
//more code stolen from dna vault, inculding comment below. Taking bets on that datum being made ever.
//TODO: Replace this,bsa and gravgen with some big machinery datum
var/list/occupied = list()
code/modules/station_goals/dna_vault.dm
+2 -1
View File
@@ -167,7 +167,8 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
var/list/obj/structure/fillers = list()
/obj/machinery/dna_vault/New()
/obj/machinery/dna_vault/Initialize(mapload)
. = ..()
//TODO: Replace this,bsa and gravgen with some big machinery datum
var/list/occupied = list()
for(var/direct in list(EAST,WEST,SOUTHEAST,SOUTHWEST))
code/modules/station_goals/shield.dm
+2 -2
View File
@@ -108,8 +108,8 @@
var/static/gid = 0
var/id = 0
/obj/machinery/satellite/New()
..()
/obj/machinery/satellite/Initialize(mapload)
. = ..()
id = gid++
/obj/machinery/satellite/attack_hand(mob/user)
code/modules/telesci/telepad.dm
+4 -4
View File
@@ -10,8 +10,8 @@
active_power_usage = 5000
var/efficiency
/obj/machinery/telepad/New()
..()
/obj/machinery/telepad/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/telesci_pad(null)
component_parts += new /obj/item/stack/ore/bluespace_crystal/artificial(null, 2)
@@ -20,8 +20,8 @@
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
/obj/machinery/telepad/upgraded/New()
..()
/obj/machinery/telepad/upgraded/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/telesci_pad(null)
component_parts += new /obj/item/stack/ore/bluespace_crystal/artificial(null, 2)

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