cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

next new to init (#17400)

Browse Source 
* next new to init

* .

* this needs thorough testing

* .

* needs an istype

* also vnotice

* mvoe to defines
This commit is contained in:
Kashargul
2025-03-24 06:18:39 -04:00
committed by GitHub
parent 8a4ac36d15
commit d3b7ba8b43
141 changed files with 529 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/flora/flora.dm
+37 -47
View File
@@ -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"
code/game/objects/structures/flora/flora_vr.dm
+3 -2
View File
@@ -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"
code/game/objects/structures/flora/grass.dm
+10 -9
View File
@@ -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)]")