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

Removes the need for ComponentInitialize (#18833)

Browse Source 
* removes `ComponentInitialize`

* mapload

* add back CRASH
This commit is contained in:
SteelSlayer
2022-08-18 22:00:19 +01:00
committed by GitHub
parent 170a6d4ea3
commit 358ff86ddb
22 changed files with 33 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/explorer_gear.dm
+1 -7
View File
@@ -58,15 +58,12 @@
/obj/item/clothing/suit/space/hostile_environment/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
AddComponent(/datum/component/spraycan_paintable)
/obj/item/clothing/suit/space/hostile_environment/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/clothing/suit/space/hostile_environment/ComponentInitialize()
..()
AddComponent(/datum/component/spraycan_paintable)
/obj/item/clothing/suit/space/hostile_environment/process()
var/mob/living/carbon/C = loc
if(istype(C) && prob(2)) //cursed by bubblegum
@@ -88,9 +85,6 @@
/obj/item/clothing/head/helmet/space/hostile_environment/Initialize(mapload)
. = ..()
update_icon()
/obj/item/clothing/head/helmet/space/hostile_environment/ComponentInitialize()
..()
AddComponent(/datum/component/spraycan_paintable)
/obj/item/clothing/head/helmet/space/hostile_environment/update_overlays()
code/modules/mining/machine_redemption.dm
+1 -3
View File
@@ -55,12 +55,10 @@
/// The currently inserted design disk.
var/obj/item/disk/design_disk/inserted_disk
/obj/machinery/mineral/ore_redemption/ComponentInitialize()
..()
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, FALSE, /obj/item/stack, null, CALLBACK(src, .proc/on_material_insert))
/obj/machinery/mineral/ore_redemption/Initialize(mapload)
. = ..()
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, FALSE, /obj/item/stack, null, CALLBACK(src, .proc/on_material_insert))
ore_buffer = list()
files = new /datum/research/smelter(src)
// Stock parts
code/modules/mining/mint.dm
+2 -2
View File
@@ -14,8 +14,8 @@
speed_process = TRUE
/obj/machinery/mineral/mint/ComponentInitialize()
..()
/obj/machinery/mineral/mint/Initialize(mapload)
. = ..()
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM, MAT_TRANQUILLITE), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack)
/obj/machinery/mineral/mint/process()