mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] next new to init (#10524)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
9156a08bf0
commit
55d696e503
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user