Sorts out this PR

This commit is contained in:
Unknown
2019-03-26 21:43:56 -04:00
parent 65b73a9f4a
commit 976aec2f71
48 changed files with 71 additions and 71 deletions

View File

@@ -571,7 +571,7 @@ obj/machinery/atmospherics/mains_pipe/valve
else else
icon_state = "[hide?"h":""]mvalve[open]" icon_state = "[hide?"h":""]mvalve[open]"
initialize() Initialize()
normalize_dir() normalize_dir()
var/node1_dir var/node1_dir
var/node2_dir var/node2_dir
@@ -609,7 +609,7 @@ obj/machinery/atmospherics/mains_pipe/valve
open = 1 open = 1
update_icon() update_icon()
initialize() Initialize()
return 1 return 1
@@ -668,7 +668,7 @@ obj/machinery/atmospherics/mains_pipe/valve
var/id = null var/id = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
initialize() Initialize()
..() ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)

View File

@@ -24,6 +24,6 @@ SUBSYSTEM_DEF(creation)
var/total_atoms = atoms_needing_initialize.len var/total_atoms = atoms_needing_initialize.len
for(var/atom/movable/A in atoms_needing_initialize) for(var/atom/movable/A in atoms_needing_initialize)
if(!QDELETED(A)) if(!QDELETED(A))
A.initialize() A.Initialize()
atoms_needing_initialize -= A atoms_needing_initialize -= A
admin_notice("<span class='danger'>Initalized [total_atoms] atoms in submap.</span>", R_DEBUG) admin_notice("<span class='danger'>Initalized [total_atoms] atoms in submap.</span>", R_DEBUG)

View File

@@ -144,7 +144,7 @@
// 'Reactive' beam parts do something when touched or stood in. // 'Reactive' beam parts do something when touched or stood in.
/obj/effect/ebeam/reactive /obj/effect/ebeam/reactive
/obj/effect/ebeam/reactive/initialize() /obj/effect/ebeam/reactive/Initialize()
processing_objects += src processing_objects += src
return ..() return ..()

View File

@@ -11,7 +11,7 @@
var/id_tag = null var/id_tag = null
var/chime_sound = 'sound/machines/doorbell.ogg' var/chime_sound = 'sound/machines/doorbell.ogg'
/obj/machinery/doorbell_chime/initialize() /obj/machinery/doorbell_chime/Initialize()
. = ..() . = ..()
update_icon() update_icon()
@@ -99,7 +99,7 @@
assign_uid() assign_uid()
id = num2text(uid) id = num2text(uid)
/obj/machinery/button/doorbell/initialize() /obj/machinery/button/doorbell/Initialize()
. = ..() . = ..()
update_icon() update_icon()

View File

@@ -64,7 +64,7 @@
..() ..()
// On initialization, copy our tracks from the global list // On initialization, copy our tracks from the global list
/obj/machinery/media/jukebox/initialize() /obj/machinery/media/jukebox/Initialize()
. = ..() . = ..()
if(LAZYLEN(all_jukebox_tracks)) //Global list has tracks if(LAZYLEN(all_jukebox_tracks)) //Global list has tracks
tracks.Cut() tracks.Cut()

View File

@@ -451,7 +451,7 @@
create_reagents(max_volume) create_reagents(max_volume)
synth = new (list(src),0) synth = new (list(src),0)
/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/initialize() /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/Initialize()
. = ..() . = ..()
//Wow nice, firsties //Wow nice, firsties
if(LAZYLEN(allowed_reagents) && !istext(allowed_reagents[1])) if(LAZYLEN(allowed_reagents) && !istext(allowed_reagents[1]))

View File

@@ -262,7 +262,7 @@ steam.start() -- spawns the effect
opacity = FALSE opacity = FALSE
var/strength = 5 // How much damage to do inside each affect() var/strength = 5 // How much damage to do inside each affect()
/obj/effect/effect/smoke/elemental/initialize() /obj/effect/effect/smoke/elemental/Initialize()
processing_objects += src processing_objects += src
return ..() return ..()

View File

@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(all_beam_points)
var/beam_type = /obj/effect/ebeam // The type of beam. Default has no special properties. Some others may do things like hurt things touching it. var/beam_type = /obj/effect/ebeam // The type of beam. Default has no special properties. Some others may do things like hurt things touching it.
var/beam_sleep_time = 3 // How often the beam updates visually. Suggested to leave this alone, 3 is already fast. var/beam_sleep_time = 3 // How often the beam updates visually. Suggested to leave this alone, 3 is already fast.
/obj/effect/map_effect/beam_point/initialize() /obj/effect/map_effect/beam_point/Initialize()
GLOB.all_beam_points += src GLOB.all_beam_points += src
if(make_beams_on_init) if(make_beams_on_init)
create_beams() create_beams()

View File

@@ -7,7 +7,7 @@
var/effect_cardinals_only = FALSE // If true, effects only move in cardinal directions. var/effect_cardinals_only = FALSE // If true, effects only move in cardinal directions.
var/effect_forced_dir = null // If set, effects emitted will always move in this direction. var/effect_forced_dir = null // If set, effects emitted will always move in this direction.
/obj/effect/map_effect/interval/effect_emitter/initialize() /obj/effect/map_effect/interval/effect_emitter/Initialize()
effect_system = new effect_system_type() effect_system = new effect_system_type()
effect_system.attach(src) effect_system.attach(src)
configure_effects() configure_effects()

View File

@@ -27,7 +27,7 @@
var/interval_upper_bound = 5 SECONDS // Higher number for above. var/interval_upper_bound = 5 SECONDS // Higher number for above.
var/halt = FALSE // Set to true to stop the loop when it reaches the next iteration. var/halt = FALSE // Set to true to stop the loop when it reaches the next iteration.
/obj/effect/map_effect/interval/initialize() /obj/effect/map_effect/interval/Initialize()
handle_interval_delay() handle_interval_delay()
return ..() return ..()

View File

@@ -4,7 +4,7 @@
icon_state = "radiation_emitter" icon_state = "radiation_emitter"
var/radiation_power = 30 // Bigger numbers means more radiation. var/radiation_power = 30 // Bigger numbers means more radiation.
/obj/effect/map_effect/radiation_emitter/initialize() /obj/effect/map_effect/radiation_emitter/Initialize()
processing_objects += src processing_objects += src
return ..() return ..()

View File

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

View File

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

View File

@@ -95,7 +95,7 @@
/obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/shoes/boots/jackboots/toeless) /obj/item/clothing/shoes/boots/jackboots/toeless)
/obj/structure/closet/secure_closet/nanotrasen_security/initialize() /obj/structure/closet/secure_closet/nanotrasen_security/Initialize()
if(prob(25)) if(prob(25))
starts_with += /obj/item/weapon/storage/backpack/security starts_with += /obj/item/weapon/storage/backpack/security
else else
@@ -149,7 +149,7 @@
/obj/item/clothing/shoes/boots/jackboots/toeless, /obj/item/clothing/shoes/boots/jackboots/toeless,
/obj/item/clothing/under/nanotrasen/security/commander) /obj/item/clothing/under/nanotrasen/security/commander)
/obj/structure/closet/secure_closet/nanotrasen_commander/initialize() /obj/structure/closet/secure_closet/nanotrasen_commander/Initialize()
if(prob(25)) if(prob(25))
starts_with += /obj/item/weapon/storage/backpack/security starts_with += /obj/item/weapon/storage/backpack/security
else else
@@ -195,7 +195,7 @@
/obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/shoes/boots/jackboots/toeless) /obj/item/clothing/shoes/boots/jackboots/toeless)
/obj/structure/closet/secure_closet/nanotrasen_warden/initialize() /obj/structure/closet/secure_closet/nanotrasen_warden/Initialize()
if(prob(25)) if(prob(25))
new /obj/item/weapon/storage/backpack/security(src) new /obj/item/weapon/storage/backpack/security(src)
else else

View File

@@ -1,4 +1,4 @@
/obj/structure/closet/firecloset/initialize() /obj/structure/closet/firecloset/Initialize()
starts_with += /obj/item/weapon/storage/toolbox/emergency starts_with += /obj/item/weapon/storage/toolbox/emergency
return ..() return ..()

View File

@@ -40,7 +40,7 @@
name = "Predator carrier" name = "Predator carrier"
starts_with = list(/mob/living/simple_mob/vore/catgirl) starts_with = list(/mob/living/simple_mob/vore/catgirl)
/obj/structure/largecrate/animal/pred/initialize() //This is nessesary to get a random one each time. /obj/structure/largecrate/animal/pred/Initialize() //This is nessesary to get a random one each time.
starts_with = list(pick(/mob/living/simple_mob/vore/bee, starts_with = list(pick(/mob/living/simple_mob/vore/bee,
/mob/living/simple_mob/vore/catgirl;3, /mob/living/simple_mob/vore/catgirl;3,
/mob/living/simple_mob/vore/frog, /mob/living/simple_mob/vore/frog,
@@ -61,7 +61,7 @@
name = "Dangerous Predator carrier" name = "Dangerous Predator carrier"
starts_with = list(/mob/living/simple_mob/animal/space/alien) starts_with = list(/mob/living/simple_mob/animal/space/alien)
/obj/structure/largecrate/animal/dangerous/initialize() /obj/structure/largecrate/animal/dangerous/Initialize()
starts_with = list(pick(/mob/living/simple_mob/animal/space/carp/large, starts_with = list(pick(/mob/living/simple_mob/animal/space/carp/large,
/mob/living/simple_mob/hostile/deathclaw, /mob/living/simple_mob/hostile/deathclaw,
/mob/living/simple_mob/vore/dino, /mob/living/simple_mob/vore/dino,
@@ -101,7 +101,7 @@
desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!" desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!"
starts_with = list(/mob/living/simple_mob/otie/cotie/phoron) starts_with = list(/mob/living/simple_mob/otie/cotie/phoron)
/obj/structure/largecrate/animal/otie/phoron/initialize() /obj/structure/largecrate/animal/otie/phoron/Initialize()
starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2, starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2,
/mob/living/simple_mob/otie/red/friendly;0.5)) /mob/living/simple_mob/otie/red/friendly;0.5))
return ..() return ..()
@@ -129,7 +129,7 @@
desc = "Bounces around a lot. Looks messily packaged, were they in a hurry?" desc = "Bounces around a lot. Looks messily packaged, were they in a hurry?"
starts_with = list(/mob/living/simple_mob/fennec) starts_with = list(/mob/living/simple_mob/fennec)
/obj/structure/largecrate/animal/fennec/initialize() /obj/structure/largecrate/animal/fennec/Initialize()
starts_with = list(pick(/mob/living/simple_mob/fennec, starts_with = list(pick(/mob/living/simple_mob/fennec,
/mob/living/simple_mob/vore/fennix;0.5)) /mob/living/simple_mob/vore/fennix;0.5))
return ..() return ..()

View File

@@ -9,7 +9,7 @@
density = 1 density = 1
unacidable = 1 unacidable = 1
/obj/effect/blocker/initialize() // For non-gateway maps. /obj/effect/blocker/Initialize() // For non-gateway maps.
. = ..() . = ..()
icon = null icon = null
icon_state = null icon_state = null

View File

@@ -28,7 +28,7 @@
var/global/list/allocated_gamma = list() var/global/list/allocated_gamma = list()
/obj/structure/trash_pile/initialize() /obj/structure/trash_pile/Initialize()
. = ..() . = ..()
icon_state = pick( icon_state = pick(
"pile1", "pile1",

View File

@@ -37,7 +37,7 @@
icon = 'icons/turf/desert.dmi' icon = 'icons/turf/desert.dmi'
icon_state = "desert" icon_state = "desert"
/turf/simulated/floor/beach/sand/desert/initialize() /turf/simulated/floor/beach/sand/desert/Initialize()
. = ..() . = ..()
if(prob(5)) if(prob(5))
icon_state = "desert[rand(0,4)]" icon_state = "desert[rand(0,4)]"

View File

@@ -12,7 +12,7 @@
var/does_skyfall = TRUE var/does_skyfall = TRUE
var/list/skyfall_levels var/list/skyfall_levels
/turf/unsimulated/floor/sky/initialize() /turf/unsimulated/floor/sky/Initialize()
. = ..() . = ..()
if(does_skyfall && !LAZYLEN(skyfall_levels)) if(does_skyfall && !LAZYLEN(skyfall_levels))
error("[x],[y],[z], [get_area(src)] doesn't have skyfall_levels defined! Can't skyfall!") error("[x],[y],[z], [get_area(src)] doesn't have skyfall_levels defined! Can't skyfall!")

View File

@@ -59,7 +59,7 @@ proc/createRandomZlevel()
//VOREStation Add - This landmark type so it's not so ghetto. //VOREStation Add - This landmark type so it's not so ghetto.
/obj/effect/landmark/gateway_scatter /obj/effect/landmark/gateway_scatter
name = "uncalibrated gateway destination" name = "uncalibrated gateway destination"
/obj/effect/landmark/gateway_scatter/initialize() /obj/effect/landmark/gateway_scatter/Initialize()
. = ..() . = ..()
awaydestinations += src awaydestinations += src
//VOREStation Add End //VOREStation Add End

View File

@@ -94,7 +94,7 @@
SPECIES_ZORREN_FLAT, SPECIES_ZORREN_FLAT,
SPECIES_ZORREN_HIGH SPECIES_ZORREN_HIGH
) )
/obj/item/clothing/suit/space/void/explorer/initialize() /obj/item/clothing/suit/space/void/explorer/Initialize()
. = ..() . = ..()
sprite_sheets += sprite_sheets_refit sprite_sheets += sprite_sheets_refit
@@ -118,6 +118,6 @@
SPECIES_ZORREN_FLAT, SPECIES_ZORREN_FLAT,
SPECIES_ZORREN_HIGH SPECIES_ZORREN_HIGH
) )
/obj/item/clothing/head/helmet/space/void/explorer/initialize() /obj/item/clothing/head/helmet/space/void/explorer/Initialize()
. = ..() . = ..()
sprite_sheets += sprite_sheets_refit sprite_sheets += sprite_sheets_refit

View File

@@ -64,7 +64,7 @@
if(anchored) if(anchored)
update_music() update_music()
/obj/machinery/media/initialize() /obj/machinery/media/Initialize()
. = ..() . = ..()
update_media_source() update_media_source()

View File

@@ -61,7 +61,7 @@
mouse_opacity = 0 mouse_opacity = 0
var/resonance_damage = 20 var/resonance_damage = 20
/obj/effect/resonance/initialize(mapload, var/creator = null, var/timetoburst) /obj/effect/resonance/Initialize(mapload, var/creator = null, var/timetoburst)
. = ..() . = ..()
// Start small and grow to big size as we are about to burst // Start small and grow to big size as we are about to burst
transform = matrix()*0.75 transform = matrix()*0.75
@@ -105,7 +105,7 @@
layer = ABOVE_MOB_LAYER layer = ABOVE_MOB_LAYER
duration = 4 duration = 4
/obj/effect/temp_visual/resonance_crush/initialize() /obj/effect/temp_visual/resonance_crush/Initialize()
. = ..() . = ..()
transform = matrix()*1.5 transform = matrix()*1.5
animate(src, transform = matrix()*0.1, alpha = 50, time = 4) animate(src, transform = matrix()*0.1, alpha = 50, time = 4)

View File

@@ -219,7 +219,7 @@
pixel_y = -4 pixel_y = -4
max_n_of_items = 100 max_n_of_items = 100
/obj/machinery/smartfridge/survival_pod/initialize() /obj/machinery/smartfridge/survival_pod/Initialize()
. = ..() . = ..()
for(var/obj/item/O in loc) for(var/obj/item/O in loc)
if(accept_check(O)) if(accept_check(O))

View File

@@ -85,7 +85,7 @@
var/list/shadekin_abilities var/list/shadekin_abilities
/mob/living/simple_mob/shadekin/initialize() /mob/living/simple_mob/shadekin/Initialize()
//You spawned the prototype, and want a totally random one. //You spawned the prototype, and want a totally random one.
if(type == /mob/living/simple_mob/shadekin) if(type == /mob/living/simple_mob/shadekin)

View File

@@ -85,7 +85,7 @@
O.forceMove(C) O.forceMove(C)
..() ..()
/mob/living/simple_mob/animal/space/mimic/initialize() /mob/living/simple_mob/animal/space/mimic/Initialize()
. = ..() . = ..()
for(var/obj/item/I in loc) for(var/obj/item/I in loc)
I.forceMove(src) I.forceMove(src)
@@ -104,7 +104,7 @@
var/attempt_open = 0 var/attempt_open = 0
// Pickup loot // Pickup loot
/mob/living/simple_mob/animal/space/mimic/crate/initialize() /mob/living/simple_mob/animal/space/mimic/crate/Initialize()
. = ..() . = ..()
for(var/obj/item/I in loc) for(var/obj/item/I in loc)
I.forceMove(src) I.forceMove(src)

View File

@@ -75,7 +75,7 @@
var/list/shadekin_abilities var/list/shadekin_abilities
/mob/living/simple_mob/shadekin/initialize() /mob/living/simple_mob/shadekin/Initialize()
//You spawned the prototype, and want a totally random one. //You spawned the prototype, and want a totally random one.
if(type == /mob/living/simple_mob/shadekin) if(type == /mob/living/simple_mob/shadekin)

View File

@@ -107,21 +107,21 @@
var/obj/structure/ladder/L = new(get_turf(below)) var/obj/structure/ladder/L = new(get_turf(below))
L.allowed_directions = UP L.allowed_directions = UP
if(below.created_name) L.name = below.created_name if(below.created_name) L.name = below.created_name
L.initialize() L.Initialize()
qdel(below) qdel(below)
if(me) if(me)
var/obj/structure/ladder/L = new(get_turf(me)) var/obj/structure/ladder/L = new(get_turf(me))
L.allowed_directions = (below ? DOWN : 0) | (above ? UP : 0) L.allowed_directions = (below ? DOWN : 0) | (above ? UP : 0)
if(me.created_name) L.name = me.created_name if(me.created_name) L.name = me.created_name
L.initialize() L.Initialize()
qdel(me) qdel(me)
if(above) if(above)
var/obj/structure/ladder/L = new(get_turf(above)) var/obj/structure/ladder/L = new(get_turf(above))
L.allowed_directions = DOWN L.allowed_directions = DOWN
if(above.created_name) L.name = above.created_name if(above.created_name) L.name = above.created_name
L.initialize() L.Initialize()
qdel(above) qdel(above)
// Make them constructable in hand // Make them constructable in hand

View File

@@ -19,7 +19,7 @@
opacity = 0 opacity = 0
var/datum/entopic/entopic var/datum/entopic/entopic
/obj/machinery/vending/nifsoft_shop/initialize() /obj/machinery/vending/nifsoft_shop/Initialize()
. = ..() . = ..()
entopic = new(aholder = src, aicon = icon, aicon_state = "beacon") entopic = new(aholder = src, aicon = icon, aicon_state = "beacon")

View File

@@ -157,7 +157,7 @@
icon = 'icons/mob/species/protean/protean.dmi' icon = 'icons/mob/species/protean/protean.dmi'
icon_state = "posi" icon_state = "posi"
/obj/item/device/mmi/digital/posibrain/nano/initialize() /obj/item/device/mmi/digital/posibrain/nano/Initialize()
. = ..() . = ..()
icon_state = "posi" icon_state = "posi"

View File

@@ -58,7 +58,7 @@
var/x_offset = 26 var/x_offset = 26
var/y_offset = 26 var/y_offset = 26
/obj/structure/construction/initialize(var/mapload, var/ndir, var/building = FALSE) /obj/structure/construction/Initialize(var/mapload, var/ndir, var/building = FALSE)
. = ..() . = ..()
if(ndir) if(ndir)
set_dir(ndir) set_dir(ndir)

View File

@@ -8,7 +8,7 @@
var/list/targets var/list/targets
var/list/datum/disease2/disease/viruses var/list/datum/disease2/disease/viruses
/obj/item/weapon/reagent_containers/syringe/initialize() /obj/item/weapon/reagent_containers/syringe/Initialize()
. = ..() . = ..()
update_icon() update_icon()

View File

@@ -16,7 +16,7 @@
var/synthetic_capable = 1 var/synthetic_capable = 1
var/obj/item/weapon/disk/transcore/disk var/obj/item/weapon/disk/transcore/disk
/obj/machinery/computer/transhuman/resleeving/initialize() /obj/machinery/computer/transhuman/resleeving/Initialize()
. = ..() . = ..()
updatemodules() updatemodules()

View File

@@ -9,7 +9,7 @@
circuit = /obj/item/weapon/circuitboard/transhuman_clonepod circuit = /obj/item/weapon/circuitboard/transhuman_clonepod
//A full version of the pod //A full version of the pod
/obj/machinery/clonepod/transhuman/full/initialize() /obj/machinery/clonepod/transhuman/full/Initialize()
. = ..() . = ..()
for(var/i = 1 to container_limit) for(var/i = 1 to container_limit)
containers += new /obj/item/weapon/reagent_containers/glass/bottle/biomass(src) containers += new /obj/item/weapon/reagent_containers/glass/bottle/biomass(src)

View File

@@ -23,7 +23,7 @@
var/legacy_zone = 0 //Disable scanning and whatnot. var/legacy_zone = 0 //Disable scanning and whatnot.
var/obj/machinery/computer/shuttle_control/belter/shuttle_control var/obj/machinery/computer/shuttle_control/belter/shuttle_control
/obj/machinery/computer/roguezones/initialize() /obj/machinery/computer/roguezones/Initialize()
. = ..() . = ..()
shuttle_control = locate(/obj/machinery/computer/shuttle_control/belter) shuttle_control = locate(/obj/machinery/computer/shuttle_control/belter)

View File

@@ -20,7 +20,7 @@
var/map_pad_id = "" as text //what's my name var/map_pad_id = "" as text //what's my name
var/map_pad_link_id = "" as text //who's my friend var/map_pad_link_id = "" as text //who's my friend
/obj/machinery/power/quantumpad/initialize() /obj/machinery/power/quantumpad/Initialize()
. = ..() . = ..()
default_apply_parts() default_apply_parts()
connect_to_network() connect_to_network()

View File

@@ -40,7 +40,7 @@
..() ..()
user << "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots." user << "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots."
/obj/machinery/computer/telescience/initialize() /obj/machinery/computer/telescience/Initialize()
. = ..() . = ..()
recalibrate() recalibrate()
for(var/i = 1; i <= starting_crystals; i++) for(var/i = 1; i <= starting_crystals; i++)

View File

@@ -200,7 +200,7 @@
var/type_name = null var/type_name = null
projectile_type = /obj/item/projectile/beam projectile_type = /obj/item/projectile/beam
/obj/item/ammo_casing/nsfw_batt/initialize() /obj/item/ammo_casing/nsfw_batt/Initialize()
. = ..() . = ..()
pixel_x = rand(-10, 10) pixel_x = rand(-10, 10)
pixel_y = rand(-10, 10) pixel_y = rand(-10, 10)

View File

@@ -113,7 +113,7 @@
/obj/item/clothing/accessory/holster/machete, /obj/item/clothing/accessory/holster/machete,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2) /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2)
/obj/structure/closet/secure_closet/pathfinder/initialize() /obj/structure/closet/secure_closet/pathfinder/Initialize()
if(prob(50)) if(prob(50))
starts_with += /obj/item/weapon/storage/backpack starts_with += /obj/item/weapon/storage/backpack
else else

View File

@@ -177,7 +177,7 @@
/obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each
affect_ghosts = 1 affect_ghosts = 1
/obj/effect/step_trigger/zlevel_fall/initialize() /obj/effect/step_trigger/zlevel_fall/Initialize()
. = ..() . = ..()
if(istype(get_turf(src), /turf/simulated/floor)) if(istype(get_turf(src), /turf/simulated/floor))
@@ -240,7 +240,7 @@
var/mob/living/simple_mob/my_mob var/mob/living/simple_mob/my_mob
var/depleted = FALSE var/depleted = FALSE
/obj/tether_away_spawner/initialize() /obj/tether_away_spawner/Initialize()
. = ..() . = ..()
if(!LAZYLEN(mobs_to_pick_from)) if(!LAZYLEN(mobs_to_pick_from))

View File

@@ -48,7 +48,7 @@
shuttle_name = "Excursion Shuttle" shuttle_name = "Excursion Shuttle"
destinations = list(/datum/shuttle_destination/excursion/virgo2orbit, /datum/shuttle_destination/excursion/aerostat) destinations = list(/datum/shuttle_destination/excursion/virgo2orbit, /datum/shuttle_destination/excursion/aerostat)
/obj/away_mission_init/aerostat/initialize() /obj/away_mission_init/aerostat/Initialize()
/*seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 50, /area/tether_away/aerostat/surface/unexplored, /datum/map_template/virgo2) /*seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 50, /area/tether_away/aerostat/surface/unexplored, /datum/map_template/virgo2)
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, world.maxx, world.maxy) new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, world.maxx, world.maxy)
new /datum/random_map/noise/ore/virgo2(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, 64, 64)*/ new /datum/random_map/noise/ore/virgo2(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, 64, 64)*/
@@ -129,7 +129,7 @@
color = "#eacd7c" color = "#eacd7c"
VIRGO2_SET_ATMOS VIRGO2_SET_ATMOS
/turf/unsimulated/floor/sky/virgo2_sky/initialize() /turf/unsimulated/floor/sky/virgo2_sky/Initialize()
skyfall_levels = list(z+1) skyfall_levels = list(z+1)
. = ..() . = ..()

View File

@@ -34,7 +34,7 @@
var/door_on_mode var/door_on_mode
var/teleport_on_mode var/teleport_on_mode
/obj/away_mission_init/alienship/initialize() /obj/away_mission_init/alienship/Initialize()
. = ..() . = ..()
if(!mission_mode) //WE ARE NUMBER ONE if(!mission_mode) //WE ARE NUMBER ONE
@@ -120,7 +120,7 @@
var/area/dump_area var/area/dump_area
var/obj/shuttle_connector/shuttle_friend var/obj/shuttle_connector/shuttle_friend
/area/shuttle/excursion/away_alienship/initialize() /area/shuttle/excursion/away_alienship/Initialize()
. = ..() . = ..()
dump_area = locate(/area/tether_away/alienship/equip_dump) dump_area = locate(/area/tether_away/alienship/equip_dump)

View File

@@ -72,7 +72,7 @@
name = "away mission initializer - beachcave" name = "away mission initializer - beachcave"
//In our case, it initializes the ores and random submaps in the beach's cave, then deletes itself //In our case, it initializes the ores and random submaps in the beach's cave, then deletes itself
/obj/away_mission_init/beachcave/initialize() /obj/away_mission_init/beachcave/Initialize()
// Cave submaps are first. // Cave submaps are first.
/*seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal) /*seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal)
seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep) seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep)

View File

@@ -50,7 +50,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior
var/frequency = 0 var/frequency = 0
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/initialize() /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize()
. = ..() . = ..()
if(frequency) if(frequency)
set_frequency(frequency) set_frequency(frequency)
@@ -97,7 +97,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior
/obj/machinery/embedded_controller/radio/airlock/phoron /obj/machinery/embedded_controller/radio/airlock/phoron
var/tag_scrubber var/tag_scrubber
/obj/machinery/embedded_controller/radio/airlock/phoron/initialize() /obj/machinery/embedded_controller/radio/airlock/phoron/Initialize()
. = ..() . = ..()
program = new/datum/computer/file/embedded_program/airlock/phoron(src) program = new/datum/computer/file/embedded_program/airlock/phoron(src)

View File

@@ -119,6 +119,6 @@
name = "pre-linked multitool (tether hub)" name = "pre-linked multitool (tether hub)"
desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay." desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay."
/obj/item/device/multitool/tether_buffered/initialize() /obj/item/device/multitool/tether_buffered/Initialize()
. = ..() . = ..()
buffer = locate(/obj/machinery/telecomms/hub/preset/tether) buffer = locate(/obj/machinery/telecomms/hub/preset/tether)

View File

@@ -75,7 +75,7 @@
icon = 'icons/obj/stairs.dmi' icon = 'icons/obj/stairs.dmi'
icon_state = "stairs" icon_state = "stairs"
invisibility = 0 invisibility = 0
/obj/effect/step_trigger/teleporter/to_underdark/initialize() /obj/effect/step_trigger/teleporter/to_underdark/Initialize()
. = ..() . = ..()
teleport_x = x teleport_x = x
teleport_y = y teleport_y = y
@@ -88,7 +88,7 @@
icon = 'icons/obj/stairs.dmi' icon = 'icons/obj/stairs.dmi'
icon_state = "stairs" icon_state = "stairs"
invisibility = 0 invisibility = 0
/obj/effect/step_trigger/teleporter/from_underdark/initialize() /obj/effect/step_trigger/teleporter/from_underdark/Initialize()
. = ..() . = ..()
teleport_x = x teleport_x = x
teleport_y = y teleport_y = y
@@ -97,7 +97,7 @@
if(Z.name == "Mining Outpost") if(Z.name == "Mining Outpost")
teleport_z = Z.z teleport_z = Z.z
/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/initialize() /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/Initialize()
planet = planet_virgo3b planet = planet_virgo3b
. = ..() . = ..()
@@ -152,7 +152,7 @@
var/area/shock_area = /area/tether/surfacebase/tram var/area/shock_area = /area/tether/surfacebase/tram
/turf/simulated/floor/maglev/initialize() /turf/simulated/floor/maglev/Initialize()
. = ..() . = ..()
shock_area = locate(shock_area) shock_area = locate(shock_area)
@@ -192,7 +192,7 @@
/obj/machinery/smartfridge/chemistry/chemvator/down /obj/machinery/smartfridge/chemistry/chemvator/down
name = "\improper Smart Chemavator - Lower" name = "\improper Smart Chemavator - Lower"
/obj/machinery/smartfridge/chemistry/chemvator/down/initialize() /obj/machinery/smartfridge/chemistry/chemvator/down/Initialize()
. = ..() . = ..()
var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP)) var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP))
if(istype(above)) if(istype(above))

View File

@@ -164,7 +164,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
/turf/space/bluespace /turf/space/bluespace
name = "bluespace" name = "bluespace"
icon_state = "bluespace" icon_state = "bluespace"
/turf/space/bluespace/initialize() /turf/space/bluespace/Initialize()
..() ..()
icon_state = "bluespace" icon_state = "bluespace"
@@ -173,7 +173,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
name = "sand transit" name = "sand transit"
icon = 'icons/turf/transit_vr.dmi' icon = 'icons/turf/transit_vr.dmi'
icon_state = "desert_ns" icon_state = "desert_ns"
/turf/space/sandyscroll/initialize() /turf/space/sandyscroll/Initialize()
..() ..()
icon_state = "desert_ns" icon_state = "desert_ns"
@@ -182,7 +182,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
/turf/simulated/sky/virgo3b /turf/simulated/sky/virgo3b
color = "#FFBBBB" color = "#FFBBBB"
/turf/simulated/sky/virgo3b/initialize() /turf/simulated/sky/virgo3b/Initialize()
SSplanets.addTurf(src) SSplanets.addTurf(src)
set_light(2, 2, "#FFBBBB") set_light(2, 2, "#FFBBBB")