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

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

Browse Source
This commit is contained in:
Atermonera
2018-12-08 15:44:41 -08:00
committed by Novacat
parent 83ce6a7a35
commit 131636b1d2
213 changed files with 3206 additions and 2941 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
/obj/machinery/atmospherics/binary/dp_vent_pump/initialize()
/obj/machinery/atmospherics/binary/dp_vent_pump/Initialize()
. = ..()
if(frequency)
set_frequency(frequency)

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

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

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

@@ -149,7 +149,7 @@ Thus, the two variables affect pump operation are set in New():
ui.open() // open the new ui window
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)
set_frequency(frequency)

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

@@ -105,7 +105,7 @@
return 1
/obj/machinery/atmospherics/trinary/atmos_filter/initialize()
/obj/machinery/atmospherics/trinary/atmos_filter/Initialize()
. = ..()
if(frequency)
set_frequency(frequency)

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

@@ -302,7 +302,7 @@
/obj/machinery/atmospherics/tvalve/digital/initialize()
/obj/machinery/atmospherics/tvalve/digital/Initialize()
. = ..()
if(frequency)
set_frequency(frequency)

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

@@ -122,7 +122,7 @@
return 1
/obj/machinery/atmospherics/unary/outlet_injector/initialize()
/obj/machinery/atmospherics/unary/outlet_injector/Initialize()
. = ..()
if(frequency)
set_frequency(frequency)

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

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

2
code/__defines/misc.dm
View File

@@ -258,7 +258,7 @@
// If the GLOB system is ever ported, you can change this macro in one place and have less work to do than you otherwise would.
#define GLOBAL_LIST_BOILERPLATE(LIST_NAME, PATH)\
var/global/list/##LIST_NAME = list();\
##PATH/initialize(mapload, ...)\
##PATH/Initialize(mapload, ...)\
{\
##LIST_NAME += src;\
return ..();\

2
code/controllers/subsystems/atoms.dm
View File

@@ -77,7 +77,7 @@ SUBSYSTEM_DEF(atoms)
var/start_tick = world.time
var/result = A.initialize(arglist(arguments))
var/result = A.Initialize(arglist(arguments))
if(start_tick != world.time)
BadInitializeCalls[the_type] |= BAD_INIT_SLEPT

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

@@ -59,7 +59,7 @@
..()
/area/initialize()
/area/Initialize()
. = ..()
return INITIALIZE_HINT_LATELOAD // Areas tradiationally are initialized AFTER other atoms.

2
code/game/atoms.dm
View File

@@ -63,7 +63,7 @@
// Must not sleep!
// Other parameters are passed from New (excluding loc), this does not happen if mapload is TRUE
// Must return an Initialize hint. Defined in code/__defines/subsystems.dm
/atom/proc/initialize(mapload, ...)
/atom/proc/Initialize(mapload, ...)
if(QDELETED(src))
crash_with("GC: -- [type] had initialize() called after qdel() --")
if(initialized)

2
code/game/gamemodes/changeling/powers/fabricate_clothing.dm
View File

@@ -268,7 +268,7 @@ var/global/list/changeling_fabricated_clothing = list(
..()
registered_user = user
/obj/item/weapon/card/id/syndicate/changeling/initialize()
/obj/item/weapon/card/id/syndicate/changeling/Initialize()
. = ..()
access = null

2
code/game/gamemodes/technomancer/spells/control.dm
View File

@@ -76,7 +76,7 @@
continue
L.ai_holder.give_target(target)
/obj/item/weapon/spell/control/initialize()
/obj/item/weapon/spell/control/Initialize()
control_overlay = image('icons/obj/spells.dmi',"controlled")
return ..()

2
code/game/gamemodes/technomancer/spells/spawner/pulsar.dm
View File

@@ -30,7 +30,7 @@
var/pulses_remaining = 3
var/pulse_delay = 2 SECONDS
/obj/effect/temporary_effect/pulse/initialize()
/obj/effect/temporary_effect/pulse/Initialize()
spawn(0)
pulse_loop()
return ..()

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

@@ -181,7 +181,7 @@
RefreshParts()
/obj/machinery/sleeper/initialize()
/obj/machinery/sleeper/Initialize()
. = ..()
update_icon()

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

@@ -137,7 +137,7 @@
TLV["temperature"] = list(T0C - 26, T0C, T0C + 40, T0C + 66) // K
/obj/machinery/alarm/initialize()
/obj/machinery/alarm/Initialize()
. = ..()
set_frequency(frequency)
if(!master_is_operating())
@@ -1003,7 +1003,7 @@ FIRE ALARM
seclevel = newlevel
update_icon()
/obj/machinery/firealarm/initialize()
/obj/machinery/firealarm/Initialize()
. = ..()
if(z in using_map.contact_levels)
set_security_level(security_level? get_security_level() : "green")

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

@@ -63,7 +63,7 @@
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/air_sensor/initialize()
/obj/machinery/air_sensor/Initialize()
. = ..()
if(frequency)
set_frequency(frequency)
@@ -129,7 +129,7 @@ obj/machinery/computer/general_air_control/Destroy()
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/computer/general_air_control/initialize()
/obj/machinery/computer/general_air_control/Initialize()
. = ..()
if(frequency)
set_frequency(frequency)

34
code/game/machinery/atmoalter/area_atmos_computer.dm
View File

@@ -14,11 +14,15 @@
//Simple variable to prevent me from doing attack_hand in both this and the child computer
var/zone = "This computer is working on a wireless range, the range is currently limited to "
<<<<<<< HEAD
/obj/machinery/computer/area_atmos/New()
..()
desc += "[range] meters."
/obj/machinery/computer/area_atmos/initialize()
=======
/obj/machinery/computer/area_atmos/Initialize()
>>>>>>> 61df5b8... Merge pull request #5762 from kevinz000/initialize_caps
. = ..()
scanscrubbers()
@@ -72,7 +76,10 @@
<font color="red">[status]</font><br>
<a href="?src=\ref[src];scan=1">Scan</a>
<table border="1" width="90%">"}
<<<<<<< HEAD
=======
>>>>>>> 61df5b8... Merge pull request #5762 from kevinz000/initialize_caps
for(var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber in connectedscrubbers)
dat += {"
<tr>
@@ -102,9 +109,15 @@
usr.set_machine(src)
src.add_fingerprint(usr)
<<<<<<< HEAD
if(href_list["scan"])
scanscrubbers()
=======
if(href_list["scan"])
scanscrubbers()
>>>>>>> 61df5b8... Merge pull request #5762 from kevinz000/initialize_caps
else if(href_list["toggle"])
var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber = locate(href_list["scrub"])
@@ -118,6 +131,7 @@
scrubber.on = text2num(href_list["toggle"])
scrubber.update_icon()
<<<<<<< HEAD
/obj/machinery/computer/area_atmos/proc/scanscrubbers()
connectedscrubbers.Cut()
@@ -136,6 +150,26 @@
return 1
return 0
=======
/obj/machinery/computer/area_atmos/proc/validscrubber(obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber as obj)
if(!isobj(scrubber) || get_dist(scrubber.loc, src.loc) > src.range || scrubber.loc.z != src.loc.z)
return FALSE
return TRUE
/obj/machinery/computer/area_atmos/proc/scanscrubbers()
connectedscrubbers = new()
var/found = 0
for(var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber in range(range, src.loc))
if(istype(scrubber))
found = 1
connectedscrubbers += scrubber
if(!found)
status = "ERROR: No scrubber found!"
updateUsrDialog()
>>>>>>> 61df5b8... Merge pull request #5762 from kevinz000/initialize_caps
// The one that only works in the same map area
/obj/machinery/computer/area_atmos/area

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

@@ -12,7 +12,7 @@
use_power = 1
idle_power_usage = 15
/obj/machinery/meter/initialize()
/obj/machinery/meter/Initialize()
. = ..()
if (!target)
target = select_target()

2
code/game/machinery/atmoalter/portable_atmospherics.dm
View File

@@ -26,7 +26,7 @@
QDEL_NULL(holding)
. = ..()
/obj/machinery/portable_atmospherics/initialize()
/obj/machinery/portable_atmospherics/Initialize()
. = ..()
spawn()
var/obj/machinery/atmospherics/portables_connector/port = locate() in loc

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

@@ -225,7 +225,7 @@
circuit = /obj/item/weapon/circuitboard/security/telescreen/entertainment
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.listening = TRUE

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

@@ -16,7 +16,7 @@
var/loading = 0 // Nice loading text
/obj/machinery/computer/cloning/initialize()
/obj/machinery/computer/cloning/Initialize()
. = ..()
updatemodules()

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

@@ -21,7 +21,7 @@
overlay_layer = layer
..()
/obj/machinery/computer/initialize()
/obj/machinery/computer/Initialize()
. = ..()
power_change()
update_icon()

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

@@ -54,7 +54,7 @@
expired = 1
return ..()
/obj/item/weapon/card/id/guest/initialize()
/obj/item/weapon/card/id/guest/Initialize()
. = ..()
processing_objects.Add(src)
update_icon()

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

@@ -71,7 +71,7 @@
icon_screen = initial(icon_screen)
..()
/obj/machinery/computer/message_monitor/initialize()
/obj/machinery/computer/message_monitor/Initialize()
//Is the server isn't linked to a server, and there's a server available, default it to the first one in the list.
if(!linkedServer)
if(message_servers && message_servers.len > 0)

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

@@ -17,7 +17,7 @@
monitor_type = /datum/nano_module/alarm_monitor/all
circuit = /obj/item/weapon/circuitboard/stationalert_all
/obj/machinery/computer/station_alert/initialize()
/obj/machinery/computer/station_alert/Initialize()
alarm_monitor = new monitor_type(src)
alarm_monitor.register_alarm(src, /obj/machinery/computer/station_alert/update_icon)
. = ..()

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

@@ -30,7 +30,7 @@
icon_state = "base"
initialize_directions = dir
/obj/machinery/atmospherics/unary/cryo_cell/initialize()
/obj/machinery/atmospherics/unary/cryo_cell/Initialize()
. = ..()
var/image/tank = image(icon,"tank")
tank.alpha = 200

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

@@ -303,7 +303,7 @@
occupant.resting = 1
return ..()
/obj/machinery/cryopod/initialize()
/obj/machinery/cryopod/Initialize()
. = ..()
find_control_computer()

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

@@ -1205,7 +1205,7 @@ About the new airlock wires panel:
else
wires = new/datum/wires/airlock(src)
/obj/machinery/door/airlock/initialize()
/obj/machinery/door/airlock/Initialize()
if(src.closeOtherId != null)
for (var/obj/machinery/door/airlock/A in machines)
if(A.closeOtherId == src.closeOtherId && A != src)

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

@@ -129,7 +129,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
obj/machinery/door/airlock/initialize()
obj/machinery/door/airlock/Initialize()
. = ..()
if(frequency)
set_frequency(frequency)
@@ -203,7 +203,7 @@ obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
obj/machinery/airlock_sensor/initialize()
obj/machinery/airlock_sensor/Initialize()
. = ..()
set_frequency(frequency)
@@ -276,7 +276,7 @@ obj/machinery/access_button/proc/set_frequency(new_frequency)
radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
obj/machinery/access_button/initialize()
obj/machinery/access_button/Initialize()
. = ..()
set_frequency(frequency)

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

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

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

@@ -32,7 +32,7 @@
//turning this off prevents awkward zone geometry in places like medbay lobby, for example.
block_air_zones = 0
/obj/machinery/door/blast/initialize()
/obj/machinery/door/blast/Initialize()
. = ..()
implicit_material = get_material_by_name("plasteel")

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

@@ -31,7 +31,7 @@
maptext_height = 26
maptext_width = 32
/obj/machinery/door_timer/initialize()
/obj/machinery/door_timer/Initialize()
..()
//Doors need to go first, and can't rely on init order, so come back to me.
return INITIALIZE_HINT_LATELOAD

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

@@ -13,7 +13,7 @@
var/tag_secure = 0
var/cycle_to_external_air = 0
/obj/machinery/embedded_controller/radio/airlock/initialize()
/obj/machinery/embedded_controller/radio/airlock/Initialize()
. = ..()
program = new/datum/computer/file/embedded_program/airlock(src)

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

@@ -5,7 +5,7 @@
var/datum/computer/file/embedded_program/docking/airlock/docking_program
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)
docking_program = new/datum/computer/file/embedded_program/docking/airlock(src, airlock_program)

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

@@ -9,7 +9,7 @@
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)
program = docking_program
@@ -55,7 +55,7 @@
var/datum/computer/file/embedded_program/airlock/multi_docking/airlock_program
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)
program = airlock_program

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

@@ -57,7 +57,7 @@ obj/machinery/embedded_controller/radio/Destroy()
var/datum/radio_frequency/radio_connection
unacidable = 1
/obj/machinery/embedded_controller/radio/initialize()
/obj/machinery/embedded_controller/radio/Initialize()
. = ..()
set_frequency(frequency)

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

@@ -4,7 +4,7 @@
var/tag_door
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)
program = docking_program

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

@@ -124,7 +124,7 @@ Class Procs:
if(circuit)
circuit = new circuit(src)
/obj/machinery/initialize()
/obj/machinery/Initialize()
. = ..()
global.machines += src
START_MACHINE_PROCESSING(src)

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

@@ -22,7 +22,7 @@
idle_power_usage = 10
active_power_usage = 120 // No idea what the realistic amount would be.
/obj/machinery/oxygen_pump/initialize()
/obj/machinery/oxygen_pump/Initialize()
. = ..()
tank = new spawn_type (src)
contained = new mask_type (src)

2
code/game/machinery/pipe/construction.dm
View File

@@ -38,7 +38,7 @@ Buildable meters
* @param loc Location
* @pipe_type
*/
/obj/item/pipe/initialize(var/mapload, var/_pipe_type, var/_dir, var/obj/machinery/atmospherics/make_from)
/obj/item/pipe/Initialize(var/mapload, var/_pipe_type, var/_dir, var/obj/machinery/atmospherics/make_from)
if(make_from)
make_from_existing(make_from)
else

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

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

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

@@ -648,7 +648,7 @@
model_text = "Exploration"
departments = list("Exploration","Old Exploration")
/obj/machinery/suit_cycler/exploreration/initialize()
/obj/machinery/suit_cycler/exploreration/Initialize()
species -= SPECIES_TESHARI
return ..()

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

@@ -122,7 +122,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
var/turf/position = get_turf(src)
listening_level = position.z
/obj/machinery/telecomms/initialize()
/obj/machinery/telecomms/Initialize()
if(autolinkers.len)
// Links nearby machines
if(!long_range_link)
@@ -317,7 +317,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
netspeed = 40
var/list/telecomms_map
/obj/machinery/telecomms/hub/initialize()
/obj/machinery/telecomms/hub/Initialize()
. = ..()
LAZYINITLIST(telecomms_map)

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

@@ -17,7 +17,7 @@
underlays += image('icons/obj/stationobjs.dmi', icon_state = "telecomp-wires")
return
/obj/machinery/computer/teleporter/initialize()
/obj/machinery/computer/teleporter/Initialize()
. = ..()
var/obj/machinery/teleport/station/station
var/obj/machinery/teleport/hub/hub

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

@@ -45,7 +45,7 @@
A.turret_controls -= src
..()
/obj/machinery/turretid/initialize()
/obj/machinery/turretid/Initialize()
if(!control_area)
control_area = get_area(src)
else if(ispath(control_area))

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

@@ -1,3 +1,4 @@
<<<<<<< HEAD
/obj/machinery/vr_sleeper
name = "virtual reality sleeper"
desc = "A fancy bed with built-in sensory I/O ports and connectors to interface users' minds with their bodies in virtual reality."
@@ -225,3 +226,232 @@
else
occupant.enter_vr(avatar)
=======
/obj/machinery/vr_sleeper
name = "virtual reality sleeper"
desc = "A fancy bed with built-in sensory I/O ports and connectors to interface users' minds with their bodies in virtual reality."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "syndipod_0"
density = 1
anchored = 1
circuit = /obj/item/weapon/circuitboard/vr_sleeper
var/mob/living/carbon/human/occupant = null
var/mob/living/carbon/human/avatar = null
var/datum/mind/vr_mind = null
use_power = 1
idle_power_usage = 15
active_power_usage = 200
light_color = "#FF0000"
/obj/machinery/vr_sleeper/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
component_parts += new /obj/item/stack/material/glass/reinforced(src, 2)
RefreshParts()
/obj/machinery/vr_sleeper/Initialize()
. = ..()
update_icon()
/obj/machinery/vr_sleeper/process()
if(stat & (NOPOWER|BROKEN))
return
/obj/machinery/vr_sleeper/update_icon()
icon_state = "syndipod_[occupant ? "1" : "0"]"
/obj/machinery/vr_sleeper/Topic(href, href_list)
if(..())
return 1
if(usr == occupant)
to_chat(usr, "<span class='warning'>You can't reach the controls from the inside.</span>")
return
add_fingerprint(usr)
if(href_list["eject"])
go_out()
return 1
/obj/machinery/vr_sleeper/attackby(var/obj/item/I, var/mob/user)
add_fingerprint(user)
if(default_deconstruction_screwdriver(user, I))
return
else if(default_deconstruction_crowbar(user, I))
if(occupant && avatar)
avatar.exit_vr()
avatar = null
go_out()
return
/obj/machinery/vr_sleeper/MouseDrop_T(var/mob/target, var/mob/user)
if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user)|| !isliving(target))
return
go_in(target, user)
/obj/machinery/sleeper/relaymove(var/mob/user)
..()
if(usr.incapacitated())
return
go_out()
/obj/machinery/vr_sleeper/emp_act(var/severity)
if(stat & (BROKEN|NOPOWER))
..(severity)
return
if(occupant)
// This will eject the user from VR
// ### Fry the brain?
go_out()
..(severity)
/obj/machinery/vr_sleeper/verb/eject()
set src in oview(1)
set category = "Object"
set name = "Eject VR Capsule"
if(usr.incapacitated())
return
if(usr != occupant && avatar && alert(avatar, "Someone wants to remove you from virtual reality. Do you want to leave?", "Leave VR?", "Yes", "No") == "No")
return
// The player in VR is fine with leaving, kick them out and reset avatar
avatar.exit_vr()
avatar = null
go_out()
add_fingerprint(usr)
/obj/machinery/vr_sleeper/verb/climb_in()
set src in oview(1)
set category = "Object"
set name = "Enter VR Capsule"
if(usr.incapacitated())
return
go_in(usr, usr)
add_fingerprint(usr)
/obj/machinery/vr_sleeper/relaymove(mob/user as mob)
if(user.incapacitated())
return 0 //maybe they should be able to get out with cuffs, but whatever
go_out()
/obj/machinery/vr_sleeper/proc/go_in(var/mob/M, var/mob/user)
if(!M)
return
if(stat & (BROKEN|NOPOWER))
return
if(!ishuman(M))
user << "<span class='warning'>\The [src] rejects [M] with a sharp beep.</span>"
if(occupant)
user << "<span class='warning'>\The [src] is already occupied.</span>"
return
if(M == user)
visible_message("\The [user] starts climbing into \the [src].")
else
visible_message("\The [user] starts putting [M] into \the [src].")
if(do_after(user, 20))
if(occupant)
to_chat(user, "<span class='warning'>\The [src] is already occupied.</span>")
return
M.stop_pulling()
if(M.client)
M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src
M.loc = src
update_use_power(2)
occupant = M
update_icon()
enter_vr()
return
/obj/machinery/vr_sleeper/proc/go_out()
if(!occupant)
return
if(occupant.client)
occupant.client.eye = occupant.client.mob
occupant.client.perspective = MOB_PERSPECTIVE
occupant.loc = src.loc
occupant = null
for(var/atom/movable/A in src) // In case an object was dropped inside or something
if(A == circuit)
continue
if(A in component_parts)
continue
A.loc = src.loc
update_use_power(1)
update_icon()
/obj/machinery/vr_sleeper/proc/enter_vr()
// No mob to transfer a mind from
if(!occupant)
return
// No mind to transfer
if(!occupant.mind)
return
// Mob doesn't have an active consciousness to send/receive from
if(occupant.stat != CONSCIOUS)
return
avatar = occupant.vr_link
// If they've already enterred VR, and are reconnecting, prompt if they want a new body
if(avatar && alert(occupant, "You already have a Virtual Reality avatar. Would you like to use it?", "New avatar", "Yes", "No") == "No")
// Delink the mob
occupant.vr_link = null
avatar = null
if(!avatar)
// Get the desired spawn location to put the body
var/S = null
var/list/vr_landmarks = list()
for(var/obj/effect/landmark/virtual_reality/sloc in landmarks_list)
vr_landmarks += sloc.name
S = input(occupant, "Please select a location to spawn your avatar at:", "Spawn location") as null|anything in vr_landmarks
if(!S)
return 0
for(var/obj/effect/landmark/virtual_reality/i in landmarks_list)
if(i.name == S)
S = i
break
avatar = new(S, "Virtual Reality Avatar")
// If the user has a non-default (Human) bodyshape, make it match theirs.
if(occupant.species.name != "Promethean" && occupant.species.name != "Human")
avatar.shapeshifter_change_shape(occupant.species.name)
avatar.forceMove(get_turf(S)) // Put the mob on the landmark, instead of inside it
avatar.Sleeping(1)
occupant.enter_vr(avatar)
// Prompt for username after they've enterred the body.
var/newname = sanitize(input(avatar, "You are entering virtual reality. Your username is currently [src.name]. Would you like to change it to something else?", "Name change") as null|text, MAX_NAME_LEN)
if (newname)
avatar.real_name = newname
else
occupant.enter_vr(avatar)
>>>>>>> 61df5b8... Merge pull request #5762 from kevinz000/initialize_caps

2
code/game/mecha/equipment/tools/tools.dm
View File

@@ -247,7 +247,7 @@
equip_type = EQUIP_SPECIAL
var/obj/item/weapon/rcd/electric/mounted/mecha/my_rcd = null
/obj/item/mecha_parts/mecha_equipment/tool/rcd/initialize()
/obj/item/mecha_parts/mecha_equipment/tool/rcd/Initialize()
my_rcd = new(src)
return ..()

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

@@ -38,7 +38,7 @@
files = new /datum/research(src) //Setup the research data holder.
return
/obj/machinery/mecha_part_fabricator/initialize()
/obj/machinery/mecha_part_fabricator/Initialize()
update_categories()
. = ..()

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

@@ -39,7 +39,7 @@
files = new /datum/research(src) //Setup the research data holder.
return
/obj/machinery/pros_fabricator/initialize()
/obj/machinery/pros_fabricator/Initialize()
. = ..()
manufacturer = basic_robolimb.company
update_categories()

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

@@ -69,7 +69,7 @@
else
icon_state = "airlock_sensor_off"
/obj/machinery/mech_sensor/initialize()
/obj/machinery/mech_sensor/Initialize()
. = ..()
set_frequency(frequency)

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

@@ -7,7 +7,7 @@
cargo_capacity = 1
/obj/mecha/medical/initialize()
/obj/mecha/medical/Initialize()
. = ..()
var/turf/T = get_turf(src)
if(isPlayerLevel(T.z))

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

@@ -6,7 +6,7 @@
max_universal_equip = 1
max_special_equip = 1
/obj/mecha/working/initialize()
/obj/mecha/working/Initialize()
. = ..()
var/turf/T = get_turf(src)
if(isPlayerLevel(T.z))

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

@@ -109,7 +109,7 @@
pixel_x = -32
pixel_y = 0
/obj/structure/sign/poster/initialize()
/obj/structure/sign/poster/Initialize()
. = ..()
if (poster_type)
var/path = text2path(poster_type)

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

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

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

@@ -83,7 +83,7 @@
/obj/effect/landmark/proc/delete()
delete_me = 1
/obj/effect/landmark/initialize()
/obj/effect/landmark/Initialize()
. = ..()
if(delete_me)
return INITIALIZE_HINT_QDEL

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

@@ -34,7 +34,7 @@
pixel_x = -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)
@@ -44,7 +44,7 @@
icon_state = "shuttle_warning_still"
time_to_die = 4.9 SECONDS
/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.
. = ..()
@@ -60,7 +60,7 @@
time_to_die = 1 SECOND
pixel_x = -32
/obj/effect/temporary_effect/lightning_strike/initialize()
/obj/effect/temporary_effect/lightning_strike/Initialize()
icon_state += "[rand(1,2)]" // To have two variants of lightning sprites.
animate(src, alpha = 0, time = time_to_die - 1)
. = ..()

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

@@ -57,7 +57,7 @@
/obj/effect/spider/stickyweb
icon_state = "stickyweb1"
/obj/effect/spider/stickyweb/initialize()
/obj/effect/spider/stickyweb/Initialize()
if(prob(50))
icon_state = "stickyweb2"
return ..()
@@ -83,7 +83,7 @@
var/spiders_max = 24
var/spider_type = /obj/effect/spider/spiderling
/obj/effect/spider/eggcluster/initialize()
/obj/effect/spider/eggcluster/Initialize()
pixel_x = rand(3,-3)
pixel_y = rand(3,-3)
processing_objects |= src

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

@@ -128,7 +128,7 @@
var/obj/effect/landmark/the_landmark = 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)
if(mark.landmark_id == landmark_id)

4
code/game/objects/effects/temporary_visuals/miscellaneous.dm
View File

@@ -2,7 +2,7 @@
desc = "It's a decoy!"
duration = 15
/obj/effect/temp_visual/decoy/initialize(mapload, atom/mimiced_atom, var/customappearance)
/obj/effect/temp_visual/decoy/Initialize(mapload, atom/mimiced_atom, var/customappearance)
. = ..()
alpha = initial(alpha)
if(mimiced_atom)
@@ -13,7 +13,7 @@
if(customappearance)
appearance = customappearance
/obj/effect/temp_visual/decoy/fading/initialize(mapload, atom/mimiced_atom)
/obj/effect/temp_visual/decoy/fading/Initialize(mapload, atom/mimiced_atom)
. = ..()
animate(src, alpha = 0, time = duration)

2
code/game/objects/effects/temporary_visuals/temproary_visual.dm
View File

@@ -8,7 +8,7 @@
var/duration = 10 //in deciseconds
var/randomdir = TRUE
/obj/effect/temp_visual/initialize()
/obj/effect/temp_visual/Initialize()
. = ..()
if(randomdir)
set_dir(pick(cardinal))

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

@@ -108,7 +108,7 @@ var/list/civilian_cartridges = list(
icon_state = "cart-s"
access_security = 1
/obj/item/weapon/cartridge/security/initialize()
/obj/item/weapon/cartridge/security/Initialize()
radio = new /obj/item/radio/integrated/beepsky(src)
. = ..()
@@ -164,7 +164,7 @@ var/list/civilian_cartridges = list(
access_reagent_scanner = 1
access_atmos = 1
/obj/item/weapon/cartridge/signal/initialize()
/obj/item/weapon/cartridge/signal/Initialize()
radio = new /obj/item/radio/integrated/signal(src)
. = ..()
@@ -198,7 +198,7 @@ var/list/civilian_cartridges = list(
access_status_display = 1
access_security = 1
/obj/item/weapon/cartridge/hos/initialize()
/obj/item/weapon/cartridge/hos/Initialize()
radio = new /obj/item/radio/integrated/beepsky(src)
. = ..()
@@ -223,7 +223,7 @@ var/list/civilian_cartridges = list(
access_reagent_scanner = 1
access_atmos = 1
/obj/item/weapon/cartridge/rd/initialize()
/obj/item/weapon/cartridge/rd/Initialize()
radio = new /obj/item/radio/integrated/signal(src)
. = ..()

60
code/game/objects/items/devices/PDA/radio.dm
View File

@@ -116,39 +116,37 @@
var/last_transmission
var/datum/radio_frequency/radio_connection
initialize()
if(!radio_controller)
return
if (src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ)
src.frequency = sanitize_frequency(src.frequency)
set_frequency(frequency)
proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency)
proc/send_signal(message="ACTIVATE")
if(last_transmission && world.time < (last_transmission + 5))
return
last_transmission = world.time
var/time = time2text(world.realtime,"hh:mm:ss")
var/turf/T = get_turf(src)
lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) <B>:</B> [format_frequency(frequency)]/[code]")
var/datum/signal/signal = new
signal.source = src
signal.encryption = code
signal.data["message"] = message
radio_connection.post_signal(src, signal)
/obj/item/radio/integrated/signal/Initialize()
if(!radio_controller)
return
if (src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ)
src.frequency = sanitize_frequency(src.frequency)
set_frequency(frequency)
/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency)
/obj/item/radio/integrated/signal/proc/send_signal(message="ACTIVATE")
if(last_transmission && world.time < (last_transmission + 5))
return
last_transmission = world.time
var/time = time2text(world.realtime,"hh:mm:ss")
var/turf/T = get_turf(src)
lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) <B>:</B> [format_frequency(frequency)]/[code]")
var/datum/signal/signal = new
signal.source = src
signal.encryption = code
signal.data["message"] = message
radio_connection.post_signal(src, signal)
/obj/item/radio/integrated/signal/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)

8
code/game/objects/items/devices/communicator/cartridge.dm
View File

@@ -379,7 +379,7 @@
..()
internal_devices |= new /obj/item/device/halogen_counter(src)
/obj/item/weapon/commcard/engineering/initialize()
/obj/item/weapon/commcard/engineering/Initialize()
internal_data["grid_sensors"] = find_powernet_sensors()
internal_data["powernet_target"] = ""
@@ -616,7 +616,7 @@
internal_data["stat_display_active2"] = null
internal_data["stat_display_special"] = null
/obj/item/weapon/commcard/head/initialize()
/obj/item/weapon/commcard/head/Initialize()
// Have to register the commcard with the Radio controller to receive updates to the status displays
radio_controller.add_object(src, 1435)
..()
@@ -793,7 +793,7 @@
internal_devices |= new /obj.item/device/analyzer(src)
internal_devices |= new /obj/item/device/halogen_counter(src)
/obj/item/weapon/commcard/head/ce/initialize()
/obj/item/weapon/commcard/head/ce/Initialize()
internal_data["grid_sensors"] = find_powernet_sensors()
internal_data["powernet_target"] = ""
@@ -904,7 +904,7 @@
list("name" = "Shuttle Blast Door Control", "template" = "merc_blast_door_control.tmpl")
)
/obj/item/weapon/commcard/mercenary/initialize()
/obj/item/weapon/commcard/mercenary/Initialize()
internal_data["shuttle_door_code"] = "smindicate" // Copied from PDA code
internal_data["shuttle_doors"] = find_blast_doors()

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

@@ -19,7 +19,7 @@
var/power_usage
var/power_use = 1
/obj/item/device/flashlight/initialize()
/obj/item/device/flashlight/Initialize()
. = ..()
update_icon()

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

@@ -17,7 +17,7 @@ var/list/GPS_list = list()
var/hide_signal = FALSE // If true, signal is not visible to other GPS devices.
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
name = "global positioning system ([gps_tag])"

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

@@ -92,7 +92,7 @@
syndie = 1
ks1type = /obj/item/device/encryptionkey/raider
/obj/item/device/radio/headset/raider/initialize()
/obj/item/device/radio/headset/raider/Initialize()
. = ..()
set_frequency(RAID_FREQ)

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

@@ -54,7 +54,7 @@
/obj/item/device/radio/intercom/omni
name = "global announcer"
/obj/item/device/radio/intercom/omni/initialize()
/obj/item/device/radio/intercom/omni/Initialize()
channels = radiochannels.Copy()
return ..()

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

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

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

@@ -26,7 +26,7 @@
to_chat(usr, "Video feed is [camera.status ? "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.c_tag = channel

2
code/game/objects/items/stacks/marker_beacons.dm
View File

@@ -37,7 +37,7 @@ var/list/marker_beacon_colors = list(
/obj/item/stack/marker_beacon/hundred
amount = 100
/obj/item/stack/marker_beacon/initialize()
/obj/item/stack/marker_beacon/Initialize()
. = ..()
update_icon()

10
code/game/objects/items/weapons/RCD.dm
View File

@@ -28,7 +28,7 @@
var/material_to_use = DEFAULT_WALL_MATERIAL // So badmins can make RCDs that print diamond walls.
var/make_rwalls = FALSE // If true, when building walls, they will be reinforced.
/obj/item/weapon/rcd/initialize()
/obj/item/weapon/rcd/Initialize()
src.spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -137,7 +137,7 @@
// RCD variants.
// This one starts full.
/obj/item/weapon/rcd/loaded/initialize()
/obj/item/weapon/rcd/loaded/Initialize()
stored_matter = max_stored_matter
return ..()
@@ -148,7 +148,7 @@
used in the construction of hulls for starships. Reload with compressed matter cartridges."
material_to_use = MAT_STEELHULL
/obj/item/weapon/rcd/shipwright/loaded/initialize()
/obj/item/weapon/rcd/shipwright/loaded/Initialize()
stored_matter = max_stored_matter
return ..()
@@ -162,7 +162,7 @@
toolspeed = 0.5 // Twice as fast.
max_stored_matter = RCD_MAX_CAPACITY * 3 // Three times capacity.
/obj/item/weapon/rcd/advanced/loaded/initialize()
/obj/item/weapon/rcd/advanced/loaded/Initialize()
stored_matter = max_stored_matter
return ..()
@@ -179,7 +179,7 @@
var/make_cell = TRUE // If false, initialize() won't spawn a cell for this.
var/electric_cost_coefficent = 83.33 // Higher numbers make it less efficent. 86.3... means it should matche the standard RCD capacity on a 10k cell.
/obj/item/weapon/rcd/electric/initialize()
/obj/item/weapon/rcd/electric/Initialize()
if(make_cell)
cell = new /obj/item/weapon/cell/high(src)
return ..()

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

@@ -85,13 +85,13 @@
/obj/item/weapon/flame/candle/everburn
wax = 99999
/obj/item/weapon/flame/candle/everburn/initialize()
/obj/item/weapon/flame/candle/everburn/Initialize()
. = ..()
light("<span class='notice'>\The [src] mysteriously lights itself!.</span>")
/obj/item/weapon/flame/candle/candelabra/everburn
wax = 99999
/obj/item/weapon/flame/candle/candelabra/everburn/initialize()
/obj/item/weapon/flame/candle/candelabra/everburn/Initialize()
. = ..()
light("<span class='notice'>\The [src] mysteriously lights itself!.</span>")

10
code/game/objects/items/weapons/id cards/station_ids.dm
View File

@@ -121,7 +121,7 @@
return ..()
/obj/item/weapon/card/id/initialize()
/obj/item/weapon/card/id/Initialize()
. = ..()
var/datum/job/J = job_master.GetJob(rank)
if(J)
@@ -168,7 +168,7 @@
item_state = "tdgreen"
assignment = "Synthetic"
/obj/item/weapon/card/id/synthetic/initialize()
/obj/item/weapon/card/id/synthetic/Initialize()
. = ..()
access = get_all_station_access() + access_synth
@@ -179,11 +179,11 @@
registered_name = "Central Command"
assignment = "General"
/obj/item/weapon/card/id/centcom/initialize()
/obj/item/weapon/card/id/centcom/Initialize()
. = ..()
access = get_all_centcom_access()
/obj/item/weapon/card/id/centcom/station/initialize()
/obj/item/weapon/card/id/centcom/station/Initialize()
. = ..()
access |= get_all_station_access()
@@ -192,7 +192,7 @@
assignment = "Emergency Response Team"
icon_state = "centcom"
/obj/item/weapon/card/id/centcom/ERT/initialize()
/obj/item/weapon/card/id/centcom/ERT/Initialize()
. = ..()
access |= get_all_station_access()

4
code/game/objects/items/weapons/id cards/syndicate_ids.dm
View File

@@ -6,11 +6,11 @@
var/electronic_warfare = 1
var/mob/registered_user = null
/obj/item/weapon/card/id/syndicate/initialize()
/obj/item/weapon/card/id/syndicate/Initialize()
. = ..()
access = syndicate_access.Copy()
/obj/item/weapon/card/id/syndicate/station_access/initialize()
/obj/item/weapon/card/id/syndicate/station_access/Initialize()
. = ..() // Same as the normal Syndicate id, only already has all station access
access |= get_all_station_access()

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

@@ -14,7 +14,7 @@
var/apply_tape = FALSE
/obj/item/taperoll/initialize()
/obj/item/taperoll/Initialize()
. = ..()
if(apply_tape)
var/turf/T = get_turf(src)

12
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -92,7 +92,7 @@
/obj/item/weapon/pen/crayon/purple
)
/obj/item/weapon/storage/fancy/crayons/initialize()
/obj/item/weapon/storage/fancy/crayons/Initialize()
. = ..()
update_icon()
@@ -134,7 +134,7 @@
/obj/item/weapon/pen/crayon/marker/purple
)
/obj/item/weapon/storage/fancy/markers/initialize()
/obj/item/weapon/storage/fancy/markers/Initialize()
. = ..()
update_icon()
@@ -174,7 +174,7 @@
starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 6)
var/brand = "\improper Trans-Stellar Duty-free"
/obj/item/weapon/storage/fancy/cigarettes/initialize()
/obj/item/weapon/storage/fancy/cigarettes/Initialize()
. = ..()
flags |= NOREACT
create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
@@ -280,7 +280,7 @@
icon_type = "cigar"
starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar = 7)
/obj/item/weapon/storage/fancy/cigar/initialize()
/obj/item/weapon/storage/fancy/cigar/Initialize()
. = ..()
flags |= NOREACT
create_reagents(15 * storage_slots)
@@ -332,7 +332,7 @@
storage_slots = 6
req_access = list(access_virology)
/obj/item/weapon/storage/lockbox/vials/initialize()
/obj/item/weapon/storage/lockbox/vials/Initialize()
. = ..()
update_icon()
@@ -377,7 +377,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/truffle
)
/obj/item/weapon/storage/fancy/heartbox/initialize()
/obj/item/weapon/storage/fancy/heartbox/Initialize()
. = ..()
update_icon()

2
code/game/objects/items/weapons/storage/firstaid.dm
View File

@@ -17,7 +17,7 @@
max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14
// var/list/icon_variety // VOREStation edit
/obj/item/weapon/storage/firstaid/initialize()
/obj/item/weapon/storage/firstaid/Initialize()
. = ..()
// if(icon_variety) // VOREStation edit
// icon_state = pick(icon_variety)

2
code/game/objects/items/weapons/storage/misc.dm
View File

@@ -11,7 +11,7 @@
foldable = /obj/item/stack/material/cardboard
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6)
/obj/item/weapon/storage/box/donut/initialize()
/obj/item/weapon/storage/box/donut/Initialize()
. = ..()
update_icon()

2
code/game/objects/items/weapons/storage/storage.dm
View File

@@ -527,7 +527,7 @@
for(var/obj/item/I in contents)
remove_from_storage(I, T)
/obj/item/weapon/storage/initialize()
/obj/item/weapon/storage/Initialize()
. = ..()
if(allow_quick_empty)

6
code/game/objects/items/weapons/storage/toolbox.dm
View File

@@ -24,7 +24,7 @@
/obj/item/weapon/extinguisher/mini,
/obj/item/device/radio
)
/obj/item/weapon/storage/toolbox/emergency/initialize()
/obj/item/weapon/storage/toolbox/emergency/Initialize()
if(prob(50))
new /obj/item/device/flashlight(src)
else
@@ -56,7 +56,7 @@
/obj/item/stack/cable_coil/random_belt,
/obj/item/stack/cable_coil/random_belt
)
/obj/item/weapon/storage/toolbox/electrical/initialize()
/obj/item/weapon/storage/toolbox/electrical/Initialize()
. = ..()
if(prob(5))
new /obj/item/clothing/gloves/yellow(src)
@@ -102,7 +102,7 @@
var/filled = FALSE
attack_verb = list("lunched")
/obj/item/weapon/storage/toolbox/lunchbox/initialize()
/obj/item/weapon/storage/toolbox/lunchbox/Initialize()
if(filled)
var/list/lunches = lunchables_lunches()
var/lunch = lunches[pick(lunches)]

8
code/game/objects/items/weapons/storage/uplink_kits.dm
View File

@@ -1,4 +1,4 @@
/obj/item/weapon/storage/box/syndicate/initialize()
/obj/item/weapon/storage/box/syndicate/Initialize()
switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1, "smoothoperator" = 1)))
if("bloodyspai")
new /obj/item/clothing/under/chameleon(src)
@@ -70,7 +70,7 @@
/obj/item/weapon/storage/box/syndie_kit/imp_freedom
name = "boxed freedom implant (with injector)"
/obj/item/weapon/storage/box/syndie_kit/imp_freedom/initialize()
/obj/item/weapon/storage/box/syndie_kit/imp_freedom/Initialize()
var/obj/item/weapon/implanter/O = new(src)
O.imp = new /obj/item/weapon/implant/freedom(O)
O.update()
@@ -87,7 +87,7 @@
/obj/item/weapon/storage/box/syndie_kit/imp_uplink
name = "boxed uplink implant (with injector)"
/obj/item/weapon/storage/box/syndie_kit/imp_uplink/initialize()
/obj/item/weapon/storage/box/syndie_kit/imp_uplink/Initialize()
var/obj/item/weapon/implanter/O = new(src)
O.imp = new /obj/item/weapon/implant/uplink(O)
O.update()
@@ -157,7 +157,7 @@
name = "\improper Tricky smokes"
desc = "Comes with the following brands of cigarettes, in this order: 2xFlash, 2xSmoke, 1xMindBreaker, 1xTricordrazine. Avoid mixing them up."
/obj/item/weapon/storage/box/syndie_kit/cigarette/initialize()
/obj/item/weapon/storage/box/syndie_kit/cigarette/Initialize()
. = ..()
var/obj/item/weapon/storage/fancy/cigarettes/pack

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

@@ -100,7 +100,7 @@ var/list/multi_point_spawns
var/id // Group id
var/weight // Probability weight for this spawn point
/obj/random_multi/initialize()
/obj/random_multi/Initialize()
. = ..()
weight = max(1, round(weight))

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

@@ -11,7 +11,7 @@
var/maxhealth = 100
anchored = 1.0
/obj/structure/catwalk/initialize()
/obj/structure/catwalk/Initialize()
. = ..()
for(var/obj/structure/catwalk/O in range(1))
O.update_icon()

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

@@ -32,7 +32,7 @@
var/list/starts_with
/obj/structure/closet/initialize()
/obj/structure/closet/Initialize()
. = ..()
if(starts_with)
create_objects_in_loc(src, starts_with)

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

@@ -16,7 +16,7 @@
starts_with = list(/obj/item/weapon/material/twohanded/fireaxe)
/obj/structure/closet/fireaxecabinet/initialize()
/obj/structure/closet/fireaxecabinet/Initialize()
..()
fireaxe = locate() in contents

6
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View File

@@ -22,7 +22,7 @@
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/head/soft)
/obj/structure/closet/secure_closet/cargotech/initialize()
/obj/structure/closet/secure_closet/cargotech/Initialize()
if(prob(75))
starts_with += /obj/item/weapon/storage/backpack
else
@@ -59,7 +59,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
/obj/item/clothing/shoes/boots/winter/supply)
/obj/structure/closet/secure_closet/quartermaster/initialize()
/obj/structure/closet/secure_closet/quartermaster/Initialize()
if(prob(75))
starts_with += /obj/item/weapon/storage/backpack
else
@@ -93,7 +93,7 @@
/obj/item/clothing/shoes/boots/winter/mining,
/obj/item/stack/marker_beacon/thirty)
/obj/structure/closet/secure_closet/miner/initialize()
/obj/structure/closet/secure_closet/miner/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else

6
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View File

@@ -33,7 +33,7 @@
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add
/obj/structure/closet/secure_closet/engineering_chief/initialize()
/obj/structure/closet/secure_closet/engineering_chief/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
@@ -100,7 +100,7 @@
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add
/obj/structure/closet/secure_closet/engineering_personal/initialize()
/obj/structure/closet/secure_closet/engineering_personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
@@ -135,7 +135,7 @@
/obj/item/clothing/shoes/boots/winter/atmos,
/obj/item/weapon/tank/emergency/oxygen/engi)
/obj/structure/closet/secure_closet/atmos_personal/initialize()
/obj/structure/closet/secure_closet/atmos_personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else

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

@@ -9,7 +9,7 @@
icon_opened = "base"
req_one_access = list(access_armory)
/obj/structure/closet/secure_closet/guncabinet/initialize()
/obj/structure/closet/secure_closet/guncabinet/Initialize()
. = ..()
update_icon()

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

@@ -21,7 +21,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,
/obj/item/clothing/shoes/boots/winter/hydro)
/obj/structure/closet/secure_closet/hydroponics/initialize()
/obj/structure/closet/secure_closet/hydroponics/Initialize()
if(prob(50))
starts_with += /obj/item/clothing/suit/storage/apron
else

4
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -60,7 +60,7 @@
/obj/item/clothing/head/nursehat,
/obj/item/weapon/storage/box/freezer = 3)
/obj/structure/closet/secure_closet/medical3/initialize()
/obj/structure/closet/secure_closet/medical3/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/medic
else
@@ -170,7 +170,7 @@
/obj/item/clothing/shoes/white,
/obj/item/weapon/reagent_containers/glass/beaker/vial) //VOREStation Add
/obj/structure/closet/secure_closet/CMO/initialize()
/obj/structure/closet/secure_closet/CMO/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/medic
else

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

@@ -7,7 +7,7 @@
starts_with = list(
/obj/item/device/radio/headset)
/obj/structure/closet/secure_closet/personal/initialize()
/obj/structure/closet/secure_closet/personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack
else

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

@@ -18,7 +18,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/shoes/boots/winter/science)
/obj/structure/closet/secure_closet/scientist/initialize()
/obj/structure/closet/secure_closet/scientist/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else

14
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -121,7 +121,7 @@
/obj/item/device/flashlight/maglight,
/obj/item/clothing/mask/gas/half)
/obj/structure/closet/secure_closet/hos/initialize()
/obj/structure/closet/secure_closet/hos/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
@@ -170,7 +170,7 @@
/obj/item/device/megaphone,
/obj/item/clothing/mask/gas/half)
/obj/structure/closet/secure_closet/warden/initialize()
/obj/structure/closet/secure_closet/warden/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
@@ -214,7 +214,7 @@
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight)
/obj/structure/closet/secure_closet/security/initialize()
/obj/structure/closet/secure_closet/security/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
@@ -223,22 +223,22 @@
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
return ..()
/obj/structure/closet/secure_closet/security/cargo/initialize()
/obj/structure/closet/secure_closet/security/cargo/Initialize()
starts_with += /obj/item/clothing/accessory/armband/cargo
starts_with += /obj/item/device/encryptionkey/headset_cargo
return ..()
/obj/structure/closet/secure_closet/security/engine/initialize()
/obj/structure/closet/secure_closet/security/engine/Initialize()
starts_with += /obj/item/clothing/accessory/armband/engine
starts_with += /obj/item/device/encryptionkey/headset_eng
return ..()
/obj/structure/closet/secure_closet/security/science/initialize()
/obj/structure/closet/secure_closet/security/science/Initialize()
starts_with += /obj/item/clothing/accessory/armband/science
starts_with += /obj/item/device/encryptionkey/headset_sci
return ..()
/obj/structure/closet/secure_closet/security/med/initialize()
/obj/structure/closet/secure_closet/security/med/Initialize()
starts_with += /obj/item/clothing/accessory/armband/medblue
starts_with += /obj/item/device/encryptionkey/headset_med
return ..()

4
code/game/objects/structures/crates_lockers/closets/syndicate.dm
View File

@@ -48,7 +48,7 @@
/obj/structure/closet/syndicate/resources
desc = "An old, dusty locker."
/obj/structure/closet/syndicate/resources/initialize()
/obj/structure/closet/syndicate/resources/Initialize()
. = ..()
if(!contents.len)
var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
@@ -103,7 +103,7 @@
/obj/structure/closet/syndicate/resources/everything
desc = "It's an emergency storage closet for repairs."
/obj/structure/closet/syndicate/resources/everything/initialize()
/obj/structure/closet/syndicate/resources/everything/Initialize()
var/list/resources = list(
/obj/item/stack/material/steel,
/obj/item/stack/material/glass,

4
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
View File

@@ -19,7 +19,7 @@
icon_closed = "emergency"
icon_opened = "emergencyopen"
/obj/structure/closet/emcloset/initialize()
/obj/structure/closet/emcloset/Initialize()
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
if ("small")
starts_with = list(
@@ -106,7 +106,7 @@
icon_closed = "toolcloset"
icon_opened = "toolclosetopen"
/obj/structure/closet/toolcloset/initialize()
/obj/structure/closet/toolcloset/Initialize()
starts_with = list()
if(prob(40))
starts_with += /obj/item/clothing/suit/storage/hazardvest

8
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -22,7 +22,7 @@
/obj/item/clothing/accessory/armband = 3,
/obj/item/clothing/accessory/holster/waist = 3)
/obj/structure/closet/wardrobe/red/initialize()
/obj/structure/closet/wardrobe/red/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
@@ -223,7 +223,7 @@
/obj/item/weapon/storage/backpack/toxins,
/obj/item/weapon/storage/backpack/satchel/tox)
/obj/structure/closet/wardrobe/science_white/initialize()
/obj/structure/closet/wardrobe/science_white/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
@@ -249,7 +249,7 @@
/obj/item/weapon/storage/backpack/toxins,
/obj/item/weapon/storage/backpack/satchel/tox)
/obj/structure/closet/wardrobe/robotics_black/initialize()
/obj/structure/closet/wardrobe/robotics_black/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
@@ -401,7 +401,7 @@
/obj/item/clothing/gloves/black,
/obj/item/clothing/under/pants/camo)
/obj/structure/closet/wardrobe/tactical/initialize()
/obj/structure/closet/wardrobe/tactical/Initialize()
if(prob(25))
starts_with += /obj/item/weapon/storage/belt/security/tactical/bandolier
else

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

@@ -6,7 +6,7 @@
density = 1
var/list/starts_with
/obj/structure/largecrate/initialize()
/obj/structure/largecrate/Initialize()
. = ..()
if(starts_with)
create_objects_in_loc(src, starts_with)
@@ -63,7 +63,7 @@
desc = "It comes in a box for the consumer's sake. ..How is this lighter?"
icon_state = "vehiclecrate"
/obj/structure/largecrate/vehicle/initialize()
/obj/structure/largecrate/vehicle/Initialize()
..()
spawn(1)
for(var/obj/O in contents)

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

@@ -13,7 +13,7 @@
if(my_vehicle)
to_chat(user, "<span class='notice'>It seems to contain \the [my_vehicle].</span>")
/obj/structure/vehiclecage/initialize()
/obj/structure/vehiclecage/Initialize()
. = ..()
if(my_vehicle_type)
my_vehicle = new my_vehicle_type(src)

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

@@ -304,7 +304,7 @@
light_power = 0.6
light_color = "#FF6633"
/obj/structure/flora/sif/subterranean/initialize()
/obj/structure/flora/sif/subterranean/Initialize()
icon_state = "[initial(icon_state)][rand(1,2)]"
. = ..()
@@ -313,6 +313,6 @@
desc = "This is a mysterious looking plant. They kind of look like eyeballs. Creepy."
icon_state = "eyeplant"
/obj/structure/flora/sif/eyes/initialize()
/obj/structure/flora/sif/eyes/Initialize()
icon_state = "[initial(icon_state)][rand(1,3)]"
. = ..()

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