cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

migrate all /obj/item from /New() to /Initialize() (#31232)

Browse Source 
* migrate all /obj/item from /New() to /Initialize()

* move GLOB.chemical_reagents_list creation to /world/New()

* review

* oops

* autodoc a smart var
This commit is contained in:
Toastical
2026-01-28 19:44:32 +00:00
committed by GitHub
parent a0ed4b0066
commit 4c74b78a18
89 changed files with 321 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_arms.dm
+6 -6
View File
@@ -15,8 +15,8 @@
// You can use this var for item path, it would be converted into an item on New()
/obj/item/organ/internal/cyberimp/arm/New()
..()
/obj/item/organ/internal/cyberimp/arm/Initialize(mapload)
. = ..()
if(ispath(holder))
holder = new holder(src)
@@ -353,8 +353,8 @@
augment_icon = "toolkit"
do_extra_render = TRUE
/obj/item/organ/internal/cyberimp/arm/flash/New()
..()
/obj/item/organ/internal/cyberimp/arm/flash/Initialize(mapload)
. = ..()
if(locate(/obj/item/flash/armimplant) in items_list)
var/obj/item/flash/armimplant/F = locate(/obj/item/flash/armimplant) in items_list
F.implant = src
@@ -374,8 +374,8 @@
origin_tech = "materials=5;combat=7;biotech=5;powerstorage=5;syndicate=6;programming=5"
stealth_level = 4 //Only surgery or a body scanner with the highest tier of stock parts can detect this.
/obj/item/organ/internal/cyberimp/arm/combat/New()
..()
/obj/item/organ/internal/cyberimp/arm/combat/Initialize(mapload)
. = ..()
if(locate(/obj/item/flash/armimplant) in items_list)
var/obj/item/flash/armimplant/F = locate(/obj/item/flash/armimplant) in items_list
F.implant = src
code/modules/surgery/organs/augments_internal.dm
+1 -1
View File
@@ -8,7 +8,7 @@
tough = TRUE // Immune to damage
augment_state ='icons/mob/human_races/robotic.dmi'
/obj/item/organ/internal/cyberimp/New(mob/M = null)
/obj/item/organ/internal/cyberimp/Initialize(mapload, mob/M = null)
. = ..()
if(implant_overlay)
var/mutable_appearance/overlay = mutable_appearance(icon, implant_overlay)
code/modules/surgery/organs/bone_tumor.dm
+2 -3
View File
@@ -5,8 +5,8 @@
destroy_on_removal = TRUE
var/tumor_size = 0 //Changed in New to be dependent on amount of osseous reagent in the system when formed, determines damage done
/obj/item/organ/internal/bone_tumor/New(mob/living/carbon/holder)
..()
/obj/item/organ/internal/bone_tumor/Initialize(mapload, mob/living/carbon/holder)
. = ..()
tumor_size = owner.reagents.get_reagent_amount("osseous_reagent")
owner.reagents.remove_all_type(/datum/reagent/medicine/osseous_reagent, tumor_size)
@@ -30,4 +30,3 @@
/obj/item/organ/internal/bone_tumor/slime_tumor
name = "crystalized slime jelly"
code/modules/surgery/organs/organ.dm
+2 -2
View File
@@ -58,8 +58,8 @@
/obj/item/organ/proc/update_health()
return
/obj/item/organ/New(mob/living/carbon/holder, datum/species/species_override = null)
..(holder)
/obj/item/organ/Initialize(mapload, mob/living/carbon/holder, datum/species/species_override = null)
. = ..()
if(!max_damage)
max_damage = min_broken_damage * 2
if(ishuman(holder))
code/modules/surgery/organs/organ_external.dm
+2 -2
View File
@@ -119,8 +119,8 @@
return
/obj/item/organ/external/New(mob/living/carbon/holder)
..()
/obj/item/organ/external/Initialize(mapload, mob/living/carbon/holder)
. = ..()
if(ishuman(holder))
var/mob/living/carbon/human/H = holder
icobase = H.dna.species.icobase
code/modules/surgery/organs/organ_internal.dm
+11 -15
View File
@@ -32,24 +32,20 @@
/// Does this organ have augmented skin to apply to the user on install? If so, apply it to the user and remove it.
var/self_augmented_skin_level = 0
/obj/item/organ/internal/New(mob/living/carbon/holder)
..()
/obj/item/organ/internal/Initialize(mapload, mob/living/carbon/holder)
. = ..()
if(organ_datums)
var/list/temp_list = organ_datums.Copy()
organ_datums = list()
for(var/path in temp_list)
var/datum/organ/organ_datum = new path(src)
if(!organ_datum.organ_tag)
stack_trace("There was an organ datum [organ_datum] ([organ_datum.type]), that had no organ tag.")
continue
organ_datums[organ_datum.organ_tag] = organ_datum
if(istype(holder))
insert(holder)
/obj/item/organ/internal/Initialize(mapload)
. = ..()
if(!organ_datums)
return
var/list/temp_list = organ_datums.Copy()
organ_datums = list()
for(var/path in temp_list)
var/datum/organ/organ_datum = new path(src)
if(!organ_datum.organ_tag)
stack_trace("There was an organ datum [organ_datum] ([organ_datum.type]), that had no organ tag.")
continue
organ_datums[organ_datum.organ_tag] = organ_datum
/obj/item/organ/internal/Destroy()
if(owner) // we have to remove BEFORE organ_datums are qdel'd, or we can just live even if our heart organ got deleted
remove(owner, TRUE)
code/modules/surgery/organs/subtypes/machine_organs.dm
+24 -24
View File
@@ -7,8 +7,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/head/ipc/New(mob/living/carbon/holder, datum/species/species_override = null)
..(holder, /datum/species/machine) // IPC heads need to be explicitly set to this since you can print them
/obj/item/organ/external/head/ipc/Initialize(mapload, mob/living/carbon/holder, datum/species/species_override = null)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/chest/ipc
@@ -16,8 +16,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/chest/ipc/New()
..()
/obj/item/organ/external/chest/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/groin/ipc
@@ -25,8 +25,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/groin/ipc/New()
..()
/obj/item/organ/external/groin/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/arm/ipc
@@ -34,8 +34,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/arm/ipc/New()
..()
/obj/item/organ/external/arm/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/arm/right/ipc
@@ -43,8 +43,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/arm/right/ipc/New()
..()
/obj/item/organ/external/arm/right/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/leg/ipc
@@ -52,8 +52,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/leg/ipc/New()
..()
/obj/item/organ/external/leg/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/leg/right/ipc
@@ -61,8 +61,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/leg/right/ipc/New()
..()
/obj/item/organ/external/leg/right/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/foot/ipc
@@ -70,8 +70,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/foot/ipc/New()
..()
/obj/item/organ/external/foot/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/foot/right/ipc
@@ -79,8 +79,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/foot/right/ipc/New()
..()
/obj/item/organ/external/foot/right/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/hand/ipc
@@ -88,8 +88,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/hand/ipc/New()
..()
/obj/item/organ/external/hand/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/external/hand/right/ipc
@@ -97,8 +97,8 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
/obj/item/organ/external/hand/right/ipc/New()
..()
/obj/item/organ/external/hand/right/ipc/Initialize(mapload)
. = ..()
robotize("Morpheus Cyberkinetics")
/obj/item/organ/internal/cell
@@ -130,8 +130,8 @@
/obj/item/organ/internal/brain/mmi_holder/posibrain
name = "positronic brain"
/obj/item/organ/internal/brain/mmi_holder/posibrain/New()
..()
/obj/item/organ/internal/brain/mmi_holder/posibrain/Initialize(mapload)
. = ..()
stored_mmi = new /obj/item/mmi/robotic_brain/positronic(src)
if(!owner)
stored_mmi.forceMove(get_turf(src))