cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

More New() -> Initialize() for /obj/structure (#15158)

Browse Source 
* More New() -> Initialize() for /obj/structure

* Updates these

* Tweaks + Fixes
This commit is contained in:
AffectedArc07
2020-12-29 10:42:39 -05:00
committed by GitHub
parent 3f80ce3076
commit 43ee2488c7
41 changed files with 221 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/flora.dm
+51 -55
View File
@@ -15,8 +15,8 @@
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_1"
/obj/structure/flora/tree/pine/New()
..()
/obj/structure/flora/tree/pine/Initialize(mapload)
. = ..()
icon_state = "pine_[rand(1, 3)]"
/obj/structure/flora/tree/pine/xmas
@@ -24,24 +24,20 @@
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_c"
/obj/structure/flora/tree/pine/xmas/New()
..()
icon_state = "pine_c"
/obj/structure/flora/tree/dead
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree_1"
/obj/structure/flora/tree/dead/New()
..()
/obj/structure/flora/tree/dead/Initialize(mapload)
. = ..()
icon_state = "tree_[rand(1, 6)]"
/obj/structure/flora/tree/palm
icon = 'icons/misc/beach2.dmi'
icon_state = "palm1"
/obj/structure/flora/tree/palm/New()
..()
/obj/structure/flora/tree/palm/Initialize(mapload)
. = ..()
icon_state = pick("palm1","palm2")
pixel_x = 0
@@ -55,23 +51,23 @@
/obj/structure/flora/grass/brown
icon_state = "snowgrass1bb"
/obj/structure/flora/grass/brown/New()
..()
/obj/structure/flora/grass/brown/Initialize(mapload)
. = ..()
icon_state = "snowgrass[rand(1, 3)]bb"
/obj/structure/flora/grass/green
icon_state = "snowgrass1gb"
/obj/structure/flora/grass/green/New()
..()
/obj/structure/flora/grass/green/Initialize(mapload)
. = ..()
icon_state = "snowgrass[rand(1, 3)]gb"
/obj/structure/flora/grass/both
icon_state = "snowgrassall1"
/obj/structure/flora/grass/both/New()
..()
/obj/structure/flora/grass/both/Initialize(mapload)
. = ..()
icon_state = "snowgrassall[rand(1, 3)]"
@@ -83,8 +79,8 @@
anchored = 1
max_integrity = 15
/obj/structure/flora/bush/New()
..()
/obj/structure/flora/bush/Initialize(mapload)
. = ..()
icon_state = "snowbush[rand(1, 6)]"
//newbushes
@@ -96,113 +92,113 @@
anchored = 1
max_integrity = 15
/obj/structure/flora/ausbushes/New()
..()
/obj/structure/flora/ausbushes/Initialize(mapload)
. = ..()
icon_state = "firstbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/reedbush
icon_state = "reedbush_1"
/obj/structure/flora/ausbushes/reedbush/New()
..()
/obj/structure/flora/ausbushes/reedbush/Initialize(mapload)
. = ..()
icon_state = "reedbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/leafybush
icon_state = "leafybush_1"
/obj/structure/flora/ausbushes/leafybush/New()
..()
/obj/structure/flora/ausbushes/leafybush/Initialize(mapload)
. = ..()
icon_state = "leafybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/palebush
icon_state = "palebush_1"
/obj/structure/flora/ausbushes/palebush/New()
..()
/obj/structure/flora/ausbushes/palebush/Initialize(mapload)
. = ..()
icon_state = "palebush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/stalkybush
icon_state = "stalkybush_1"
/obj/structure/flora/ausbushes/stalkybush/New()
..()
/obj/structure/flora/ausbushes/stalkybush/Initialize(mapload)
. = ..()
icon_state = "stalkybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/grassybush
icon_state = "grassybush_1"
/obj/structure/flora/ausbushes/grassybush/New()
..()
/obj/structure/flora/ausbushes/grassybush/Initialize(mapload)
. = ..()
icon_state = "grassybush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/fernybush
icon_state = "fernybush_1"
/obj/structure/flora/ausbushes/fernybush/New()
..()
/obj/structure/flora/ausbushes/fernybush/Initialize(mapload)
. = ..()
icon_state = "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)
. = ..()
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)
. = ..()
icon_state = "genericbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/pointybush
icon_state = "pointybush_1"
/obj/structure/flora/ausbushes/pointybush/New()
..()
/obj/structure/flora/ausbushes/pointybush/Initialize(mapload)
. = ..()
icon_state = "pointybush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/lavendergrass
icon_state = "lavendergrass_1"
/obj/structure/flora/ausbushes/lavendergrass/New()
..()
/obj/structure/flora/ausbushes/lavendergrass/Initialize(mapload)
. = ..()
icon_state = "lavendergrass_[rand(1, 4)]"
/obj/structure/flora/ausbushes/ywflowers
icon_state = "ywflowers_1"
/obj/structure/flora/ausbushes/ywflowers/New()
..()
/obj/structure/flora/ausbushes/ywflowers/Initialize(mapload)
. = ..()
icon_state = "ywflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/brflowers
icon_state = "brflowers_1"
/obj/structure/flora/ausbushes/brflowers/New()
..()
/obj/structure/flora/ausbushes/brflowers/Initialize(mapload)
. = ..()
icon_state = "brflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/ppflowers
icon_state = "ppflowers_1"
/obj/structure/flora/ausbushes/ppflowers/New()
..()
/obj/structure/flora/ausbushes/ppflowers/Initialize(mapload)
. = ..()
icon_state = "ppflowers_[rand(1, 4)]"
/obj/structure/flora/ausbushes/sparsegrass
icon_state = "sparsegrass_1"
/obj/structure/flora/ausbushes/sparsegrass/New()
..()
/obj/structure/flora/ausbushes/sparsegrass/Initialize(mapload)
. = ..()
icon_state = "sparsegrass_[rand(1, 3)]"
/obj/structure/flora/ausbushes/fullgrass
icon_state = "fullgrass_1"
/obj/structure/flora/ausbushes/fullgrass/New()
..()
/obj/structure/flora/ausbushes/fullgrass/Initialize(mapload)
. = ..()
icon_state = "fullgrass_[rand(1, 3)]"
@@ -250,8 +246,8 @@
resistance_flags = FIRE_PROOF
anchored = 1
/obj/structure/flora/rock/New()
..()
/obj/structure/flora/rock/Initialize(mapload)
. = ..()
icon_state = "rock[rand(1,5)]"
/obj/structure/flora/rock/pile
@@ -259,8 +255,8 @@
desc = "some rocks"
icon_state = "rockpile1"
/obj/structure/flora/rock/pile/New()
..()
/obj/structure/flora/rock/pile/Initialize(mapload)
. = ..()
icon_state = "rockpile[rand(1,5)]"
/obj/structure/flora/rock/icy
@@ -308,7 +304,7 @@
var/indestructable = 0
var/stump = 0
/obj/structure/bush/New()
/obj/structure/bush/Initialize(mapload)
. = ..()
if(prob(20))
opacity = 1