Merge pull request #15585 from SandPoot/Initialize(mapload)

Every case of initialize that should have mapload, does
This commit is contained in:
silicons
2022-04-15 17:41:57 -07:00
committed by GitHub
881 changed files with 1588 additions and 1588 deletions
+3 -3
View File
@@ -14,7 +14,7 @@
var/obj/item/holder = null
// You can use this var for item path, it would be converted into an item on New()
/obj/item/organ/cyberimp/arm/Initialize()
/obj/item/organ/cyberimp/arm/Initialize(mapload)
. = ..()
if(ispath(holder))
holder = new holder(src)
@@ -242,7 +242,7 @@
desc = "An integrated projector mounted onto a user's arm that is able to be used as a powerful flash."
contents = newlist(/obj/item/assembly/flash/armimplant)
/obj/item/organ/cyberimp/arm/flash/Initialize()
/obj/item/organ/cyberimp/arm/flash/Initialize(mapload)
. = ..()
if(locate(/obj/item/assembly/flash/armimplant) in items_list)
var/obj/item/assembly/flash/armimplant/F = locate(/obj/item/assembly/flash/armimplant) in items_list
@@ -258,7 +258,7 @@
desc = "A powerful cybernetic implant that contains combat modules built into the user's arm."
contents = newlist(/obj/item/melee/transforming/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/assembly/flash/armimplant)
/obj/item/organ/cyberimp/arm/combat/Initialize()
/obj/item/organ/cyberimp/arm/combat/Initialize(mapload)
. = ..()
if(locate(/obj/item/assembly/flash/armimplant) in items_list)
var/obj/item/assembly/flash/armimplant/F = locate(/obj/item/assembly/flash/armimplant) in items_list
+2 -2
View File
@@ -246,7 +246,7 @@
var/obj/effect/abstract/eye_lighting/on_mob
var/image/mob_overlay
/obj/item/organ/eyes/robotic/glow/Initialize()
/obj/item/organ/eyes/robotic/glow/Initialize(mapload)
. = ..()
mob_overlay = image('icons/mob/human_face.dmi', "eyes_glow_gs")
@@ -407,7 +407,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/obj/item/organ/eyes/robotic/glow/parent
/obj/effect/abstract/eye_lighting/Initialize()
/obj/effect/abstract/eye_lighting/Initialize(mapload)
. = ..()
parent = loc
if(!istype(parent))
@@ -31,7 +31,7 @@
var/useable = TRUE
var/list/food_reagents = list(/datum/reagent/consumable/nutriment = 5)
/obj/item/organ/Initialize()
/obj/item/organ/Initialize(mapload)
. = ..()
if(organ_flags & ORGAN_EDIBLE)
AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GROSS, null, 10, null, null, null, CALLBACK(src, .proc/OnEatFrom))
@@ -359,7 +359,7 @@
name = "Illegal organ"
desc = "Something hecked up"
/obj/item/organ/random/Initialize()
/obj/item/organ/random/Initialize(mapload)
..()
var/list = list(/obj/item/organ/tongue, /obj/item/organ/brain, /obj/item/organ/heart, /obj/item/organ/liver, /obj/item/organ/ears, /obj/item/organ/eyes, /obj/item/organ/tail, /obj/item/organ/stomach)
var/newtype = pick(list)
+1 -1
View File
@@ -168,7 +168,7 @@
var/phomeme_type = "sans"
var/list/phomeme_types = list(/datum/accent/span/sans, /datum/accent/span/papyrus)
/obj/item/organ/tongue/bone/Initialize()
/obj/item/organ/tongue/bone/Initialize(mapload)
initial_accents += pick(phomeme_types)
. = ..()
+1 -1
View File
@@ -147,7 +147,7 @@
icon_state = "datadisk1"
custom_materials = list(/datum/material/iron=300, /datum/material/glass=100)
/obj/item/disk/surgery/debug/Initialize()
/obj/item/disk/surgery/debug/Initialize(mapload)
. = ..()
surgeries = list()
var/list/req_tech_surgeries = subtypesof(/datum/surgery)
+4 -4
View File
@@ -160,7 +160,7 @@
icon_state = "surgicaldrill_a"
hitsound = 'sound/items/welder.ogg'
/obj/item/surgicaldrill/advanced/Initialize()
/obj/item/surgicaldrill/advanced/Initialize(mapload)
. = ..()
set_light(1)
@@ -214,7 +214,7 @@
toolspeed = 1
bare_wound_bonus = 20
/obj/item/scalpel/Initialize()
/obj/item/scalpel/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 80 * toolspeed, 100, 0)
@@ -235,7 +235,7 @@
light_color = LIGHT_COLOR_GREEN
sharpness = SHARP_POINTY
/obj/item/scalpel/advanced/Initialize()
/obj/item/scalpel/advanced/Initialize(mapload)
. = ..()
set_light(1)
@@ -311,7 +311,7 @@
wound_bonus = 5
bare_wound_bonus = 10
/obj/item/circular_saw/Initialize()
/obj/item/circular_saw/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 40 * toolspeed, 100, 5, 'sound/weapons/circsawhit.ogg') //saws are very accurate and fast at butchering