cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 15:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

next new to init (#17400)

Browse Source 
* next new to init

* .

* this needs thorough testing

* .

* needs an istype

* also vnotice

* mvoe to defines
This commit is contained in:
Kashargul
2025-03-24 06:18:39 -04:00
committed by GitHub
parent 8a4ac36d15
commit d3b7ba8b43
141 changed files with 529 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/fusion/fuel_assembly/fuel_assembly.dm
+10 -13
View File
@@ -12,13 +12,10 @@
var/radioactivity = 0
var/const/initial_amount = 3000000
/obj/item/fuel_assembly/New(var/newloc, var/_material, var/_colour)
/obj/item/fuel_assembly/Initialize(mapload, var/_material, var/_colour)
. = ..()
fuel_type = _material
fuel_colour = _colour
..(newloc)
/obj/item/fuel_assembly/Initialize(mapload)
. = ..()
var/datum/material/material = get_material_by_name(fuel_type)
if(istype(material))
name = "[material.use_name] fuel rod assembly"
@@ -53,14 +50,14 @@
return ..()
// Mapper shorthand.
/obj/item/fuel_assembly/deuterium/New(var/newloc)
..(newloc, MAT_DEUTERIUM)
/obj/item/fuel_assembly/deuterium/Initialize(mapload)
. = ..(mapload, MAT_DEUTERIUM)
/obj/item/fuel_assembly/tritium/New(var/newloc)
..(newloc, MAT_TRITIUM)
/obj/item/fuel_assembly/tritium/Initialize(mapload)
. = ..(mapload, MAT_TRITIUM)
/obj/item/fuel_assembly/phoron/New(var/newloc)
..(newloc, MAT_PHORON)
/obj/item/fuel_assembly/phoron/Initialize(mapload)
. = ..(mapload, MAT_PHORON)
/obj/item/fuel_assembly/supermatter/New(var/newloc)
..(newloc, MAT_SUPERMATTER)
/obj/item/fuel_assembly/supermatter/Initialize(mapload)
. = ..(mapload, MAT_SUPERMATTER)
code/modules/power/lighting.dm
+2 -2
View File
@@ -1076,8 +1076,8 @@ var/global/list/light_type_cache = list()
desc = "A broken [name]."
/obj/item/light/New(atom/newloc, obj/machinery/light/fixture = null)
..()
/obj/item/light/Initialize(mapload, obj/machinery/light/fixture = null)
. = ..()
if(fixture)
status = fixture.status
rigged = fixture.rigged
code/modules/power/supermatter/supermatter.dm
+2 -2
View File
@@ -540,10 +540,10 @@
icon = 'icons/obj/supermatter.dmi'
icon_state = "darkmatter_broken"
/obj/item/broken_sm/New()
/obj/item/broken_sm/Initialize(mapload)
. = ..()
message_admins("Broken SM shard created at ([x],[y],[z] - <A href='byond://?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
START_PROCESSING(SSobj, src)
return ..()
/obj/item/broken_sm/process()
SSradiation.radiate(src, 50)