[MIRROR] bunch of inits without return and a few easy new to init (#9773)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-03 11:06:49 -07:00
committed by GitHub
parent 052034eb7b
commit a3ac1d26d7
71 changed files with 330 additions and 312 deletions

View File

@@ -18,8 +18,8 @@
var/datum/pipe_network/network1 var/datum/pipe_network/network1
var/datum/pipe_network/network2 var/datum/pipe_network/network2
/obj/machinery/atmospherics/pipeturbine/New() /obj/machinery/atmospherics/pipeturbine/Initialize(mapload, newdir)
..() . = ..()
air_in.volume = 200 air_in.volume = 200
air_out.volume = 800 air_out.volume = 800
volume_ratio = air_in.volume / (air_in.volume + air_out.volume) volume_ratio = air_in.volume / (air_in.volume + air_out.volume)

View File

@@ -1278,8 +1278,8 @@ var/mob/dview/dview_mob = new
color = origin.color color = origin.color
set_light(origin.light_range, origin.light_power, origin.light_color) set_light(origin.light_range, origin.light_power, origin.light_color)
/mob/dview/New() /mob/dview/Initialize()
..() . = ..()
// We don't want to be in any mob lists; we're a dummy not a mob. // We don't want to be in any mob lists; we're a dummy not a mob.
mob_list -= src mob_list -= src
if(stat == DEAD) if(stat == DEAD)

View File

@@ -66,6 +66,6 @@
close_button_y_start = 86 close_button_y_start = 86
close_button_y_end = 94 close_button_y_end = 94
/obj/screen/popup/default/New() /obj/screen/popup/default/Initialize(mapload)
..() icon_state = "popup[rand(1,10)]"
icon_state = "popup[rand(1,10)]" . = ..()

View File

@@ -251,8 +251,8 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle = new
layer = TURF_LAYER layer = TURF_LAYER
plane = TURF_PLANE plane = TURF_PLANE
/obj/effect/bgstar/New() /obj/effect/bgstar/Initialize()
..() . = ..()
pixel_x += rand(-2,30) pixel_x += rand(-2,30)
pixel_y += rand(-2,30) pixel_y += rand(-2,30)
var/starnum = pick("1", "1", "1", "2", "3", "4") var/starnum = pick("1", "1", "1", "2", "3", "4")

View File

@@ -45,6 +45,7 @@
/obj/item/soap/Initialize() /obj/item/soap/Initialize()
if(randomize && prob(square_chance)) if(randomize && prob(square_chance))
icon_state = "[icon_state]-alt" icon_state = "[icon_state]-alt"
. = ..()
/obj/item/soap/nanotrasen /obj/item/soap/nanotrasen
desc = "A NanoTrasen-brand bar of soap. Smells of phoron, a years-old marketing gimmick." desc = "A NanoTrasen-brand bar of soap. Smells of phoron, a years-old marketing gimmick."

View File

@@ -154,6 +154,7 @@
return return
/obj/effect/gateway/active/Initialize() /obj/effect/gateway/active/Initialize()
. = ..()
addtimer(CALLBACK(src, PROC_REF(spawn_and_qdel)), rand(30, 60) SECONDS) addtimer(CALLBACK(src, PROC_REF(spawn_and_qdel)), rand(30, 60) SECONDS)
/obj/effect/gateway/active/proc/spawn_and_qdel() /obj/effect/gateway/active/proc/spawn_and_qdel()

View File

@@ -8,55 +8,70 @@
density = FALSE density = FALSE
anchored = TRUE anchored = TRUE
/obj/effect/bhole/New() /obj/effect/bhole/Initialize()
spawn(4) . = ..()
controller() addtimer(CALLBACK(src, PROC_REF(controller)), 0.4 SECONDS, TIMER_DELETE_ME)
/obj/effect/bhole/proc/controller() /obj/effect/bhole/proc/controller()
while(src) if(!isturf(loc))
qdel(src)
return
if(!isturf(loc)) //DESTROYING STUFF AT THE EPICENTER
qdel(src) for(var/mob/living/M in orange(1,src))
return qdel(M)
for(var/obj/O in orange(1,src))
qdel(O)
var/base_turf = get_base_turf_by_area(src)
for(var/turf/simulated/ST in orange(1,src))
if(ST.type == base_turf)
continue
ST.ChangeTurf(base_turf)
addtimer(CALLBACK(src, PROC_REF(pull_1)), 0.6 SECONDS, TIMER_DELETE_ME)
//DESTROYING STUFF AT THE EPICENTER /obj/effect/bhole/proc/pull_1()
for(var/mob/living/M in orange(1,src)) grav(10, 4, 10, 0)
qdel(M) addtimer(CALLBACK(src, PROC_REF(pull_2)), 0.6 SECONDS, TIMER_DELETE_ME)
for(var/obj/O in orange(1,src))
qdel(O)
var/base_turf = get_base_turf_by_area(src)
for(var/turf/simulated/ST in orange(1,src))
if(ST.type == base_turf)
continue
ST.ChangeTurf(base_turf)
sleep(6) /obj/effect/bhole/proc/pull_2()
grav(10, 4, 10, 0 ) grav(8, 4, 10, 0)
sleep(6) addtimer(CALLBACK(src, PROC_REF(pull_3)), 0.6 SECONDS, TIMER_DELETE_ME)
grav( 8, 4, 10, 0 )
sleep(6)
grav( 9, 4, 10, 0 )
sleep(6)
grav( 7, 3, 40, 1 )
sleep(6)
grav( 5, 3, 40, 1 )
sleep(6)
grav( 6, 3, 40, 1 )
sleep(6)
grav( 4, 2, 50, 6 )
sleep(6)
grav( 3, 2, 50, 6 )
sleep(6)
grav( 2, 2, 75,25 )
sleep(6)
/obj/effect/bhole/proc/pull_3()
grav(9, 4, 10, 0)
addtimer(CALLBACK(src, PROC_REF(pull_4)), 0.6 SECONDS, TIMER_DELETE_ME)
/obj/effect/bhole/proc/pull_4()
grav(7, 3, 40, 1)
addtimer(CALLBACK(src, PROC_REF(pull_5)), 0.6 SECONDS, TIMER_DELETE_ME)
//MOVEMENT /obj/effect/bhole/proc/pull_5()
if( prob(50) ) grav(5, 3, 40, 1)
src.anchored = FALSE addtimer(CALLBACK(src, PROC_REF(pull_6)), 0.6 SECONDS, TIMER_DELETE_ME)
step(src,pick(alldirs))
src.anchored = TRUE /obj/effect/bhole/proc/pull_6()
grav(6, 3, 40, 1)
addtimer(CALLBACK(src, PROC_REF(pull_7)), 0.6 SECONDS, TIMER_DELETE_ME)
/obj/effect/bhole/proc/pull_7()
grav(4, 2, 50, 6)
addtimer(CALLBACK(src, PROC_REF(pull_8)), 0.6 SECONDS, TIMER_DELETE_ME)
/obj/effect/bhole/proc/pull_8()
grav(3, 2, 50, 6)
addtimer(CALLBACK(src, PROC_REF(pull_9)), 0.6 SECONDS, TIMER_DELETE_ME)
/obj/effect/bhole/proc/pull_9()
grav(2, 2, 75,25)
addtimer(CALLBACK(src, PROC_REF(move)), 0.6 SECONDS, TIMER_DELETE_ME)
/obj/effect/bhole/proc/move()
//MOVEMENT
if(prob(50))
anchored = FALSE
step(src, pick(alldirs))
anchored = TRUE
controller()
/obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance) /obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
if(!isturf(loc)) //blackhole cannot be contained inside anything. Weird stuff might happen if(!isturf(loc)) //blackhole cannot be contained inside anything. Weird stuff might happen

View File

@@ -11,8 +11,8 @@
var/obj/item/inserted_spell/inserting = null var/obj/item/inserted_spell/inserting = null
var/allow_stacking = 0 var/allow_stacking = 0
/obj/item/spell/insert/New() /obj/item/spell/insert/Initialize()
..() . = ..()
set_light(spell_light_range, spell_light_intensity, l_color = light_color) set_light(spell_light_range, spell_light_intensity, l_color = light_color)
/obj/item/inserted_spell /obj/item/inserted_spell

View File

@@ -9,8 +9,8 @@
var/spell_light_intensity = 2 var/spell_light_intensity = 2
var/spell_light_range = 3 var/spell_light_range = 3
/obj/item/spell/modifier/New() /obj/item/spell/modifier/Initialize()
..() . = ..()
set_light(spell_light_range, spell_light_intensity, l_color = light_color) set_light(spell_light_range, spell_light_intensity, l_color = light_color)
/obj/item/spell/modifier/on_melee_cast(atom/hit_atom, mob/user) /obj/item/spell/modifier/on_melee_cast(atom/hit_atom, mob/user)
@@ -38,4 +38,4 @@
// Technomancer specific subtype which keeps track of spell power and gets targeted specificially by Dispel. // Technomancer specific subtype which keeps track of spell power and gets targeted specificially by Dispel.
/datum/modifier/technomancer /datum/modifier/technomancer
var/spell_power = null // Set by on_add_modifier. var/spell_power = null // Set by on_add_modifier.

View File

@@ -15,8 +15,8 @@
cast_methods = CAST_USE cast_methods = CAST_USE
aspect = ASPECT_TELE aspect = ASPECT_TELE
/obj/item/spell/phase_shift/New() /obj/item/spell/phase_shift/Initialize()
..() . = ..()
set_light(3, 2, l_color = "#FA58F4") set_light(3, 2, l_color = "#FA58F4")
/obj/effect/phase_shift /obj/effect/phase_shift
@@ -28,8 +28,8 @@
/obj/effect/phase_shift/ex_act() /obj/effect/phase_shift/ex_act()
return return
/obj/effect/phase_shift/New() /obj/effect/phase_shift/Initialize()
..() . = ..()
set_light(3, 5, l_color = "#FA58F4") set_light(3, 5, l_color = "#FA58F4")
START_PROCESSING(SSobj, src) START_PROCESSING(SSobj, src)

View File

@@ -18,8 +18,8 @@
adjust_instability(4) adjust_instability(4)
..() ..()
/obj/item/spell/spawner/darkness/New() /obj/item/spell/spawner/darkness/Initialize()
..() . = ..()
set_light(6, -20, l_color = "#FFFFFF") set_light(6, -20, l_color = "#FFFFFF")
/obj/effect/temporary_effect/darkness /obj/effect/temporary_effect/darkness
@@ -28,4 +28,4 @@
invisibility = 101 invisibility = 101
light_range = 6 light_range = 6
light_power = -20 light_power = -20
light_on = TRUE light_on = TRUE

View File

@@ -14,8 +14,8 @@
aspect = ASPECT_UNSTABLE aspect = ASPECT_UNSTABLE
spawner_type = /obj/effect/temporary_effect/destablize spawner_type = /obj/effect/temporary_effect/destablize
/obj/item/spell/spawner/destablize/New() /obj/item/spell/spawner/destablize/Initialize()
..() . = ..()
set_light(3, 2, l_color = "#C26DDE") set_light(3, 2, l_color = "#C26DDE")
/obj/item/spell/spawner/destablize/on_ranged_cast(atom/hit_atom, mob/user) /obj/item/spell/spawner/destablize/on_ranged_cast(atom/hit_atom, mob/user)
@@ -51,4 +51,4 @@
var/outgoing_instability = instability_power * ( 1 / (radius**2) ) var/outgoing_instability = instability_power * ( 1 / (radius**2) )
L.receive_radiated_instability(outgoing_instability) L.receive_radiated_instability(outgoing_instability)
pulses_remaining-- pulses_remaining--
qdel(src) qdel(src)

View File

@@ -13,8 +13,8 @@
aspect = ASPECT_EMP aspect = ASPECT_EMP
spawner_type = /obj/effect/temporary_effect/pulse/pulsar spawner_type = /obj/effect/temporary_effect/pulse/pulsar
/obj/item/spell/spawner/pulsar/New() /obj/item/spell/spawner/pulsar/Initialize()
..() . = ..()
set_light(3, 2, l_color = "#2ECCFA") set_light(3, 2, l_color = "#2ECCFA")
/obj/item/spell/spawner/pulsar/on_ranged_cast(atom/hit_atom, mob/user) /obj/item/spell/spawner/pulsar/on_ranged_cast(atom/hit_atom, mob/user)
@@ -44,7 +44,6 @@
. = ..() . = ..()
/obj/effect/temporary_effect/pulse/proc/pulse_loop() /obj/effect/temporary_effect/pulse/proc/pulse_loop()
set waitfor = FALSE
if(pulses_remaining > 0) if(pulses_remaining > 0)
pulsetimer = addtimer(CALLBACK(src, PROC_REF(pulse_loop)), pulse_delay, TIMER_STOPPABLE) pulsetimer = addtimer(CALLBACK(src, PROC_REF(pulse_loop)), pulse_delay, TIMER_STOPPABLE)

View File

@@ -10,8 +10,8 @@
idle_power_usage = 0 idle_power_usage = 0
var/obj/item/radio/beacon/Beacon var/obj/item/radio/beacon/Beacon
/obj/machinery/bluespace_beacon/New() /obj/machinery/bluespace_beacon/Initialize(mapload)
..() . = ..()
var/turf/T = src.loc var/turf/T = src.loc
Beacon = new /obj/item/radio/beacon Beacon = new /obj/item/radio/beacon
Beacon.invisibility = INVISIBILITY_MAXIMUM Beacon.invisibility = INVISIBILITY_MAXIMUM
@@ -48,4 +48,4 @@
if(Beacon.loc != src.loc) if(Beacon.loc != src.loc)
Beacon.loc = src.loc Beacon.loc = src.loc
update_icon() update_icon()

View File

@@ -8,9 +8,9 @@
var/max_cable = 100 var/max_cable = 100
var/on = 0 var/on = 0
/obj/machinery/cablelayer/New() /obj/machinery/cablelayer/Initialize()
cable = new(src, 100) cable = new(src, max_cable)
..() . = ..()
/obj/machinery/cablelayer/Moved(atom/old_loc, direction, forced = FALSE) /obj/machinery/cablelayer/Moved(atom/old_loc, direction, forced = FALSE)
. = ..() . = ..()

View File

@@ -565,8 +565,8 @@
circuit = /obj/item/circuitboard/scanner_console circuit = /obj/item/circuitboard/scanner_console
var/printing = null var/printing = null
/obj/machinery/body_scanconsole/New() /obj/machinery/body_scanconsole/Initialize(mapload)
..() . = ..()
findscanner() findscanner()
/obj/machinery/body_scanconsole/Destroy() /obj/machinery/body_scanconsole/Destroy()

View File

@@ -14,8 +14,8 @@
var/cooldown_on = 0 var/cooldown_on = 0
req_access = list(access_ai_upload) req_access = list(access_ai_upload)
/obj/machinery/ai_slipper/New() /obj/machinery/ai_slipper/Initialize(mapload)
..() . = ..()
update_icon() update_icon()
/obj/machinery/ai_slipper/power_change() /obj/machinery/ai_slipper/power_change()

View File

@@ -20,8 +20,8 @@
var/target_temp = T20C var/target_temp = T20C
var/mode = MODE_IDLE var/mode = MODE_IDLE
/obj/machinery/power/thermoregulator/New() /obj/machinery/power/thermoregulator/Initialize(mapload)
..() . = ..()
default_apply_parts() default_apply_parts()
/obj/machinery/power/thermoregulator/examine(mob/user) /obj/machinery/power/thermoregulator/examine(mob/user)

View File

@@ -339,7 +339,7 @@
var/matter_amount_per_sheet = 10 var/matter_amount_per_sheet = 10
var/matter_type = MAT_STEEL var/matter_type = MAT_STEEL
/obj/machinery/organ_printer/robot/full/New() /obj/machinery/organ_printer/robot/full/Initialize()
. = ..() . = ..()
stored_matter = max_stored_matter stored_matter = max_stored_matter

View File

@@ -32,8 +32,8 @@
var/datum/gas_mixture/faketank var/datum/gas_mixture/faketank
var/faketank_integrity var/faketank_integrity
/obj/machinery/bomb_tester/New() /obj/machinery/bomb_tester/Initialize(mapload)
..() . = ..()
default_apply_parts() default_apply_parts()
RefreshParts() RefreshParts()
faketank = new faketank = new

View File

@@ -185,7 +185,7 @@
else else
assembly.state = 1 assembly.state = 1
to_chat(user, span_notice("You cut \the [src] free from the wall.")) to_chat(user, span_notice("You cut \the [src] free from the wall."))
new /obj/item/stack/cable_coil(src.loc, length=2) new /obj/item/stack/cable_coil(src.loc, 2)
assembly = null //so qdel doesn't eat it. assembly = null //so qdel doesn't eat it.
qdel(src) qdel(src)

View File

@@ -456,8 +456,8 @@
icon_state = "pod_g" icon_state = "pod_g"
/obj/machinery/clonepod/full/New() /obj/machinery/clonepod/full/Initialize()
..() . = ..()
for(var/i = 1 to container_limit) for(var/i = 1 to container_limit)
containers += new /obj/item/reagent_containers/glass/bottle/biomass(src) containers += new /obj/item/reagent_containers/glass/bottle/biomass(src)

View File

@@ -30,9 +30,9 @@
location.hotspot_expose(1000,500,1) location.hotspot_expose(1000,500,1)
return 1 return 1
/obj/machinery/igniter/New() /obj/machinery/igniter/Initialize(mapload)
..()
icon_state = "igniter[on]" icon_state = "igniter[on]"
. = ..()
/obj/machinery/igniter/power_change() /obj/machinery/igniter/power_change()
..() ..()
@@ -58,9 +58,6 @@
idle_power_usage = 2 idle_power_usage = 2
active_power_usage = 4 active_power_usage = 4
/obj/machinery/sparker/New()
..()
/obj/machinery/sparker/power_change() /obj/machinery/sparker/power_change()
..() ..()
if(!(stat & NOPOWER) && disable == 0) if(!(stat & NOPOWER) && disable == 0)

View File

@@ -16,7 +16,7 @@
var/id = 1.0 var/id = 1.0
var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess.
/obj/machinery/mass_driver/New() /obj/machinery/mass_driver/Initialize(mapload)
. = ..() . = ..()
default_apply_parts() default_apply_parts()

View File

@@ -18,8 +18,8 @@ var/global/list/navbeacons = list() // no I don't like putting this in, but it w
var/list/codes = list() // assoc. list of transponder codes var/list/codes = list() // assoc. list of transponder codes
req_access = list(access_engine) req_access = list(access_engine)
/obj/machinery/navbeacon/New() /obj/machinery/navbeacon/Initialize(mapload)
..() . = ..()
set_codes_from_txt(codes_txt) set_codes_from_txt(codes_txt)
if(freq) if(freq)
warning("[src] at [x],[y],[z] has deprecated var freq=[freq]. Replace it with proper type.") warning("[src] at [x],[y],[z] has deprecated var freq=[freq]. Replace it with proper type.")
@@ -237,6 +237,6 @@ Transponder Codes:<UL>"}
/obj/machinery/navbeacon/patrol /obj/machinery/navbeacon/patrol
var/next_patrol var/next_patrol
/obj/machinery/navbeacon/patrol/New() /obj/machinery/navbeacon/patrol/Initialize(mapload)
codes = list("patrol" = 1, "next_patrol" = next_patrol) codes = list("patrol" = 1, "next_patrol" = next_patrol)
..() . = ..()

View File

@@ -111,4 +111,5 @@
/obj/effect/temp_visual/heal/Initialize(mapload) /obj/effect/temp_visual/heal/Initialize(mapload)
pixel_x = rand(-12, 12) pixel_x = rand(-12, 12)
pixel_y = rand(-9, 0) pixel_y = rand(-9, 0)
. = ..()
// VOREStation Add End // VOREStation Add End

View File

@@ -63,7 +63,7 @@
return ..() return ..()
/obj/item/reagent_containers/powder/Initialize() /obj/item/reagent_containers/powder/Initialize()
..() . = ..()
get_appearance() get_appearance()
/obj/item/reagent_containers/powder/proc/get_appearance() /obj/item/reagent_containers/powder/proc/get_appearance()

View File

@@ -197,6 +197,7 @@
/obj/item/kit/suit/rig/debug/Initialize() /obj/item/kit/suit/rig/debug/Initialize()
set_info("debug suit", "This is a test", "debug", CUSTOM_ITEM_OBJ, CUSTOM_ITEM_MOB) set_info("debug suit", "This is a test", "debug", CUSTOM_ITEM_OBJ, CUSTOM_ITEM_MOB)
. = ..()
/obj/item/kit/paint /obj/item/kit/paint
name = "mecha customisation kit" name = "mecha customisation kit"

View File

@@ -7,7 +7,7 @@
title = "Standard Operating Procedure" title = "Standard Operating Procedure"
/obj/item/book/manual/standard_operating_procedure/Initialize() /obj/item/book/manual/standard_operating_procedure/Initialize()
..() . = ..()
dat = {" dat = {"
<html><head> <html><head>
@@ -30,7 +30,7 @@
title = "Corporate Regulations" title = "Corporate Regulations"
/obj/item/book/manual/command_guide/Initialize() /obj/item/book/manual/command_guide/Initialize()
..() . = ..()
dat = {" dat = {"
<html><head> <html><head>
@@ -53,8 +53,8 @@
author = "Ali Big" author = "Ali Big"
title = "Food for Dummies 2" title = "Food for Dummies 2"
/obj/item/book/manual/cook_guide/New() /obj/item/book/manual/cook_guide/Initialize()
..() . = ..()
dat = {" dat = {"
<html> <html>
<html> <html>
@@ -76,7 +76,7 @@
<h5>Penned by Ali Big</h5> <h5>Penned by Ali Big</h5>
<p><b>Hello Newbie</b>, congratz on deciding to make food! This guide assumes you know absolutely nothing, so fret not, the information here will help you prepare food for your hungry crewmates!</p> <p><b>Hello Newbie</b>, congratz on deciding to make food! This guide assumes you know absolutely nothing, so fret not, the information here will help you prepare food for your hungry crewmates!</p>
<h3>Workspace prep:</h3> <h3>Workspace prep:</h3>
This step is simple: merely go to the Grill, Oven, and Fryer and turn everything on so you do not need to wait for them to warm up later; they wont start a fire unless food is left in them unchecked. It is also highly suggested to lay out at least a few Measuring Cups on the counters for ease of use. This step is simple: merely go to the Grill, Oven, and Fryer and turn everything on so you do not need to wait for them to warm up later; they won't start a fire unless food is left in them unchecked. It is also highly suggested to lay out at least a few Measuring Cups on the counters for ease of use.
<h3>Basic ingredient prep:</h3> <h3>Basic ingredient prep:</h3>
In the lockers and fridges, you have all your needed supplies for this guide, so look through them and familiarize yourself! This guide will only use ingredients you already have access to, so don't worry about missing items! In the lockers and fridges, you have all your needed supplies for this guide, so look through them and familiarize yourself! This guide will only use ingredients you already have access to, so don't worry about missing items!
<h2>Part 1: How to Create Various Essential Ingredients with What You Have</h2> <h2>Part 1: How to Create Various Essential Ingredients with What You Have</h2>
@@ -109,7 +109,7 @@
<h2>Cheesy Nachos:</h2> <h2>Cheesy Nachos:</h2>
Tortilla, Cheese and 1 unit of Salt in the microwave, the perfect Finger Food! Tortilla, Cheese and 1 unit of Salt in the microwave, the perfect Finger Food!
<h2>Spaghetti:</h2> <h2>Spaghetti:</h2>
Without Tomatos from Botany it's not going to be the flashiest, but one can make Boiled Spaghetti with Spaghetti and Water in the Microwave. Kitsune Udon can be made with Spaghetti, Egg Yolk (crack egg in beaker then add to microwave), and Tofu. Spaghetti and Meatballs can be made by doing the Boiled Spaghetti Recipe and adding 2 Meatballs; adding 4 Meatballs into the initial mix makes Spesslaw. Lastly, Spaghetti, Milk, and Cheese in the Oven makes Macaroni and Cheese. Without Tomato's from Botany it's not going to be the flashiest, but one can make Boiled Spaghetti with Spaghetti and Water in the Microwave. Kitsune Udon can be made with Spaghetti, Egg Yolk (crack egg in beaker then add to microwave), and Tofu. Spaghetti and Meatballs can be made by doing the Boiled Spaghetti Recipe and adding 2 Meatballs; adding 4 Meatballs into the initial mix makes Spesslaw. Lastly, Spaghetti, Milk, and Cheese in the Oven makes Macaroni and Cheese.
<h2>Steak:</h2> <h2>Steak:</h2>
For the pure meat eaters, just add Meat, 1 Salt, and 1 Pepper into the grill for them, and try not to cry as they use up all your Meat quickly. (There's a second Meat Locker in the freezer room if you do run out!) For the pure meat eaters, just add Meat, 1 Salt, and 1 Pepper into the grill for them, and try not to cry as they use up all your Meat quickly. (There's a second Meat Locker in the freezer room if you do run out!)
<h2>Donk Pockets:</h2> <h2>Donk Pockets:</h2>
@@ -137,8 +137,8 @@
author = "Ali Big" author = "Ali Big"
title = "How to Alcohol (And other Drinks)" title = "How to Alcohol (And other Drinks)"
/obj/item/book/manual/bar_guide/New() /obj/item/book/manual/bar_guide/Initialize()
..() . = ..()
dat = {" dat = {"
<html> <html>
<head> <head>
@@ -350,8 +350,8 @@
author = "Engineering Encyclopedia" author = "Engineering Encyclopedia"
title = "Rotary Electric Generator Manual" title = "Rotary Electric Generator Manual"
/obj/item/book/manual/rotary_electric_generator/New() /obj/item/book/manual/rotary_electric_generator/Initialize()
..() . = ..()
dat = {"<html> dat = {"<html>
<head> <head>
<style> <style>
@@ -447,8 +447,8 @@
author = "Pontifex Publishing" author = "Pontifex Publishing"
title = "Synthetics" title = "Synthetics"
/obj/item/book/manual/synthetic_life/New() // CHOMPedit: Removed references to upstream factions which don't exist here. /obj/item/book/manual/synthetic_life/Initialize()
..() . = ..()
dat = {" dat = {"
<html lang="en"> <html lang="en">
<head> <head>
@@ -597,7 +597,7 @@
artificial, non-organic origin. In fact, most qualify in some form as "cyborg", especially artificial, non-organic origin. In fact, most qualify in some form as "cyborg", especially
under the cultures that use and facilitate NIFs. However, when sapients talk about cyborgs, they talk under the cultures that use and facilitate NIFs. However, when sapients talk about cyborgs, they talk
about MMI-Cyborgs.</p> about MMI-Cyborgs.</p>
<p>MMI, a bland warriors acronym, is short for "Man-Machine-Interface", the catchall term in Solar and <p>MMI, a bland warrior's acronym, is short for "Man-Machine-Interface", the catchall term in Solar and
Galactic Common for any wetware interface that integrates a brain as primary CPU. A product of mostly Galactic Common for any wetware interface that integrates a brain as primary CPU. A product of mostly
bygone times, MMIs are used to breathe life into machine chassis with sapient life without the need to bygone times, MMIs are used to breathe life into machine chassis with sapient life without the need to
grow a drone to beta or alpha level or construct a positronic brain. An MMI, after a short acclimation grow a drone to beta or alpha level or construct a positronic brain. An MMI, after a short acclimation
@@ -654,10 +654,10 @@
they are capable of cannibalizing their seed network. What takes weeks to learn, they learn in days, what takes months, they are capable of cannibalizing their seed network. What takes weeks to learn, they learn in days, what takes months,
weeks, what takes years, they learn in months. This makes freshly activated positronics attractive for creating expert weeks, what takes years, they learn in months. This makes freshly activated positronics attractive for creating expert
workers and specialists in a relatively short time. This initial malleability lasts, however, not forever. At some point workers and specialists in a relatively short time. This initial malleability lasts, however, not forever. At some point
the positronics learning capabilities slow down to more "organic" levels.</p> the positronic's learning capabilities slow down to more "organic" levels.</p>
<p>Some sapients opt to "digitize" themselves and become positronic brains. This process is a very in-depth scan of the <p>Some sapients opt to "digitize" themselves and become positronic brains. This process is a very in-depth scan of the
brain of a sapient to create a mirror image of the brains anatomy, which is used for the "seed" of a new crucible. This brain of a sapient to create a mirror image of the brain's anatomy, which is used for the "seed" of a new crucible. This
seed is not cannibalized, so the accelerated learning phase is skipped, to preserve as much of the previous sapients seed is not cannibalized, so the accelerated learning phase is skipped, to preserve as much of the previous sapient's
network as possible. For best results, the brain is physically sliced up and microscopically scanned slice by slice, network as possible. For best results, the brain is physically sliced up and microscopically scanned slice by slice,
obviously destroying the brain in the process.</p> obviously destroying the brain in the process.</p>
<p>Positronics are not fully culpable for their actions after activation, as they possess the raw intelligence of an <p>Positronics are not fully culpable for their actions after activation, as they possess the raw intelligence of an
@@ -712,7 +712,7 @@
<li><p><b>Drone</b>: are virtually immortal. Their continued existence is flexible and their consciousness can expand <li><p><b>Drone</b>: are virtually immortal. Their continued existence is flexible and their consciousness can expand
and contract at will, while their modularity makes it easy to add more storage space to them to contain all their and contract at will, while their modularity makes it easy to add more storage space to them to contain all their
memories and experiences. However, this modularity also brings in question if the drone that exists today is the same memories and experiences. However, this modularity also brings in question if the drone that exists today is the same
as the drone in ten years - Theseuss Drone, some philosophers joke about it.</p></li> as the drone in ten years - Theseus's Drone, some philosophers joke about it.</p></li>
<li><p><b>Cyborg</b>: live longer than totally unassisted organics, easily surpassing double the lifespan of whatever <li><p><b>Cyborg</b>: live longer than totally unassisted organics, easily surpassing double the lifespan of whatever
host species they come from. After this, however, they slowly succumb to dementia-like symptoms before shutting down host species they come from. After this, however, they slowly succumb to dementia-like symptoms before shutting down
as the brain tissue tires out and slowly crumbles. Many MMI-cyborgs opt at this point to become positronics to live as the brain tissue tires out and slowly crumbles. Many MMI-cyborgs opt at this point to become positronics to live

View File

@@ -188,7 +188,7 @@
icon_state_opened = "redgate_hole" icon_state_opened = "redgate_hole"
/obj/structure/ghost_pod/ghost_activated/maintpred/redgate/Initialize() /obj/structure/ghost_pod/ghost_activated/maintpred/redgate/Initialize()
..() . = ..()
if(!(src in active_ghost_pods)) if(!(src in active_ghost_pods))
active_ghost_pods += src active_ghost_pods += src
@@ -267,6 +267,6 @@
qdel(src) qdel(src)
/obj/structure/ghost_pod/ghost_activated/maint_lurker/Initialize() /obj/structure/ghost_pod/ghost_activated/maint_lurker/Initialize()
..() . = ..()
if(!(src in active_ghost_pods)) if(!(src in active_ghost_pods))
active_ghost_pods += src active_ghost_pods += src

View File

@@ -244,41 +244,41 @@
SSradiation.radiate(src, round(material.radioactivity/3)) SSradiation.radiate(src, round(material.radioactivity/3))
/obj/structure/simple_door/iron/Initialize(mapload,var/material_name) /obj/structure/simple_door/iron/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_IRON) . = ..(mapload, material_name || MAT_IRON)
/obj/structure/simple_door/silver/Initialize(mapload,var/material_name) /obj/structure/simple_door/silver/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_SILVER) . = ..(mapload, material_name || MAT_SILVER)
/obj/structure/simple_door/gold/Initialize(mapload,var/material_name) /obj/structure/simple_door/gold/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_GOLD) . = ..(mapload, material_name || MAT_GOLD)
/obj/structure/simple_door/uranium/Initialize(mapload,var/material_name) /obj/structure/simple_door/uranium/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_URANIUM) . = ..(mapload, material_name || MAT_URANIUM)
/obj/structure/simple_door/sandstone/Initialize(mapload,var/material_name) /obj/structure/simple_door/sandstone/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_SANDSTONE) . = ..(mapload, material_name || MAT_SANDSTONE)
/obj/structure/simple_door/phoron/Initialize(mapload,var/material_name) /obj/structure/simple_door/phoron/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_PHORON) . = ..(mapload, material_name || MAT_PHORON)
/obj/structure/simple_door/diamond/Initialize(mapload,var/material_name) /obj/structure/simple_door/diamond/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_DIAMOND) . = ..(mapload, material_name || MAT_DIAMOND)
/obj/structure/simple_door/wood/Initialize(mapload,var/material_name) /obj/structure/simple_door/wood/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_WOOD) . = ..(mapload, material_name || MAT_WOOD)
knock_sound = 'sound/machines/door/knock_wood.wav' knock_sound = 'sound/machines/door/knock_wood.wav'
/obj/structure/simple_door/hardwood/Initialize(mapload,var/material_name) /obj/structure/simple_door/hardwood/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_HARDWOOD) . = ..(mapload, material_name || MAT_HARDWOOD)
/obj/structure/simple_door/sifwood/Initialize(mapload,var/material_name) /obj/structure/simple_door/sifwood/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_SIFWOOD) . = ..(mapload, material_name || MAT_SIFWOOD)
/obj/structure/simple_door/resin/Initialize(mapload,var/material_name) /obj/structure/simple_door/resin/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_RESIN) . = ..(mapload, material_name || MAT_RESIN)
/obj/structure/simple_door/cult/Initialize(mapload,var/material_name) /obj/structure/simple_door/cult/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_CULT) . = ..(mapload, material_name || MAT_CULT)
/obj/structure/simple_door/cult/TryToSwitchState(atom/user) /obj/structure/simple_door/cult/TryToSwitchState(atom/user)
if(isliving(user)) if(isliving(user))

View File

@@ -25,8 +25,8 @@
base_icon = "modern_chair" base_icon = "modern_chair"
applies_material_colour = 0 applies_material_colour = 0
/obj/structure/bed/chair/modern_chair/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/modern_chair/Initialize(var/newloc, var/new_material, var/new_padding_material)
..() . = ..()
var/image/I = image(icon, "[base_icon]_over") var/image/I = image(icon, "[base_icon]_over")
I.layer = ABOVE_MOB_LAYER I.layer = ABOVE_MOB_LAYER
I.plane = MOB_PLANE I.plane = MOB_PLANE
@@ -141,35 +141,35 @@
base_icon = "bay_chair" base_icon = "bay_chair"
buckle_movable = 1 buckle_movable = 1
/obj/structure/bed/chair/bay/chair/padded/red/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CARPET) . = ..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/chair/padded/brown/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_LEATHER) . = ..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/chair/padded/teal/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_TEAL) . = ..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/chair/padded/black/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BLACK) . = ..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/chair/padded/green/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_GREEN) . = ..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/chair/padded/purple/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_PURPLE) . = ..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/chair/padded/blue/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BLUE) . = ..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/chair/padded/beige/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BEIGE) . = ..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/chair/padded/lime/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_LIME) . = ..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/chair/padded/yellow/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/chair/padded/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_YELLOW) . = ..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy /obj/structure/bed/chair/bay/comfy
name = "comfy mounted chair" name = "comfy mounted chair"
@@ -177,35 +177,35 @@
icon_state = "bay_comfychair_preview" icon_state = "bay_comfychair_preview"
base_icon = "bay_comfychair" base_icon = "bay_comfychair"
/obj/structure/bed/chair/bay/comfy/red/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CARPET) . = ..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/comfy/brown/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_LEATHER) . = ..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_TEAL) . = ..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/comfy/black/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BLACK) . = ..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/comfy/green/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_GREEN) . = ..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/comfy/purple/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_PURPLE) . = ..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BLUE) . = ..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_BEIGE) . = ..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_LIME) . = ..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, MAT_CLOTH_YELLOW) . = ..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/captain /obj/structure/bed/chair/bay/comfy/captain
name = "captain chair" name = "captain chair"
@@ -220,8 +220,8 @@
I.layer = ABOVE_MOB_LAYER I.layer = ABOVE_MOB_LAYER
add_overlay(I) add_overlay(I)
/obj/structure/bed/chair/bay/comfy/captain/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/comfy/captain/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE) . = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/shuttle /obj/structure/bed/chair/bay/shuttle
name = "shuttle seat" name = "shuttle seat"
@@ -232,8 +232,8 @@
var/buckling_sound = 'sound/effects/metal_close.ogg' var/buckling_sound = 'sound/effects/metal_close.ogg'
var/padding = MAT_CLOTH_BLUE var/padding = MAT_CLOTH_BLUE
/obj/structure/bed/chair/bay/shuttle/New(var/newloc, var/new_material, var/new_padding_material) /obj/structure/bed/chair/bay/shuttle/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, padding) . = ..(newloc, MAT_STEEL, padding)
/obj/structure/bed/chair/bay/shuttle/post_buckle_mob() /obj/structure/bed/chair/bay/shuttle/post_buckle_mob()
playsound(src,buckling_sound,75,1) playsound(src,buckling_sound,75,1)

View File

@@ -7,7 +7,7 @@
//Uncomment the testing lines when adding a new landmark and wanting to see if it loaded properly during server init. re-comment after done //Uncomment the testing lines when adding a new landmark and wanting to see if it loaded properly during server init. re-comment after done
/obj/effect/landmark/overmap_renamer/debris_field/Initialize() /obj/effect/landmark/overmap_renamer/debris_field/Initialize()
..() . = ..()
if(!reference) if(!reference)
// testing("First overmap descriptor, name: [name]") // testing("First overmap descriptor, name: [name]")
for(var/obj/effect/overmap/visitable/D in visitable_overmap_object_instances) for(var/obj/effect/overmap/visitable/D in visitable_overmap_object_instances)

View File

@@ -17,6 +17,7 @@
var/hatsize = 0 var/hatsize = 0
/obj/item/clothing/head/fishing/Initialize() /obj/item/clothing/head/fishing/Initialize()
. = ..()
//short phrases that women and fish may have about you //short phrases that women and fish may have about you
var/feelings = list("love me", var/feelings = list("love me",
"fear me", "fear me",
@@ -149,4 +150,4 @@
//finally, take our hat size and pick the icon accordingly //finally, take our hat size and pick the icon accordingly
icon_state = "[colourtype]soft[hatsize]" icon_state = "[colourtype]soft[hatsize]"
item_state_slots = list(slot_r_hand_str = "[colourtype]soft", slot_l_hand_str = "[colourtype]soft", slot_head_str = "[colourtype]soft[hatsize]") item_state_slots = list(slot_r_hand_str = "[colourtype]soft", slot_l_hand_str = "[colourtype]soft", slot_head_str = "[colourtype]soft[hatsize]")

View File

@@ -21,7 +21,7 @@
name = "Mark VII-C Emergency Response Team Commander Suit" name = "Mark VII-C Emergency Response Team Commander Suit"
/obj/item/clothing/suit/space/void/responseteam/command/Initialize() /obj/item/clothing/suit/space/void/responseteam/command/Initialize()
..() . = ..()
attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/command) //autoinstall the helmet attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/command) //autoinstall the helmet
/obj/item/clothing/suit/space/void/responseteam/medical /obj/item/clothing/suit/space/void/responseteam/medical
@@ -30,7 +30,7 @@
item_state = "ertsuit_m" item_state = "ertsuit_m"
/obj/item/clothing/suit/space/void/responseteam/medical/Initialize() /obj/item/clothing/suit/space/void/responseteam/medical/Initialize()
..() . = ..()
attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/medical) //autoinstall the helmet attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/medical) //autoinstall the helmet
/obj/item/clothing/suit/space/void/responseteam/engineer /obj/item/clothing/suit/space/void/responseteam/engineer
@@ -39,7 +39,7 @@
item_state = "ertsuit_e" item_state = "ertsuit_e"
/obj/item/clothing/suit/space/void/responseteam/engineer/Initialize() /obj/item/clothing/suit/space/void/responseteam/engineer/Initialize()
..() . = ..()
attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/engineer) //autoinstall the helmet attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/engineer) //autoinstall the helmet
/obj/item/clothing/suit/space/void/responseteam/security /obj/item/clothing/suit/space/void/responseteam/security
@@ -48,7 +48,7 @@
item_state = "ertsuit_s" item_state = "ertsuit_s"
/obj/item/clothing/suit/space/void/responseteam/security/Initialize() /obj/item/clothing/suit/space/void/responseteam/security/Initialize()
..() . = ..()
attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/security) //autoinstall the helmet attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/security) //autoinstall the helmet
/obj/item/clothing/suit/space/void/responseteam/janitor /obj/item/clothing/suit/space/void/responseteam/janitor
@@ -60,7 +60,7 @@
item_flags = NOSLIP //INBUILT NANOGALOSHES item_flags = NOSLIP //INBUILT NANOGALOSHES
/obj/item/clothing/suit/space/void/responseteam/janitor/Initialize() /obj/item/clothing/suit/space/void/responseteam/janitor/Initialize()
..() . = ..()
attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/janitor) //autoinstall the helmet attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/janitor) //autoinstall the helmet

View File

@@ -27,7 +27,7 @@
return FALSE return FALSE
/obj/item/refill_cartridge/autoname/Initialize() /obj/item/refill_cartridge/autoname/Initialize()
..() . = ..()
if(refill_type && ispath(refill_type)) if(refill_type && ispath(refill_type))
var/atom/tmp = refill_type var/atom/tmp = refill_type
src.name = "[initial(tmp.name)] refill cartridge" src.name = "[initial(tmp.name)] refill cartridge"

View File

@@ -78,8 +78,8 @@
center_of_mass_y = 8 //CHOMPEdit center_of_mass_y = 8 //CHOMPEdit
/obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize() /obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize()
..() . = ..()
reagents.add_reagent(REAGENT_ID_DRGIBB, 30) reagents.add_reagent(REAGENT_ID_DRGIBB, 30)
/obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet /obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet
name = "\improper Diet Dr. Gibb" name = "\improper Diet Dr. Gibb"
@@ -90,8 +90,8 @@
center_of_mass_y = 8 //CHOMPEdit center_of_mass_y = 8 //CHOMPEdit
/obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize() /obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize()
..() . = ..()
reagents.add_reagent(REAGENT_ID_DIETDRGIBB, 30) reagents.add_reagent(REAGENT_ID_DIETDRGIBB, 30)
/obj/item/reagent_containers/food/drinks/cans/starkist /obj/item/reagent_containers/food/drinks/cans/starkist
name = "\improper Star-kist" name = "\improper Star-kist"

View File

@@ -171,6 +171,6 @@
) )
/obj/item/storage/backpack/sport/hyd/catchemall/Initialize() //gotta have your starter 'mon too (or an improved way to catch one) /obj/item/storage/backpack/sport/hyd/catchemall/Initialize() //gotta have your starter 'mon too (or an improved way to catch one)
..() . = ..()
var/path = pick(subtypesof(/obj/item/capture_crystal)) var/path = pick(subtypesof(/obj/item/capture_crystal))
contents += new path() contents += new path()

View File

@@ -423,6 +423,7 @@
var/mob/living/carbon/human/charger var/mob/living/carbon/human/charger
/obj/item/cell/protean/Initialize() /obj/item/cell/protean/Initialize()
. = ..()
charge = maxcharge charge = maxcharge
update_icon() update_icon()
addtimer(CALLBACK(src, PROC_REF(search_for_protean)), 60) addtimer(CALLBACK(src, PROC_REF(search_for_protean)), 60)

View File

@@ -44,7 +44,7 @@
layer = DIRTY_LAYER layer = DIRTY_LAYER
/obj/effect/weaversilk/floor/Initialize() /obj/effect/weaversilk/floor/Initialize()
..() . = ..()
icon_state = pick(possible_icon_states) icon_state = pick(possible_icon_states)
/obj/effect/weaversilk/wall /obj/effect/weaversilk/wall
@@ -55,7 +55,7 @@
density = TRUE density = TRUE
/obj/effect/weaversilk/wall/Initialize() /obj/effect/weaversilk/wall/Initialize()
..() . = ..()
icon_state = pick(possible_icon_states) icon_state = pick(possible_icon_states)
/obj/effect/weaversilk/wall/CanPass(atom/movable/mover, turf/target) /obj/effect/weaversilk/wall/CanPass(atom/movable/mover, turf/target)

View File

@@ -237,6 +237,7 @@
/obj/item/broken_device/random/Initialize() /obj/item/broken_device/random/Initialize()
icon_state = pick(possible_icons) icon_state = pick(possible_icons)
. = ..()
/obj/item/robot_parts/robot_component /obj/item/robot_parts/robot_component
icon = 'icons/obj/robot_component.dmi' icon = 'icons/obj/robot_component.dmi'

View File

@@ -252,7 +252,7 @@ I think I covered everything.
faction = FACTION_NEUTRAL faction = FACTION_NEUTRAL
/mob/living/simple_mob/vore/bigdragon/Initialize() /mob/living/simple_mob/vore/bigdragon/Initialize()
..() . = ..()
src.adjust_nutrition(src.max_nutrition) src.adjust_nutrition(src.max_nutrition)
build_icons(1) build_icons(1)
add_language(LANGUAGE_DRUDAKAR) add_language(LANGUAGE_DRUDAKAR)

View File

@@ -78,7 +78,7 @@
movement_cooldown = -1 movement_cooldown = -1
/mob/living/simple_mob/vore/leopardmander/Initialize() /mob/living/simple_mob/vore/leopardmander/Initialize()
..() . = ..()
src.adjust_nutrition(src.max_nutrition) src.adjust_nutrition(src.max_nutrition)
/mob/living/simple_mob/vore/leopardmander/init_vore() /mob/living/simple_mob/vore/leopardmander/init_vore()

View File

@@ -89,8 +89,8 @@ var/list/possible_cable_coil_colours = list(
/obj/structure/cable/white /obj/structure/cable/white
color = COLOR_WHITE color = COLOR_WHITE
/obj/structure/cable/New() /obj/structure/cable/Initialize()
..() . = ..()
// ensure d1 & d2 reflect the icon_state for entering and exiting cable // ensure d1 & d2 reflect the icon_state for entering and exiting cable
@@ -524,9 +524,9 @@ var/list/possible_cable_coil_colours = list(
uses_charge = 1 uses_charge = 1
charge_costs = list(1) charge_costs = list(1)
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/param_color = null) /obj/item/stack/cable_coil/Initialize(ml, length = MAXCOIL, var/param_color = null)
..() . = ..()
src.amount = length amount = length
if (param_color) // It should be red by default, so only recolor it if parameter was specified. if (param_color) // It should be red by default, so only recolor it if parameter was specified.
color = param_color color = param_color
pixel_x = rand(-2,2) pixel_x = rand(-2,2)
@@ -821,9 +821,9 @@ var/list/possible_cable_coil_colours = list(
/obj/item/stack/cable_coil/cut /obj/item/stack/cable_coil/cut
item_state = "coil2" item_state = "coil2"
/obj/item/stack/cable_coil/cut/New(loc) /obj/item/stack/cable_coil/cut/Initialize(ml)
..() . = ..()
src.amount = rand(1,2) amount = rand(1,2)
pixel_x = rand(-2,2) pixel_x = rand(-2,2)
pixel_y = rand(-2,2) pixel_y = rand(-2,2)
update_icon() update_icon()
@@ -901,16 +901,16 @@ var/list/possible_cable_coil_colours = list(
stacktype = /obj/item/stack/cable_coil stacktype = /obj/item/stack/cable_coil
color = COLOR_BROWN color = COLOR_BROWN
/obj/item/stack/cable_coil/random/New() /obj/item/stack/cable_coil/random/Initialize()
stacktype = /obj/item/stack/cable_coil stacktype = /obj/item/stack/cable_coil
color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN, COLOR_SILVER, COLOR_GRAY, COLOR_BLACK, COLOR_MAROON, COLOR_OLIVE, COLOR_LIME, COLOR_TEAL, COLOR_NAVY, COLOR_PURPLE, COLOR_BEIGE, COLOR_BROWN) color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN, COLOR_SILVER, COLOR_GRAY, COLOR_BLACK, COLOR_MAROON, COLOR_OLIVE, COLOR_LIME, COLOR_TEAL, COLOR_NAVY, COLOR_PURPLE, COLOR_BEIGE, COLOR_BROWN)
..() . = ..()
/obj/item/stack/cable_coil/random_belt/New() /obj/item/stack/cable_coil/random_belt/Initialize()
stacktype = /obj/item/stack/cable_coil stacktype = /obj/item/stack/cable_coil
color = pick(COLOR_RED, COLOR_YELLOW, COLOR_ORANGE) color = pick(COLOR_RED, COLOR_YELLOW, COLOR_ORANGE)
amount = 30 amount = 30
..() . = ..()
//Endless alien cable coil //Endless alien cable coil
@@ -949,7 +949,8 @@ var/list/possible_cable_coil_colours = list(
stacktype = null stacktype = null
toolspeed = 0.25 toolspeed = 0.25
/obj/item/stack/cable_coil/alien/New(loc, length = MAXCOIL, var/param_color = null) //There has to be a better way to do this. /obj/item/stack/cable_coil/alien/Initialize(ml, length = MAXCOIL, var/param_color = null) //There has to be a better way to do this.
. = ..()
if(embed_chance == -1) //From /obj/item, don't want to do what the normal cable_coil does if(embed_chance == -1) //From /obj/item, don't want to do what the normal cable_coil does
if(sharp) if(sharp)
embed_chance = force/w_class embed_chance = force/w_class

View File

@@ -406,7 +406,7 @@
matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 1000) //CHOMPedit Makes them a bit more expensive matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 1000) //CHOMPedit Makes them a bit more expensive
/obj/item/ammo_casing/a145/spent/Initialize() /obj/item/ammo_casing/a145/spent/Initialize()
..() . = ..()
expend() expend()
/* /*

View File

@@ -1,5 +1,5 @@
/turf/simulated/wall/diona/Initialize(mapload) /turf/simulated/wall/diona/Initialize(mapload)
..(mapload, MAT_BIOMASS) . = ..(mapload, MAT_BIOMASS)
/turf/simulated/wall/diona/attack_generic(var/mob/user, var/damage, var/attack_message) /turf/simulated/wall/diona/attack_generic(var/mob/user, var/damage, var/attack_message)
if(istype(user, /mob/living/carbon/alien/diona)) if(istype(user, /mob/living/carbon/alien/diona))

View File

@@ -390,7 +390,7 @@
desc = "Contains drugs for muscle growth." desc = "Contains drugs for muscle growth."
/obj/item/reagent_containers/syringe/steroid/Initialize() /obj/item/reagent_containers/syringe/steroid/Initialize()
..() . = ..()
//reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks. //reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks.
reagents.add_reagent(REAGENT_ID_HYPERZINE,10) reagents.add_reagent(REAGENT_ID_HYPERZINE,10)

View File

@@ -37,14 +37,14 @@
icon_state = "[bike_icon]_off" icon_state = "[bike_icon]_off"
update_icon() update_icon()
/obj/vehicle/bike/built/New() /obj/vehicle/bike/built/Initialize()
..() . = ..()
qdel(cell) qdel(cell)
cell = null cell = null
/obj/vehicle/bike/random/New() /obj/vehicle/bike/random/Initialize()
paint_color = rgb(rand(1,255),rand(1,255),rand(1,255)) paint_color = rgb(rand(1,255),rand(1,255),rand(1,255))
..() . = ..()
/obj/vehicle/bike/attackby(obj/item/W as obj, mob/user as mob) /obj/vehicle/bike/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/multitool) && open) if(istype(W, /obj/item/multitool) && open)

View File

@@ -13,8 +13,8 @@
var/datum/material/material = null var/datum/material/material = null
var/riding_datum_type = /datum/riding/boat/small var/riding_datum_type = /datum/riding/boat/small
/obj/vehicle/boat/sifwood/New(newloc, material_name) /obj/vehicle/boat/sifwood/Initialize(newloc, material_name)
..(newloc, MAT_SIFWOOD) . = ..(newloc, MAT_SIFWOOD)
/obj/vehicle/boat/dragon /obj/vehicle/boat/dragon
name = "dragon boat" name = "dragon boat"
@@ -27,13 +27,13 @@
max_buckled_mobs = 5 max_buckled_mobs = 5
riding_datum_type = /datum/riding/boat/big riding_datum_type = /datum/riding/boat/big
/obj/vehicle/boat/dragon/New(newloc, material_name) /obj/vehicle/boat/dragon/Initialize(newloc, material_name)
..(newloc, material_name) . = ..(newloc, material_name)
var/image/I = image(icon, src, "dragon_boat_underlay", BELOW_MOB_LAYER) var/image/I = image(icon, src, "dragon_boat_underlay", BELOW_MOB_LAYER)
underlays += I underlays += I
/obj/vehicle/boat/dragon/sifwood/New(newloc, material_name) /obj/vehicle/boat/dragon/sifwood/Initialize(newloc, material_name)
..(newloc, MAT_SIFWOOD) . = ..(newloc, MAT_SIFWOOD)
// Oars, which must be held inhand while in a boat to move it. // Oars, which must be held inhand while in a boat to move it.
/obj/item/oar /obj/item/oar
@@ -45,29 +45,29 @@
force = 12 force = 12
var/datum/material/material = null var/datum/material/material = null
/obj/item/oar/sifwood/New(newloc, material_name) /obj/item/oar/sifwood/Initialize(newloc, material_name)
..(newloc, MAT_SIFWOOD) . = ..(newloc, MAT_SIFWOOD)
/obj/item/oar/New(newloc, material_name) /obj/item/oar/Initialize(newloc, material_name)
..(newloc) ..(newloc)
if(!material_name) if(!material_name)
material_name = MAT_WOOD material_name = MAT_WOOD
material = get_material_by_name("[material_name]") material = get_material_by_name("[material_name]")
if(!material) if(!material)
qdel(src) return INITIALIZE_HINT_QDEL
return
color = material.icon_colour color = material.icon_colour
return INITIALIZE_HINT_NORMAL
/obj/vehicle/boat/New(newloc, material_name) /obj/vehicle/boat/Initialize(newloc, material_name)
..(newloc) ..(newloc)
if(!material_name) if(!material_name)
material_name = MAT_WOOD material_name = MAT_WOOD
material = get_material_by_name("[material_name]") material = get_material_by_name("[material_name]")
if(!material) if(!material)
qdel(src) return INITIALIZE_HINT_QDEL
return
color = material.icon_colour color = material.icon_colour
riding_datum = new riding_datum_type(src) riding_datum = new riding_datum_type(src)
return INITIALIZE_HINT_NORMAL
// Boarding. // Boarding.
/obj/vehicle/boat/MouseDrop_T(var/atom/movable/C, mob/user) /obj/vehicle/boat/MouseDrop_T(var/atom/movable/C, mob/user)

View File

@@ -42,8 +42,8 @@
//------------------------------------------- //-------------------------------------------
// Standard procs // Standard procs
//------------------------------------------- //-------------------------------------------
/obj/vehicle/train/engine/New() /obj/vehicle/train/engine/Initialize()
..() . = ..()
cell = new /obj/item/cell/high(src) cell = new /obj/item/cell/high(src)
key = new key_type(src) key = new key_type(src)
var/image/I = new(icon = 'icons/obj/vehicles_vr.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs //VOREStation edit var/image/I = new(icon = 'icons/obj/vehicles_vr.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs //VOREStation edit

View File

@@ -16,8 +16,8 @@
var/build_stage = 0 var/build_stage = 0
var/obj/item/cell/cell = null var/obj/item/cell/cell = null
/obj/item/vehicle_assembly/New() /obj/item/vehicle_assembly/Initialize()
..() . = ..()
icon_state = "[initial(icon_state)][build_stage]" icon_state = "[initial(icon_state)][build_stage]"
update_icon() update_icon()

View File

@@ -49,9 +49,8 @@
//------------------------------------------- //-------------------------------------------
//ChompADD START //ChompADD START
/obj/vehicle/Initialize() /obj/vehicle/Initialize()
.=..() . = ..()
soundloop = new(list(src), FALSE) soundloop = new(list(src), FALSE)
return
//ChompADD END //ChompADD END
///obj/vehicle/New() ///obj/vehicle/New()

View File

@@ -100,8 +100,8 @@
name = "Ivy's Courier" name = "Ivy's Courier"
desc = "A bag resembling something used by college students. Contains items for ''MooMoo''." desc = "A bag resembling something used by college students. Contains items for ''MooMoo''."
/obj/item/storage/backpack/messenger/sec/fluff/ivymoomoo/New() /obj/item/storage/backpack/messenger/sec/fluff/ivymoomoo/Initialize()
..() . = ..()
new /obj/item/clothing/head/beretg(src) new /obj/item/clothing/head/beretg(src)
new /obj/item/fluff/id_kit_ivy(src) new /obj/item/fluff/id_kit_ivy(src)
new /obj/item/storage/fancy/cigarettes/dromedaryco(src) new /obj/item/storage/fancy/cigarettes/dromedaryco(src)
@@ -140,8 +140,8 @@
slowdown = 0 slowdown = 0
can_tilt = 0 can_tilt = 0
/obj/item/storage/backpack/dufflebag/sec/fluff/joanrisu/New() /obj/item/storage/backpack/dufflebag/sec/fluff/joanrisu/Initialize()
..() . = ..()
new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/clothing/suit/storage/fluff/modernfedcoat(src) new /obj/item/clothing/suit/storage/fluff/modernfedcoat(src)
new /obj/item/clothing/head/caphat/formal/fedcover(src) new /obj/item/clothing/head/caphat/formal/fedcover(src)
@@ -157,8 +157,8 @@
desc = "A duffle bag Katarina uses to carry her tools." desc = "A duffle bag Katarina uses to carry her tools."
slowdown = 0 slowdown = 0
/obj/item/storage/backpack/dufflebag/sec/fluff/katarina/New() /obj/item/storage/backpack/dufflebag/sec/fluff/katarina/Initialize()
..() . = ..()
new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/clothing/suit/storage/fluff/fedcoat(src) new /obj/item/clothing/suit/storage/fluff/fedcoat(src)
new /obj/item/clothing/suit/armor/det_suit(src) new /obj/item/clothing/suit/armor/det_suit(src)

View File

@@ -746,8 +746,8 @@
storage_slots = 9 storage_slots = 9
/obj/item/storage/belt/utility/fluff/vulpine/New() /obj/item/storage/belt/utility/fluff/vulpine/Initialize()
..() . = ..()
new /obj/item/tool/screwdriver(src) new /obj/item/tool/screwdriver(src)
new /obj/item/tool/wrench(src) new /obj/item/tool/wrench(src)
new /obj/item/weldingtool(src) new /obj/item/weldingtool(src)

View File

@@ -306,8 +306,8 @@
filling_color = "#FDFFD1" filling_color = "#FDFFD1"
volume = 12 volume = 12
/obj/item/reagent_containers/food/snacks/egg/teshari/New() /obj/item/reagent_containers/food/snacks/egg/teshari/Initialize()
..() . = ..()
reagents.add_reagent(REAGENT_ID_EGG, 10) reagents.add_reagent(REAGENT_ID_EGG, 10)
bitesize = 2 bitesize = 2
@@ -409,8 +409,8 @@
filling_color = "#FDFFD1" filling_color = "#FDFFD1"
volume = 12 volume = 12
/obj/item/reagent_containers/food/snacks/egg/roiz/New() /obj/item/reagent_containers/food/snacks/egg/roiz/Initialize()
..() . = ..()
reagents.add_reagent(REAGENT_ID_EGG, 9) reagents.add_reagent(REAGENT_ID_EGG, 9)
bitesize = 2 bitesize = 2
@@ -439,8 +439,8 @@
icon_state = "friedegg" icon_state = "friedegg"
volume = 12 volume = 12
/obj/item/reagent_containers/food/snacks/friedegg/roiz/New() /obj/item/reagent_containers/food/snacks/friedegg/roiz/Initialize()
..() . = ..()
reagents.add_reagent(REAGENT_ID_PROTEIN, 9) reagents.add_reagent(REAGENT_ID_PROTEIN, 9)
bitesize = 2 bitesize = 2
@@ -451,8 +451,8 @@
icon_state = "egg_roiz" icon_state = "egg_roiz"
volume = 12 volume = 12
/obj/item/reagent_containers/food/snacks/boiledegg/roiz/New() /obj/item/reagent_containers/food/snacks/boiledegg/roiz/Initialize()
..() . = ..()
reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_PROTEIN, 6)
bitesize = 2 bitesize = 2
@@ -466,8 +466,8 @@
nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5) nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5)
volume = 18 volume = 18
/obj/item/reagent_containers/food/snacks/chocolateegg/roiz/New() /obj/item/reagent_containers/food/snacks/chocolateegg/roiz/Initialize()
..() . = ..()
reagents.add_reagent(REAGENT_ID_SUGAR, 6) reagents.add_reagent(REAGENT_ID_SUGAR, 6)
reagents.add_reagent(REAGENT_ID_COCO, 6) reagents.add_reagent(REAGENT_ID_COCO, 6)
reagents.add_reagent(REAGENT_ID_MILK, 2) reagents.add_reagent(REAGENT_ID_MILK, 2)

View File

@@ -532,8 +532,8 @@
var/client/owner_c = null //They'll be dead when we message them probably. var/client/owner_c = null //They'll be dead when we message them probably.
var/state = 0 //0 - New, 1 - Paired, 2 - Breaking, 3 - Broken (same as iconstates) var/state = 0 //0 - New, 1 - Paired, 2 - Breaking, 3 - Broken (same as iconstates)
/obj/item/clothing/accessory/collar/khcrystal/New() /obj/item/clothing/accessory/collar/khcrystal/Initialize()
..() . = ..()
update_state(0) update_state(0)
/obj/item/clothing/accessory/collar/khcrystal/Destroy() //Waitwaitwait /obj/item/clothing/accessory/collar/khcrystal/Destroy() //Waitwaitwait
@@ -618,8 +618,8 @@
max_storage_space = ITEMSIZE_COST_SMALL * 2 max_storage_space = ITEMSIZE_COST_SMALL * 2
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
/obj/item/storage/box/khcrystal/New() /obj/item/storage/box/khcrystal/Initialize()
..() . = ..()
new /obj/item/paper/khcrystal_manual(src) new /obj/item/paper/khcrystal_manual(src)
new /obj/item/clothing/accessory/collar/khcrystal(src) new /obj/item/clothing/accessory/collar/khcrystal(src)
@@ -902,8 +902,8 @@
slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi', slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi',
) )
/obj/item/material/twohanded/fluff/New(var/newloc) /obj/item/material/twohanded/fluff/Initialize(var/newloc)
..(newloc," ") //See materials_vr_dmi for more information as to why this is a blank space. . = ..(newloc," ") //See materials_vr_dmi for more information as to why this is a blank space.
//jacknoir413:Areax Third //jacknoir413:Areax Third
/obj/item/melee/baton/fluff/stunstaff /obj/item/melee/baton/fluff/stunstaff
@@ -926,11 +926,10 @@
var/wielded = 0 var/wielded = 0
var/base_name = "stunstaff" var/base_name = "stunstaff"
/obj/item/melee/baton/fluff/stunstaff/New() /obj/item/melee/baton/fluff/stunstaff/Initialize()
..() . = ..()
bcell = new/obj/item/cell/device/weapon(src) bcell = new/obj/item/cell/device/weapon(src)
update_icon() update_icon()
return
/obj/item/melee/baton/fluff/stunstaff/update_held_icon() /obj/item/melee/baton/fluff/stunstaff/update_held_icon()
var/mob/living/M = loc var/mob/living/M = loc
@@ -996,8 +995,8 @@
max_w_class = ITEMSIZE_HUGE max_w_class = ITEMSIZE_HUGE
max_storage_space = 16 max_storage_space = 16
/obj/item/storage/backpack/fluff/stunstaff/New() /obj/item/storage/backpack/fluff/stunstaff/Initialize()
..() . = ..()
new /obj/item/melee/baton/fluff/stunstaff(src) new /obj/item/melee/baton/fluff/stunstaff(src)
@@ -1349,12 +1348,12 @@ End CHOMP Removal*/
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 7) starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 7)
/obj/item/storage/fancy/fluff/charlotte/New() /obj/item/storage/fancy/fluff/charlotte/Initialize()
if(!open_state) if(!open_state)
open_state = "[initial(icon_state)]0" open_state = "[initial(icon_state)]0"
if(!closed_state) if(!closed_state)
closed_state = "[initial(icon_state)]" closed_state = "[initial(icon_state)]"
..() . = ..()
/obj/item/storage/fancy/fluff/charlotte/update_icon() /obj/item/storage/fancy/fluff/charlotte/update_icon()
cut_overlays() cut_overlays()
@@ -1569,8 +1568,9 @@ End CHOMP Removal*/
..() ..()
icon_state = "ceph_d6[result]" icon_state = "ceph_d6[result]"
/obj/item/dice/loaded/ceph/New() /obj/item/dice/loaded/ceph/Initialize()
icon_state = "ceph_d6[rand(1,sides)]" icon_state = "ceph_d6[rand(1,sides)]"
. = ..()
//abc123: Mira Nesyne //abc123: Mira Nesyne

View File

@@ -7,16 +7,14 @@
icon = 'icons/mecha/mecha_vr.dmi' icon = 'icons/mecha/mecha_vr.dmi'
/obj/mecha/combat/phazon/scree/New() /obj/mecha/combat/phazon/scree/Initialize()
..() . = ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
ME.attach(src) ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
ME.attach(src) ME.attach(src)
return
/obj/effect/decal/mecha_wreckage/phazon/scree /obj/effect/decal/mecha_wreckage/phazon/scree
name = "Scuttlebug wreckage" name = "Scuttlebug wreckage"
icon_state = "scuttlebug-broken" icon_state = "scuttlebug-broken"
icon = 'icons/mecha/mecha_vr.dmi' icon = 'icons/mecha/mecha_vr.dmi'

View File

@@ -24,8 +24,8 @@
fire_sound = 'sound/weapons/pulse3.ogg' fire_sound = 'sound/weapons/pulse3.ogg'
)) ))
/obj/item/gun/energy/sizegun/New() /obj/item/gun/energy/sizegun/Initialize()
..() . = ..()
verbs += /obj/item/gun/energy/sizegun/proc/select_size verbs += /obj/item/gun/energy/sizegun/proc/select_size
verbs += /obj/item/gun/energy/sizegun/proc/spin_dial verbs += /obj/item/gun/energy/sizegun/proc/spin_dial

View File

@@ -14,8 +14,7 @@
active_power_usage = 2000 active_power_usage = 2000
idle_power_usage = 1000 idle_power_usage = 1000
/obj/machinery/auto_cloner/New() /obj/machinery/auto_cloner/Initialize(mapload)
..()
time_per_spawn = rand(1200,3600) time_per_spawn = rand(1200,3600)
@@ -38,6 +37,7 @@
/mob/living/simple_mob/animal/passive/crab, /mob/living/simple_mob/animal/passive/crab,
/mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/passive/mouse,
/mob/living/simple_mob/animal/goat) /mob/living/simple_mob/animal/goat)
. = ..()
//todo: how the hell is the asteroid permanently powered? //todo: how the hell is the asteroid permanently powered?
/obj/machinery/auto_cloner/process() /obj/machinery/auto_cloner/process()

View File

@@ -4,8 +4,7 @@
icon_state = "crystal" icon_state = "crystal"
density = TRUE density = TRUE
/obj/structure/crystal/New() /obj/structure/crystal/Initialize()
..()
icon_state = pick("ano70","ano80") icon_state = pick("ano70","ano80")
@@ -15,6 +14,7 @@
"It seems to draw you inward as you look it at.", "It seems to draw you inward as you look it at.",
"Something twinkles faintly as you look at it.", "Something twinkles faintly as you look at it.",
"It's mesmerizing to behold.") "It's mesmerizing to behold.")
. = ..()
/obj/structure/crystal/Destroy() /obj/structure/crystal/Destroy()
src.visible_message(span_bolddanger("[src] shatters!")) src.visible_message(span_bolddanger("[src] shatters!"))

View File

@@ -11,9 +11,10 @@
var/datum/artifact_find/artifact_find var/datum/artifact_find/artifact_find
var/last_act = 0 var/last_act = 0
/obj/structure/boulder/New() /obj/structure/boulder/Initialize()
icon_state = "boulder[rand(1,4)]" icon_state = "boulder[rand(1,4)]"
excavation_level = rand(5, 50) excavation_level = rand(5, 50)
. = ..()
/obj/structure/boulder/attackby(var/obj/item/I, var/mob/user) /obj/structure/boulder/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/core_sampler)) if(istype(I, /obj/item/core_sampler))

View File

@@ -8,9 +8,10 @@
sharp = TRUE sharp = TRUE
var/datum/geosample/geological_data var/datum/geosample/geological_data
/obj/item/rocksliver/New() /obj/item/rocksliver/Initialize()
icon_state = "sliver[rand(1, 3)]" icon_state = "sliver[rand(1, 3)]"
randpixel_xy() randpixel_xy()
. = ..()
/datum/geosample /datum/geosample
var/age = 0 var/age = 0

View File

@@ -16,8 +16,8 @@
flags = OPENCONTAINER flags = OPENCONTAINER
/obj/item/slime_extract/New() /obj/item/slime_extract/Initialize()
..() . = ..()
create_reagents(60) create_reagents(60)
/obj/item/slime_extract/attackby(obj/item/O, mob/user) /obj/item/slime_extract/attackby(obj/item/O, mob/user)

View File

@@ -145,7 +145,7 @@
light_system = STATIC_LIGHT light_system = STATIC_LIGHT
/obj/item/flashlight/slime/Initialize() /obj/item/flashlight/slime/Initialize()
.=..() . = ..()
set_light(light_range, light_power, light_color) set_light(light_range, light_power, light_color)
/obj/item/flashlight/slime/update_brightness() /obj/item/flashlight/slime/update_brightness()
@@ -167,10 +167,10 @@
light_range = 2 light_range = 2
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
/obj/item/slime_irradiator/New() /obj/item/slime_irradiator/Initialize()
. = ..()
START_PROCESSING(SSobj, src) START_PROCESSING(SSobj, src)
set_light(light_range, light_power, light_color) set_light(light_range, light_power, light_color)
return ..()
/obj/item/slime_irradiator/process() /obj/item/slime_irradiator/process()
SSradiation.radiate(src, 5) SSradiation.radiate(src, 5)

View File

@@ -119,15 +119,15 @@
// These are step-teleporters, for map edge transitions // These are step-teleporters, for map edge transitions
// This top one goes INTO the cave // This top one goes INTO the cave
/obj/effect/step_trigger/teleporter/away_beach_tocave/New() /obj/effect/step_trigger/teleporter/away_beach_tocave/Initialize()
..() . = ..()
teleport_x = src.x //X is horizontal. This is a top of map transition, so you want the same horizontal alignment in the cave as you have on the beach teleport_x = src.x //X is horizontal. This is a top of map transition, so you want the same horizontal alignment in the cave as you have on the beach
teleport_y = 2 //2 is because it's putting you on row 2 of the map to the north teleport_y = 2 //2 is because it's putting you on row 2 of the map to the north
teleport_z = z+1 //The cave is always our Z-level plus 1, because it's loaded after us teleport_z = z+1 //The cave is always our Z-level plus 1, because it's loaded after us
//This one goes OUT OF the cave //This one goes OUT OF the cave
/obj/effect/step_trigger/teleporter/away_beach_tobeach/New() /obj/effect/step_trigger/teleporter/away_beach_tobeach/Initialize()
..() . = ..()
teleport_x = src.x //Same reason as bove teleport_x = src.x //Same reason as bove
teleport_y = world.maxy - 1 //This means "1 space from the top of the map" teleport_y = world.maxy - 1 //This means "1 space from the top of the map"
teleport_z = z-1 //Opposite of 'tocave', beach is always loaded as the map before us teleport_z = z-1 //Opposite of 'tocave', beach is always loaded as the map before us
@@ -139,8 +139,8 @@
name = "Water" name = "Water"
icon_state = "water" icon_state = "water"
/turf/simulated/floor/beach/coastwater/New() /turf/simulated/floor/beach/coastwater/Initialize()
..() . = ..()
add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water","layer"=MOB_LAYER+0.1)) add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water","layer"=MOB_LAYER+0.1))
// -- Areas -- // // -- Areas -- //

View File

@@ -117,8 +117,8 @@
wreckage = /obj/effect/decal/mecha_wreckage/honker/cluwne wreckage = /obj/effect/decal/mecha_wreckage/honker/cluwne
max_equip = 4 max_equip = 4
/obj/mecha/combat/honker/cluwne/New() /obj/mecha/combat/honker/cluwne/Initialize()
..() . = ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
ME.attach(src) ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive
@@ -127,7 +127,6 @@
ME.attach(src) ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker
ME.attach(src) ME.attach(src)
return
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar
name = "Banana Mortar" name = "Banana Mortar"

View File

@@ -109,8 +109,9 @@
var/triggerproc = "explode" //name of the proc thats called when the mine is triggered var/triggerproc = "explode" //name of the proc thats called when the mine is triggered
var/triggered = 0 var/triggered = 0
/obj/effect/meatgrinder/New() /obj/effect/meatgrinder/Initialize()
icon_state = "blob" icon_state = "blob"
. = ..()
/obj/effect/meatgrinder/HasEntered(AM as mob|obj) /obj/effect/meatgrinder/HasEntered(AM as mob|obj)
Bumped(AM) Bumped(AM)

View File

@@ -97,9 +97,9 @@
qdel(I) qdel(I)
/obj/structure/bed/bath/New() /obj/structure/bed/bath/Initialize(mapload)
create_reagents(300) create_reagents(300)
..() . = ..()
//oven //oven
@@ -179,10 +179,10 @@
to_chat(user, "You carefully place \the [I] into the cistern.") to_chat(user, "You carefully place \the [I] into the cistern.")
return return
/obj/structure/toilet/wooden/New() /obj/structure/toilet/wooden/Initialize()
open = 1 //just to make sure it works open = 1 //just to make sure it works
icon_state = "toilet3" icon_state = "toilet3"
return . = ..()
/obj/structure/toilet/wooden/update_icon() /obj/structure/toilet/wooden/update_icon()
return return
@@ -540,7 +540,7 @@ This device records all warnings given and teleport events for admin review in c
//locked door //locked door
/obj/structure/simple_door/dungeon/Initialize(mapload,var/material_name) /obj/structure/simple_door/dungeon/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_CULT) . = ..(mapload, material_name || MAT_CULT)
/obj/structure/simple_door/dungeon/locked /obj/structure/simple_door/dungeon/locked
locked = TRUE locked = TRUE

View File

@@ -103,6 +103,6 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/kafel_full/yellow)
//Mechbay //Mechbay
/obj/mecha/working/ripley/abandoned/Initialize() /obj/mecha/working/ripley/abandoned/Initialize()
..() . = ..()
for(var/obj/item/mecha_parts/mecha_tracking/B in src.contents) //Deletes the beacon so it can't be found easily for(var/obj/item/mecha_parts/mecha_tracking/B in src.contents) //Deletes the beacon so it can't be found easily
qdel(B) qdel(B)

View File

@@ -27,32 +27,32 @@
external_pressure_bound = ONE_ATMOSPHERE * 1.1 external_pressure_bound = ONE_ATMOSPHERE * 1.1
/obj/effect/step_trigger/teleporter/to_mining/New() /obj/effect/step_trigger/teleporter/to_mining/Initialize()
..() . = ..()
teleport_x = src.x teleport_x = src.x
teleport_y = 2 teleport_y = 2
teleport_z = Z_LEVEL_SURFACE_MINE teleport_z = Z_LEVEL_SURFACE_MINE
/obj/effect/step_trigger/teleporter/from_mining/New() /obj/effect/step_trigger/teleporter/from_mining/Initialize()
..() . = ..()
teleport_x = src.x teleport_x = src.x
teleport_y = world.maxy - 1 teleport_y = world.maxy - 1
teleport_z = Z_LEVEL_SURFACE_LOW teleport_z = Z_LEVEL_SURFACE_LOW
/obj/effect/step_trigger/teleporter/to_solars/New() /obj/effect/step_trigger/teleporter/to_solars/Initialize()
..() . = ..()
teleport_x = world.maxx - 1 teleport_x = world.maxx - 1
teleport_y = src.y teleport_y = src.y
teleport_z = Z_LEVEL_SOLARS teleport_z = Z_LEVEL_SOLARS
/obj/effect/step_trigger/teleporter/from_solars/New() /obj/effect/step_trigger/teleporter/from_solars/Initialize()
..() . = ..()
teleport_x = 2 teleport_x = 2
teleport_y = src.y teleport_y = src.y
teleport_z = Z_LEVEL_SURFACE_LOW teleport_z = Z_LEVEL_SURFACE_LOW
/obj/effect/step_trigger/teleporter/wild/New() /obj/effect/step_trigger/teleporter/wild/Initialize()
..() . = ..()
//If starting on east/west edges. //If starting on east/west edges.
if (src.x == 1) if (src.x == 1)
@@ -95,14 +95,14 @@
if(Z.name == "Mining Outpost") if(Z.name == "Mining Outpost")
teleport_z = Z.z teleport_z = Z.z
/obj/effect/step_trigger/teleporter/to_plains/New() /obj/effect/step_trigger/teleporter/to_plains/Initialize()
..() . = ..()
teleport_x = src.x teleport_x = src.x
teleport_y = world.maxy - 1 teleport_y = world.maxy - 1
teleport_z = Z_LEVEL_PLAINS teleport_z = Z_LEVEL_PLAINS
/obj/effect/step_trigger/teleporter/from_plains/New() /obj/effect/step_trigger/teleporter/from_plains/Initialize()
..() . = ..()
teleport_x = src.x teleport_x = src.x
teleport_y = 2 teleport_y = 2
teleport_z = Z_LEVEL_SURFACE_LOW teleport_z = Z_LEVEL_SURFACE_LOW

View File

@@ -168,9 +168,9 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
icon = 'icons/turf/space_vr.dmi' icon = 'icons/turf/space_vr.dmi'
icon_state = "bluespace" icon_state = "bluespace"
/turf/space/bluespace/Initialize() /turf/space/bluespace/Initialize()
..()
icon = 'icons/turf/space_vr.dmi' icon = 'icons/turf/space_vr.dmi'
icon_state = "bluespace" icon_state = "bluespace"
. = ..()
// Desert jump turf! // Desert jump turf!
/turf/space/sandyscroll /turf/space/sandyscroll
@@ -178,8 +178,8 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
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"
. = ..()
//Sky stuff! //Sky stuff!
// A simple turf to fake the appearance of flying. // A simple turf to fake the appearance of flying.