mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 12:08:28 +01:00
Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"
This commit is contained in:
@@ -215,8 +215,8 @@
|
||||
desc = "A frame for the beehive that the bees have filled with honeycombs."
|
||||
honey = 20
|
||||
|
||||
/obj/item/honey_frame/filled/Initialize()
|
||||
. = ..()
|
||||
/obj/item/honey_frame/filled/New()
|
||||
..()
|
||||
add_overlay("honeycomb")
|
||||
|
||||
/obj/item/beehive_assembly
|
||||
@@ -267,8 +267,8 @@ var/global/list/datum/stack_recipe/wax_recipes = list( \
|
||||
icon_state = "beepack"
|
||||
var/full = 1
|
||||
|
||||
/obj/item/bee_pack/Initialize()
|
||||
. = ..()
|
||||
/obj/item/bee_pack/New()
|
||||
..()
|
||||
add_overlay("beepack-full")
|
||||
|
||||
/obj/item/bee_pack/proc/empty()
|
||||
|
||||
@@ -66,11 +66,6 @@
|
||||
if(!seed)
|
||||
return
|
||||
|
||||
if(!SSplants)
|
||||
testing("<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
if(SSplants.product_descs["[seed.uid]"])
|
||||
desc = SSplants.product_descs["[seed.uid]"]
|
||||
else
|
||||
@@ -380,11 +375,12 @@
|
||||
|
||||
var/list/fruit_icon_cache = list()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/fruit_slice/Initialize(var/ml, var/datum/seed/S)
|
||||
. = ..(ml)
|
||||
/obj/item/weapon/reagent_containers/food/snacks/fruit_slice/New(var/newloc, var/datum/seed/S)
|
||||
..(newloc)
|
||||
// Need to go through and make a general image caching controller. Todo.
|
||||
if(!istype(S))
|
||||
return INITIALIZE_HINT_QDEL
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
name = "[S.seed_name] slice"
|
||||
desc = "A slice of \a [S.seed_name]. Tasty, probably."
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
var/list/genes = list()
|
||||
var/genesource = "unknown"
|
||||
|
||||
/obj/item/weapon/disk/botany/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/disk/botany/New()
|
||||
..()
|
||||
pixel_x = rand(-5,5)
|
||||
pixel_y = rand(-5,5)
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
name = "flora disk box"
|
||||
desc = "A box of flora data disks, apparently."
|
||||
|
||||
/obj/item/weapon/storage/box/botanydisk/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/storage/box/botanydisk/New()
|
||||
..()
|
||||
for(var/i = 0;i<7;i++)
|
||||
new /obj/item/weapon/disk/botany(src)
|
||||
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
var/lockdown = 0
|
||||
var/datum/wires/seedstorage/wires = null
|
||||
|
||||
/obj/machinery/seed_storage/Initialize()
|
||||
. = ..()
|
||||
/obj/machinery/seed_storage/New()
|
||||
..()
|
||||
wires = new(src)
|
||||
if(!contraband_seeds.len)
|
||||
contraband_seeds = pick( /// Some form of ambrosia in all lists.
|
||||
|
||||
@@ -76,22 +76,24 @@
|
||||
/obj/effect/plant/single
|
||||
spread_chance = 0
|
||||
|
||||
/obj/effect/plant/Initialize(var/ml, var/datum/seed/newseed, var/obj/effect/plant/newparent)
|
||||
. = ..(ml)
|
||||
|
||||
/obj/effect/plant/New(var/newloc, var/datum/seed/newseed, var/obj/effect/plant/newparent)
|
||||
//VOREStation Edit Start
|
||||
if(istype(loc, /turf/simulated/open))
|
||||
qdel(src)
|
||||
//VOREStation Edit End
|
||||
..()
|
||||
|
||||
if(!newparent)
|
||||
parent = src
|
||||
else
|
||||
parent = newparent
|
||||
|
||||
if(!SSplants)
|
||||
sleep(250) // ugly hack, should mean roundstart plants are fine. TODO initialize perhaps?
|
||||
if(!SSplants)
|
||||
to_world("<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
|
||||
return INITIALIZE_HINT_QDEL
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
if(!istype(newseed))
|
||||
newseed = SSplants.seeds[DEFAULT_SEED]
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/machinery/portable_atmospherics/hydroponics/soil/Initialize()
|
||||
. = ..()
|
||||
/obj/machinery/portable_atmospherics/hydroponics/soil/New()
|
||||
..()
|
||||
verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb
|
||||
verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/remove_label
|
||||
verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/setlight
|
||||
@@ -50,13 +50,12 @@
|
||||
icon = 'icons/obj/seeds.dmi'
|
||||
icon_state = "blank"
|
||||
|
||||
/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/Initialize(var/ml, var/datum/seed/newseed)
|
||||
. = ..(ml)
|
||||
/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/New(var/newloc,var/datum/seed/newseed)
|
||||
//VOREStation Addition Start
|
||||
if(istype(loc, /turf/simulated/open) || istype(loc, /turf/space))
|
||||
qdel(src)
|
||||
//VOREStation Addition End
|
||||
|
||||
..()
|
||||
seed = newseed
|
||||
dead = 0
|
||||
age = 1
|
||||
|
||||
Reference in New Issue
Block a user