mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-19 19:15:11 +01:00
next new to init (#17400)
* next new to init * . * this needs thorough testing * . * needs an istype * also vnotice * mvoe to defines
This commit is contained in:
@@ -13,26 +13,25 @@
|
||||
var/set_temperature = T0C + 30 //K
|
||||
var/heating_power = 80000
|
||||
|
||||
/obj/structure/bonfire/New(newloc, material_name)
|
||||
..(newloc)
|
||||
/obj/structure/bonfire/Initialize(mapload, material_name)
|
||||
. = ..()
|
||||
if(!material_name)
|
||||
material_name = MAT_WOOD
|
||||
material = get_material_by_name("[material_name]")
|
||||
if(!material)
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
color = material.icon_colour
|
||||
|
||||
// Blue wood.
|
||||
/obj/structure/bonfire/sifwood/New(newloc, material_name)
|
||||
..(newloc, MAT_SIFWOOD)
|
||||
/obj/structure/bonfire/sifwood/Initialize(mapload, material_name)
|
||||
. = ..(mapload, MAT_SIFWOOD)
|
||||
|
||||
/obj/structure/bonfire/permanent/New(newloc, material_name)
|
||||
..()
|
||||
/obj/structure/bonfire/permanent/Initialize(mapload, material_name)
|
||||
. = ..()
|
||||
ignite()
|
||||
|
||||
/obj/structure/bonfire/permanent/sifwood/New(newloc, material_name)
|
||||
..(newloc, MAT_SIFWOOD)
|
||||
/obj/structure/bonfire/permanent/sifwood/Initialize(mapload, material_name)
|
||||
. = ..(mapload, MAT_SIFWOOD)
|
||||
|
||||
/obj/structure/bonfire/attackby(obj/item/W, mob/user)
|
||||
if(istype(W, /obj/item/stack/rods) && !can_buckle && !grill)
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
starts_with += /obj/item/storage/toolbox/emergency
|
||||
return ..()
|
||||
|
||||
/obj/structure/closet/hydrant/New()
|
||||
/obj/structure/closet/hydrant/Initialize(mapload)
|
||||
starts_with += /obj/item/storage/toolbox/emergency
|
||||
return ..()
|
||||
|
||||
@@ -14,7 +14,8 @@
|
||||
var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead.
|
||||
var/created_name = null
|
||||
|
||||
/obj/structure/door_assembly/New()
|
||||
/obj/structure/door_assembly/Initialize(mapload)
|
||||
. = ..()
|
||||
update_state()
|
||||
|
||||
/obj/structure/door_assembly/door_assembly_com
|
||||
@@ -136,14 +137,14 @@
|
||||
airlock_type = "/multi_tile/glass"
|
||||
glass = -1 //To prevent bugs in deconstruction process.
|
||||
|
||||
/obj/structure/door_assembly/multi_tile/New()
|
||||
/obj/structure/door_assembly/multi_tile/Initialize(mapload)
|
||||
if(dir in list(EAST, WEST))
|
||||
bound_width = width * world.icon_size
|
||||
bound_height = world.icon_size
|
||||
else
|
||||
bound_width = world.icon_size
|
||||
bound_height = width * world.icon_size
|
||||
update_state()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/door_assembly/multi_tile/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
. = ..()
|
||||
|
||||
@@ -103,8 +103,8 @@
|
||||
harvest_loot = list(/obj/item/stack/material/fiber = 1)
|
||||
max_harvests = 1
|
||||
|
||||
/obj/structure/flora/bush/New()
|
||||
..()
|
||||
/obj/structure/flora/bush/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = "snowbush[rand(1, 6)]"
|
||||
|
||||
/obj/structure/flora/pottedplant
|
||||
@@ -152,114 +152,104 @@
|
||||
var/choice = pickweight(possibleseeds)
|
||||
new choice(get_turf(user))
|
||||
|
||||
/obj/structure/flora/ausbushes/New()
|
||||
..()
|
||||
/obj/structure/flora/ausbushes/Initialize(mapload, var/bush_icon)
|
||||
. = ..()
|
||||
if(bush_icon)
|
||||
icon_state = bush_icon
|
||||
return
|
||||
icon_state = "firstbush_[rand(1, 4)]"
|
||||
|
||||
/obj/structure/flora/ausbushes/reedbush
|
||||
icon_state = "reedbush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/reedbush/New()
|
||||
..()
|
||||
icon_state = "reedbush_[rand(1, 4)]"
|
||||
/obj/structure/flora/ausbushes/reedbush/Initialize(mapload)
|
||||
. = ..(mapload, "reedbush_[rand(1, 4)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/leafybush
|
||||
icon_state = "leafybush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/leafybush/New()
|
||||
..()
|
||||
icon_state = "leafybush_[rand(1, 3)]"
|
||||
/obj/structure/flora/ausbushes/leafybush/Initialize(mapload)
|
||||
. = ..(mapload, "leafybush_[rand(1, 3)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/palebush
|
||||
icon_state = "palebush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/palebush/New()
|
||||
..()
|
||||
icon_state = "palebush_[rand(1, 4)]"
|
||||
/obj/structure/flora/ausbushes/palebush/Initialize(mapload)
|
||||
. = ..(mapload, "palebush_[rand(1, 4)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/stalkybush
|
||||
icon_state = "stalkybush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/stalkybush/New()
|
||||
..()
|
||||
icon_state = "stalkybush_[rand(1, 3)]"
|
||||
/obj/structure/flora/ausbushes/stalkybush/Initialize(mapload)
|
||||
. = ..(mapload, "stalkybush_[rand(1, 3)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/grassybush
|
||||
icon_state = "grassybush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/grassybush/New()
|
||||
..()
|
||||
icon_state = "grassybush_[rand(1, 4)]"
|
||||
/obj/structure/flora/ausbushes/grassybush/Initialize(mapload)
|
||||
. = ..(mapload, "grassybush_[rand(1, 4)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/fernybush
|
||||
icon_state = "fernybush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/fernybush/New()
|
||||
..()
|
||||
icon_state = "fernybush_[rand(1, 3)]"
|
||||
/obj/structure/flora/ausbushes/fernybush/Initialize(mapload)
|
||||
. = ..(mapload, "fernybush_[rand(1, 3)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/sunnybush
|
||||
icon_state = "sunnybush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/sunnybush/New()
|
||||
..()
|
||||
/obj/structure/flora/ausbushes/sunnybush/Initialize(mapload)
|
||||
. = ..(mapload, )
|
||||
icon_state = "sunnybush_[rand(1, 3)]"
|
||||
|
||||
/obj/structure/flora/ausbushes/genericbush
|
||||
icon_state = "genericbush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/genericbush/New()
|
||||
..()
|
||||
/obj/structure/flora/ausbushes/genericbush/Initialize(mapload)
|
||||
. = ..(mapload, )
|
||||
icon_state = "genericbush_[rand(1, 4)]"
|
||||
|
||||
/obj/structure/flora/ausbushes/pointybush
|
||||
icon_state = "pointybush_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/pointybush/New()
|
||||
..()
|
||||
icon_state = "pointybush_[rand(1, 4)]"
|
||||
/obj/structure/flora/ausbushes/pointybush/Initialize(mapload)
|
||||
. = ..(mapload, "pointybush_[rand(1, 4)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/lavendergrass
|
||||
icon_state = "lavendergrass_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/lavendergrass/New()
|
||||
..()
|
||||
icon_state = "lavendergrass_[rand(1, 4)]"
|
||||
/obj/structure/flora/ausbushes/lavendergrass/Initialize(mapload)
|
||||
. = ..(mapload, "lavendergrass_[rand(1, 4)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/ywflowers
|
||||
icon_state = "ywflowers_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/ywflowers/New()
|
||||
..()
|
||||
icon_state = "ywflowers_[rand(1, 3)]"
|
||||
/obj/structure/flora/ausbushes/ywflowers/Initialize(mapload)
|
||||
. = ..(mapload, "ywflowers_[rand(1, 3)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/brflowers
|
||||
icon_state = "brflowers_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/brflowers/New()
|
||||
..()
|
||||
icon_state = "brflowers_[rand(1, 3)]"
|
||||
/obj/structure/flora/ausbushes/brflowers/Initialize(mapload)
|
||||
. = ..(mapload, "brflowers_[rand(1, 3)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/ppflowers
|
||||
icon_state = "ppflowers_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/ppflowers/New()
|
||||
..()
|
||||
icon_state = "ppflowers_[rand(1, 3)]"
|
||||
/obj/structure/flora/ausbushes/ppflowers/Initialize(mapload)
|
||||
. = ..(mapload, "ppflowers_[rand(1, 3)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/sparsegrass
|
||||
icon_state = "sparsegrass_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/sparsegrass/New()
|
||||
..()
|
||||
icon_state = "sparsegrass_[rand(1, 3)]"
|
||||
/obj/structure/flora/ausbushes/sparsegrass/Initialize(mapload)
|
||||
. = ..(mapload, "sparsegrass_[rand(1, 3)]")
|
||||
|
||||
/obj/structure/flora/ausbushes/fullgrass
|
||||
icon_state = "fullgrass_1"
|
||||
|
||||
/obj/structure/flora/ausbushes/fullgrass/New()
|
||||
..()
|
||||
icon_state = "fullgrass_[rand(1, 3)]"
|
||||
/obj/structure/flora/ausbushes/fullgrass/Initialize(mapload)
|
||||
. = ..(mapload, "fullgrass_[rand(1, 3)]")
|
||||
|
||||
/obj/structure/flora/skeleton
|
||||
name = "hanging skeleton model"
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
icon = 'icons/obj/flora/pumpkins.dmi'
|
||||
icon_state = "spawner-jackolantern"
|
||||
|
||||
/obj/effect/landmark/carved_pumpkin_spawn/New()
|
||||
/obj/effect/landmark/carved_pumpkin_spawn/Initialize(mapload)
|
||||
..()
|
||||
var/new_pumpkin = pick(
|
||||
prob(70);/obj/structure/flora/pumpkin,
|
||||
prob(60);/obj/structure/flora/pumpkin/carved,
|
||||
@@ -18,7 +19,7 @@
|
||||
prob(30);/obj/structure/flora/pumpkin/carved/girly,
|
||||
prob(10);/obj/structure/flora/pumpkin/carved/owo)
|
||||
new new_pumpkin(src.loc)
|
||||
..()
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/structure/flora/pumpkin/carved
|
||||
name = "jack o'lantern"
|
||||
|
||||
@@ -4,23 +4,24 @@
|
||||
icon = 'icons/obj/flora/snowflora.dmi'
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/flora/grass/Initialize(mapload, var/grass_icon)
|
||||
. = ..()
|
||||
icon_state = grass_icon
|
||||
|
||||
/obj/structure/flora/grass/brown
|
||||
icon_state = "snowgrass1bb"
|
||||
|
||||
/obj/structure/flora/grass/brown/New()
|
||||
..()
|
||||
icon_state = "snowgrass[rand(1, 3)]bb"
|
||||
/obj/structure/flora/grass/brown/Initialize(mapload)
|
||||
. = ..(mapload, "snowgrass[rand(1, 3)]bb")
|
||||
|
||||
/obj/structure/flora/grass/green
|
||||
icon_state = "snowgrass1gb"
|
||||
|
||||
/obj/structure/flora/grass/green/New()
|
||||
..()
|
||||
icon_state = "snowgrass[rand(1, 3)]gb"
|
||||
/obj/structure/flora/grass/green/Initialize(mapload)
|
||||
. = ..(mapload, "snowgrass[rand(1, 3)]gb")
|
||||
|
||||
/obj/structure/flora/grass/both
|
||||
icon_state = "snowgrassall1"
|
||||
|
||||
/obj/structure/flora/grass/both/New()
|
||||
..()
|
||||
icon_state = "snowgrassall[rand(1, 3)]"
|
||||
/obj/structure/flora/grass/both/Initialize(mapload)
|
||||
. = ..(mapload, "snowgrassall[rand(1, 3)]")
|
||||
|
||||
@@ -225,8 +225,8 @@
|
||||
icon_state = "grille-b"
|
||||
density = FALSE
|
||||
|
||||
/obj/structure/grille/broken/New()
|
||||
..()
|
||||
/obj/structure/grille/broken/Initialize(mapload)
|
||||
. = ..()
|
||||
health = rand(-5, -1) //In the destroyed but not utterly threshold.
|
||||
healthcheck() //Send this to healthcheck just in case we want to do something else with it.
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
var/health = 50.0
|
||||
|
||||
|
||||
/obj/structure/inflatable/New(location)
|
||||
..()
|
||||
/obj/structure/inflatable/Initialize(mapload)
|
||||
. = ..()
|
||||
update_nearby_tiles(need_rebuild=1)
|
||||
|
||||
/obj/structure/inflatable/Destroy()
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
var/list/transfer_amounts = list(REM, 1, 2)
|
||||
var/transfer_amount = 1
|
||||
|
||||
/obj/structure/medical_stand/New()
|
||||
..()
|
||||
/obj/structure/medical_stand/Initialize(mapload)
|
||||
. = ..()
|
||||
if (spawn_type)
|
||||
tank = new spawn_type (src)
|
||||
contained = new mask_type (src)
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
|
||||
GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket)
|
||||
|
||||
/obj/structure/mopbucket/New()
|
||||
/obj/structure/mopbucket/Initialize(mapload, ...)
|
||||
create_reagents(300)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/mopbucket/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -60,7 +60,8 @@
|
||||
layer = ABOVE_WINDOW_LAYER
|
||||
interaction_message = span_notice("Cool to touch and unbelievable smooth. You can almost see your reflection in it.")
|
||||
|
||||
/obj/structure/prop/statue/phoron/New()
|
||||
/obj/structure/prop/statue/phoron/Initialize(mapload)
|
||||
. = ..()
|
||||
set_light(2, 3, "#cc66ff")
|
||||
|
||||
/obj/structure/prop/statue/pillar
|
||||
|
||||
@@ -78,20 +78,19 @@
|
||||
|
||||
|
||||
|
||||
/obj/structure/transit_tube_pod/New(loc)
|
||||
..(loc)
|
||||
/obj/structure/transit_tube_pod/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
air_contents.adjust_multi(GAS_O2, MOLES_O2STANDARD * 2, GAS_N2, MOLES_N2STANDARD)
|
||||
air_contents.temperature = T20C
|
||||
|
||||
// Give auto tubes time to align before trying to start moving
|
||||
spawn(5)
|
||||
follow_tube()
|
||||
follow_tube()
|
||||
|
||||
|
||||
|
||||
/obj/structure/transit_tube/New(loc)
|
||||
..(loc)
|
||||
/obj/structure/transit_tube/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
if(tube_dirs == null)
|
||||
init_dirs()
|
||||
@@ -107,12 +106,6 @@
|
||||
AM.loc = src.loc
|
||||
to_chat(AM, span_info("You slip under the tube."))
|
||||
|
||||
|
||||
/obj/structure/transit_tube/station/New(loc)
|
||||
..(loc)
|
||||
|
||||
|
||||
|
||||
/obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj)
|
||||
if(!pod_moving && icon_state == "open" && istype(AM, /mob))
|
||||
for(var/obj/structure/transit_tube_pod/pod in loc)
|
||||
|
||||
@@ -357,8 +357,8 @@
|
||||
destructible = 1
|
||||
spawn_delay = 1 HOUR
|
||||
|
||||
/obj/structure/mob_spawner/mouse_nest/New()
|
||||
..()
|
||||
/obj/structure/mob_spawner/mouse_nest/Initialize(mapload)
|
||||
. = ..()
|
||||
last_spawn = rand(world.time - spawn_delay, world.time)
|
||||
icon_state = pick(
|
||||
"pile1",
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
var/w_items = 0 //the combined w_class of all the items in the cistern
|
||||
var/mob/living/swirlie = null //the mob being given a swirlie
|
||||
|
||||
/obj/structure/toilet/New()
|
||||
/obj/structure/toilet/Initialize(mapload)
|
||||
. = ..()
|
||||
open = round(rand(0, 1))
|
||||
update_icon()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user