mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-18 10:34:10 +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:
@@ -91,7 +91,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
|
||||
desc = "To be applied to the head repeatedly."
|
||||
icon_state ="bible"
|
||||
|
||||
/obj/item/storage/bible/booze/New()
|
||||
/obj/item/storage/bible/booze/Initialize(mapload)
|
||||
. = ..()
|
||||
starts_with = list(
|
||||
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
|
||||
|
||||
@@ -61,12 +61,12 @@
|
||||
)
|
||||
starts_with = list(/obj/item/reagent_containers/food/snacks/egg = 12)
|
||||
|
||||
/obj/item/storage/fancy/egg_box/New()
|
||||
/obj/item/storage/fancy/egg_box/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]0"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/fancy/egg_box/update_icon()
|
||||
cut_overlays()
|
||||
@@ -263,12 +263,12 @@
|
||||
C.brand = brand
|
||||
C.desc += " This one is \a [brand]."
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/New()
|
||||
/obj/item/storage/fancy/cigarettes/Initialize()
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]_open"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/update_icon()
|
||||
cut_overlays()
|
||||
@@ -410,12 +410,12 @@
|
||||
reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
|
||||
return ..()
|
||||
|
||||
/obj/item/storage/fancy/cigar/New()
|
||||
/obj/item/storage/fancy/cigar/Initialize()
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]0"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/fancy/cigar/update_icon()
|
||||
cut_overlays()
|
||||
|
||||
@@ -4,12 +4,13 @@
|
||||
preserve_item = 1
|
||||
var/obj/item/master_item
|
||||
|
||||
/obj/item/storage/internal/New(obj/item/MI)
|
||||
master_item = MI
|
||||
loc = master_item
|
||||
/obj/item/storage/internal/Initialize(mapload)
|
||||
. = ..()
|
||||
master_item = loc
|
||||
if(!istype(master_item))
|
||||
return INITIALIZE_HINT_QDEL
|
||||
name = master_item.name
|
||||
verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up.
|
||||
..()
|
||||
|
||||
/obj/item/storage/internal/Destroy()
|
||||
master_item = null
|
||||
|
||||
@@ -812,12 +812,12 @@
|
||||
else
|
||||
icon_state = closed_state
|
||||
|
||||
/obj/item/storage/trinketbox/New()
|
||||
/obj/item/storage/trinketbox/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]_open"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/trinketbox/attack_self()
|
||||
open = !open
|
||||
@@ -852,14 +852,15 @@
|
||||
alpha = 200
|
||||
var/datum/weakref/held_item
|
||||
|
||||
/atom/movable/storage_slot/New(newloc, obj/item/held_item)
|
||||
/atom/movable/storage_slot/Initialize(mapload, obj/item/held_item)
|
||||
. = ..()
|
||||
ASSERT(held_item)
|
||||
name += held_item.name
|
||||
src.held_item = WEAKREF(held_item)
|
||||
|
||||
/atom/movable/storage_slot/Destroy()
|
||||
held_item = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/// Has to be this way. The fact that the overlays will be constantly mutated by other storage means we can't wait.
|
||||
/atom/movable/storage_slot/add_overlay(list/somethings)
|
||||
|
||||
@@ -87,8 +87,8 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/storage/wallet/random/New()
|
||||
..()
|
||||
/obj/item/storage/wallet/random/Initialize(mapload)
|
||||
. = ..()
|
||||
var/amount = rand(50, 100) + rand(50, 100) // Triangular distribution from 100 to 200
|
||||
var/obj/item/spacecash/SC = null
|
||||
SC = new(src)
|
||||
@@ -105,9 +105,9 @@
|
||||
desc = "You can recolor it! Fancy! The future is NOW!"
|
||||
icon_state = "wallet-white"
|
||||
|
||||
/obj/item/storage/wallet/poly/New()
|
||||
..()
|
||||
verbs |= /obj/item/storage/wallet/poly/proc/change_color
|
||||
/obj/item/storage/wallet/poly/Initialize(mapload)
|
||||
. = ..()
|
||||
verbs += /obj/item/storage/wallet/poly/proc/change_color
|
||||
color = get_random_colour()
|
||||
update_icon()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user