mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-16 09:34:52 +01:00
some more new to init (#17231)
* some more new to init * rigs * rigs * intellisense moment * telcoms and landmarks * fix that as well * some more minor things * re add missing message * fix trash eating...
This commit is contained in:
@@ -27,14 +27,13 @@
|
||||
var/datum/material/material
|
||||
var/drops_debris = 1
|
||||
|
||||
/obj/item/material/New(var/newloc, var/material_key)
|
||||
..(newloc)
|
||||
/obj/item/material/Initialize(mapload, var/material_key)
|
||||
. = ..()
|
||||
if(!material_key)
|
||||
material_key = default_material
|
||||
set_material(material_key)
|
||||
if(!material)
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
matter = material.get_matter()
|
||||
if(matter.len)
|
||||
|
||||
@@ -143,8 +143,8 @@
|
||||
return
|
||||
|
||||
// Preset types - left here for the code that uses them
|
||||
/obj/item/material/shard/shrapnel/New(loc)
|
||||
..(loc, MAT_STEEL)
|
||||
/obj/item/material/shard/shrapnel/Initialize(mapload)
|
||||
. = ..(mapload, MAT_STEEL)
|
||||
|
||||
/obj/item/material/shard/phoron/New(loc)
|
||||
..(loc, MAT_PGLASS)
|
||||
/obj/item/material/shard/phoron/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PGLASS)
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
sharp = TRUE
|
||||
edge = TRUE
|
||||
|
||||
/obj/item/material/star/New()
|
||||
..()
|
||||
src.pixel_x = rand(-12, 12)
|
||||
src.pixel_y = rand(-12, 12)
|
||||
/obj/item/material/star/Initialize(mapload)
|
||||
. = ..()
|
||||
pixel_x = rand(-12, 12)
|
||||
pixel_y = rand(-12, 12)
|
||||
|
||||
/obj/item/material/star/throw_impact(atom/hit_atom)
|
||||
..()
|
||||
|
||||
@@ -56,8 +56,8 @@
|
||||
throwforce = round(force*thrown_force_divisor)
|
||||
//to_world("[src] has unwielded force [force_unwielded], wielded force [force_wielded] and throwforce [throwforce] when made from default material [material.name]")
|
||||
|
||||
/obj/item/material/twohanded/New()
|
||||
..()
|
||||
/obj/item/material/twohanded/Initialize(mapload)
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
//Allow a small chance of parrying melee attacks when wielded - maybe generalize this to other weapons someday
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
. = ..()
|
||||
. += "There [uses == 1 ? "is" : "are"] [uses] [material] [uses == 1 ? src.material.sheet_singular_name : src.material.sheet_plural_name] left for use."
|
||||
|
||||
/obj/item/material/sharpeningkit/New()
|
||||
/obj/item/material/sharpeningkit/Initialize(mapload)
|
||||
. = ..()
|
||||
setrepair()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user