/atom New() => Initialize() [MDB IGNORE]

This commit is contained in:
MistakeNot4892
2021-11-14 03:09:51 -05:00
committed by VirgoBot
parent 47c8115916
commit 3f9af78f3a
587 changed files with 12315 additions and 2669 deletions
+2 -2
View File
@@ -8,8 +8,8 @@
var/codelen = 4
locked = 1
/obj/structure/closet/crate/secure/loot/New()
..()
/obj/structure/closet/crate/secure/loot/Initialize()
. = ..()
var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
for(var/i in 1 to codelen)
+5
View File
@@ -363,10 +363,15 @@
var/brace_tier = 1
var/obj/machinery/mining/drill/connected
<<<<<<< HEAD
/obj/machinery/mining/brace/examine(mob/user)
. = ..()
if(brace_tier > 2)
. += SPAN_NOTICE("The internals of the brace look resilient enough to support a drill by itself.")
=======
/obj/machinery/mining/brace/Initialize()
. = ..()
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
/obj/machinery/mining/brace/Initialize()
. = ..()
@@ -7,8 +7,9 @@
density = FALSE
anchored = TRUE
/obj/machinery/mineral/input/New()
/obj/machinery/mineral/input/Initialize()
icon_state = "blank"
. = ..()
/obj/machinery/mineral/output
icon = 'icons/mob/screen1.dmi'
@@ -17,5 +18,6 @@
density = FALSE
anchored = TRUE
/obj/machinery/mineral/output/New()
icon_state = "blank"
/obj/machinery/mineral/output/Initialize()
icon_state = "blank"
. = ..()
@@ -10,9 +10,9 @@
var/obj/machinery/mineral/stacking_machine/machine = null
//var/machinedir = SOUTHEAST //This is really dumb, so lets burn it with fire.
/obj/machinery/mineral/stacking_unit_console/New()
/obj/machinery/mineral/stacking_unit_console/Initialize()
..()
. = ..()
spawn(7)
//src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) //No.
@@ -84,8 +84,8 @@
var/list/stack_paths[0]
var/stack_amt = 50; // Amount to stack before releassing
/obj/machinery/mineral/stacking_machine/New()
..()
/obj/machinery/mineral/stacking_machine/Initialize()
. = ..()
for(var/obj/item/stack/material/S as anything in (subtypesof(/obj/item/stack/material) - typesof(/obj/item/stack/material/cyborg)))
var/s_matname = initial(S.default_type)
+5 -4
View File
@@ -328,7 +328,7 @@ var/list/mining_overlay_cache = list()
/turf/simulated/mineral/proc/UpdateMineral()
clear_ore_effects()
if(mineral)
if(initialized && istype(mineral))
new /obj/effect/mineral(src, mineral)
update_icon()
@@ -625,9 +625,9 @@ var/list/mining_overlay_cache = list()
//otherwise, they come out inside a chunk of rock
var/obj/item/weapon/X
if(is_clean)
X = new /obj/item/weapon/archaeological_find(src, new_item_type = F.find_type)
X = new /obj/item/weapon/archaeological_find(src, F.find_type)
else
X = new /obj/item/weapon/strangerock(src, inside_item_type = F.find_type)
X = new /obj/item/weapon/strangerock(src, F.find_type)
geologic_data.UpdateNearbyArtifactInfo(src)
var/obj/item/weapon/strangerock/SR = X
SR.geologic_data = geologic_data
@@ -687,5 +687,6 @@ var/list/mining_overlay_cache = list()
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
UpdateMineral()
if(initialized)
UpdateMineral()
update_icon()
+2 -2
View File
@@ -9,8 +9,8 @@
var/image/scanner_image
var/ore_reagent // Reagent from pumping water near this ore.
/obj/effect/mineral/New(var/newloc, var/ore/M)
..(newloc)
/obj/effect/mineral/Initialize(var/ml, var/ore/M)
. = ..(ml)
name = "[M.display_name] deposit"
ore_key = M.name
if(M.reagent)