Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/game/turfs/auto_turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@
/turf/open/auto_turf/shale/layer1
icon_state = "shale_1"
bleed_layer = 1
weedable = SEMI_WEEDABLE

/turf/open/auto_turf/shale/layer2
icon_state = "shale_2"
bleed_layer = 2
weedable = SEMI_WEEDABLE
12 changes: 3 additions & 9 deletions code/game/turfs/floor_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,7 @@

/turf/open/floor/plating/almayer/no_build
allow_construction = FALSE

/turf/open/floor/plating/almayer/no_build/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

/turf/open/floor/plating/airless
icon_state = "plating"
Expand Down Expand Up @@ -1886,9 +1884,7 @@
desc = "There seems to be an awful lot of machinery down below..."
icon = 'icons/turf/floors/floors.dmi'
icon_state = "black"

/turf/open/floor/almayer/empty/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

/turf/open/floor/almayer/empty/ex_act(severity) //Should make it indestructible
return
Expand Down Expand Up @@ -2152,9 +2148,7 @@
name = "hull"
turf_flags = TURF_HULL
allow_construction = FALSE

/turf/open/floor/almayer_hull/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

/turf/open/floor/almayer_hull/outerhull_dir
icon_state = "outerhull_dir"
Expand Down
4 changes: 1 addition & 3 deletions code/game/turfs/floors/desert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,7 @@
icon_overlay = "_shallow"
var/toxic = 0
default_name = "water"

/turf/open/gm/river/desert/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

/turf/open/gm/river/desert/update_icon()
..()
Expand Down
4 changes: 1 addition & 3 deletions code/game/turfs/hunter_turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,7 @@
icon = 'icons/turf/floors/hunter_floors.dmi'
icon_state = "outerhull"
allow_construction = FALSE

/turf/open/floor/predship/hull/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

/turf/open/floor/predship/hull/non_weedable_hull
icon_state = "outerhull_dir"
Expand Down
13 changes: 3 additions & 10 deletions code/game/turfs/hybrisa.dm
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,7 @@
icon = 'icons/turf/floors/floors.dmi'
icon_state = "bcircuit"
allow_construction = FALSE


/turf/open/hybrisa/street/underground_unweedable/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

// Engineer Ship Hull

Expand All @@ -190,9 +187,7 @@
icon = 'icons/turf/floors/engineership.dmi'
icon_state = "engineerwallfloor1"
allow_construction = FALSE

/turf/open/floor/hybrisa/engineership/ship_hull/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

/turf/open/floor/hybrisa/engineership/ship_hull/non_weedable_hull
icon_state = "outerhull_dir"
Expand Down Expand Up @@ -1034,9 +1029,7 @@
desc = "A strange metal pillar, unlike any metal you've seen before."
icon_state = "eng_pillar1"
allow_construction = FALSE

/turf/open/floor/hybrisa/engineership/pillars/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

/turf/open/floor/hybrisa/engineership/pillars/north/pillar1
icon_state = "eng_pillar1"
Expand Down
22 changes: 10 additions & 12 deletions code/game/turfs/open.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,7 @@
/turf/open/void/vehicle
density = TRUE
opacity = TRUE

/turf/open/void/is_weedable()
return NOT_WEEDABLE
weedable = NOT_WEEDABLE

/turf/open/river
can_bloody = FALSE
Expand All @@ -187,6 +185,7 @@
icon_state = "mars_sand_1"
is_groundmap_turf = TRUE
minimap_color = MINIMAP_MARS_DIRT
weedable = SEMI_WEEDABLE


/turf/open/mars_cave
Expand Down Expand Up @@ -486,6 +485,7 @@
icon_state = "grass1"
baseturfs = /turf/open/gm/grass
scorchable = "grass1"
weedable = SEMI_WEEDABLE

/turf/open/gm/grass/grass1
icon_state = "grass1"
Expand Down Expand Up @@ -546,6 +546,7 @@
icon_state = "grassdirt_edge"
baseturfs = /turf/open/gm/dirtgrassborder
scorchable = "grass1"
weedable = SEMI_WEEDABLE

/turf/open/gm/dirtgrassborder/north
dir = NORTH
Expand Down Expand Up @@ -653,6 +654,7 @@
baseturfs = /turf/open/gm/river
supports_surgery = FALSE
minimap_color = MINIMAP_WATER
weedable = NOT_WEEDABLE

/turf/open/gm/river/Initialize(mapload, ...)
. = ..()
Expand Down Expand Up @@ -805,6 +807,7 @@
icon_state = "beach"
baseturfs = /turf/open/gm/coast
supports_surgery = FALSE
weedable = NOT_WEEDABLE

/turf/open/gm/coast/north

Expand Down Expand Up @@ -881,11 +884,7 @@
icon_state = "black"
density = TRUE
supports_surgery = FALSE

/turf/open/gm/empty/is_weedable()
return NOT_WEEDABLE


weedable = NOT_WEEDABLE

//Nostromo turfs

Expand All @@ -912,10 +911,8 @@
. = ..()
setDir(pick(NORTH,SOUTH,EAST,WEST,NORTHEAST,NORTHWEST,SOUTHEAST,SOUTHWEST))

/turf/open/ice/noweed/is_weedable() //used for new prison ice block xenos
return NOT_WEEDABLE


/turf/open/ice/noweed //used for new prison ice block xenos
weedable = NOT_WEEDABLE

// Colony tiles
/turf/open/asphalt
Expand Down Expand Up @@ -1028,6 +1025,7 @@
icon_state = "grass1"
var/icon_spawn_state = "grass1"
baseturfs = /turf/open/jungle
weedable = NOT_WEEDABLE

/turf/open/jungle/Initialize(mapload, ...)
. = ..()
Expand Down
3 changes: 1 addition & 2 deletions code/game/turfs/open_space.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
mouse_opacity = MOUSE_OPACITY_TRANSPARENT

/turf/open_space
weedable = NOT_WEEDABLE
name = "open space"
icon_state = "transparent"
baseturfs = /turf/open_space
Expand Down Expand Up @@ -65,5 +66,3 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
user.forceMove(below)
return

/turf/open_space/is_weedable()
return NOT_WEEDABLE
1 change: 1 addition & 0 deletions code/game/turfs/space.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
can_bloody = FALSE
layer = UNDER_TURF_LAYER
supports_surgery = FALSE
weedable = NOT_WEEDABLE

/turf/open/space/basic/New() //Do not convert to Initialize
//This is used to optimize the map loader
Expand Down
5 changes: 0 additions & 5 deletions code/game/turfs/strata.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
/turf/open/gm/dirtgrassborder/weedable/grass1
icon_state = "grass1"

/turf/closed/gm/dense/weedable

/turf/closed/gm/dense/weedable/is_weedable() //Weed-able jungle walls. Notably crushers can slam through this, so that might cause overlay issues. 3 months later, yeah it causes overlay issues, so return FALSE!
return NOT_WEEDABLE

/turf/open/floor/strata //Instance me!
icon = 'icons/turf/floors/strata_floor.dmi'
icon_state = "floor"
Expand Down
34 changes: 6 additions & 28 deletions code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
/// Is fishing allowed on this turf
var/fishing_allowed = FALSE

/// How much can weeds spread on the turf
var/weedable = FULLY_WEEDABLE

/turf/Initialize(mapload)
SHOULD_CALL_PARENT(FALSE) // this doesn't parent call for optimisation reasons
if(flags_atom & INITIALIZED)
Expand Down Expand Up @@ -679,38 +682,13 @@
//Check if you can plant weeds on that turf.
//Does NOT return a message, just a 0 or 1.
/turf/proc/is_weedable()
return density ? NOT_WEEDABLE : FULLY_WEEDABLE

/turf/open/space/is_weedable()
return NOT_WEEDABLE

/turf/open/gm/grass/is_weedable()
return SEMI_WEEDABLE

/turf/open/gm/dirtgrassborder/is_weedable()
return SEMI_WEEDABLE

/turf/open/gm/river/is_weedable()
return NOT_WEEDABLE

/turf/open/gm/coast/is_weedable()
return NOT_WEEDABLE
if(density)
return NOT_WEEDABLE
return weedable

/turf/open/snow/is_weedable()
return bleed_layer ? NOT_WEEDABLE : FULLY_WEEDABLE

/turf/open/mars/is_weedable()
return SEMI_WEEDABLE

/turf/open/jungle/is_weedable()
return NOT_WEEDABLE

/turf/open/auto_turf/shale/layer1/is_weedable()
return SEMI_WEEDABLE

/turf/open/auto_turf/shale/layer2/is_weedable()
return SEMI_WEEDABLE

/turf/closed/wall/is_weedable()
return FULLY_WEEDABLE //so we can spawn weeds on the walls

Expand Down
Loading
Loading