cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

List killening (#8333)

Browse Source
This commit is contained in:
Cadyn
2024-05-01 13:32:00 -07:00
committed by GitHub
parent 423caa7b76
commit 5e63d54437
19 changed files with 335 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/structures.dm
View File

@@ -9,11 +9,11 @@
var/parts var/parts
var/list/climbers var/list/climbers
var/block_turf_edges = FALSE // If true, turf edge icons will not be made on the turf this occupies. var/block_turf_edges = FALSE // If true, turf edge icons will not be made on the turf this occupies.
var/list/connections var/list/connections
var/list/other_connections var/list/other_connections
var/list/blend_objects = newlist() // Objects which to blend with var/list/blend_objects = null // Objects which to blend with //CHOMPEdit default null
var/list/noblend_objects = newlist() //Objects to avoid blending with (such as children of listed blend objects. var/list/noblend_objects = null //Objects to avoid blending with (such as children of listed blend objects. //CHOMPEdit default null
/obj/structure/Initialize() /obj/structure/Initialize()
. = ..() . = ..()

138
code/game/turfs/flooring/seasonal.dm
View File

@@ -30,162 +30,58 @@ GLOBAL_VAR(world_time_day)
initial_flooring = /decl/flooring/grass/seasonal_grass initial_flooring = /decl/flooring/grass/seasonal_grass
grass_types = list() grass = null //CHOMPEdit
var/static/list/overlays_cache = list() var/static/list/overlays_cache = list()
animal_chance = 0.5 // CHOMPedit: upstream redeclared these as new vars for some reason animal_chance = 0.5 // CHOMPedit: upstream redeclared these as new vars for some reason
animal_types = list() // CHOMPedit end animals = null // CHOMPedit end
var/tree_chance = 1 var/tree_chance = 1
var/tree_types = list() var/trees = null //CHOMPEdit
var/snow_chance = 10 var/snow_chance = 10
/turf/simulated/floor/outdoors/grass/seasonal/Initialize() //There are A LOT of chompedits here, I guess. /turf/simulated/floor/outdoors/grass/seasonal/Initialize() //There are A LOT of chompedits here, I guess.
switch(GLOB.world_time_season) switch(GLOB.world_time_season)
if("spring") if("spring")
tree_types = list( trees = "seasonalspring" //CHOMPEdit
/obj/structure/flora/tree/bigtree, animals = "seasonalspring" //CHOMPEdit
/obj/structure/flora/tree/jungle_small, grass = "seasonalspring" //CHOMPEdit
/obj/structure/flora/tree/jungle
)
animal_types = list(
/mob/living/simple_mob/vore/alienanimals/teppi = 10, //CHOMP Edit
/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1, //CHOMP Edit
/mob/living/simple_mob/vore/redpanda = 40,
/mob/living/simple_mob/vore/redpanda/fae = 2, //CHOMP Edit
/mob/living/simple_mob/vore/sheep = 20,
/mob/living/simple_mob/vore/rabbit/black = 20,
/mob/living/simple_mob/vore/rabbit/white = 20,
/mob/living/simple_mob/vore/rabbit/brown = 20,
/mob/living/simple_mob/vore/leopardmander = 2,
/mob/living/simple_mob/vore/horse/big = 10,
/mob/living/simple_mob/vore/bigdragon/friendly = 1,
/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
/mob/living/simple_mob/vore/bee = 20,
/mob/living/simple_mob/vore/horse/big = 5,
/mob/living/simple_mob/vore/wolf = 5,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/squirrel = 20
)
grass_types = list(
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/brflowers,
/obj/structure/flora/ausbushes/genericbush,
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/leafybush,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sunnybush,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/mushroom
)
grass_chance = 30 grass_chance = 30
if("summer") if("summer")
tree_types = list( trees = "seasonalsummer" //CHOMPEdit
/obj/structure/flora/tree/bigtree, animals = "seasonalsummer" //CHOMPEdit
/obj/structure/flora/tree/jungle_small, grass = "seasonalsummer" //CHOMPEdit
/obj/structure/flora/tree/jungle
)
animal_types = list(
/mob/living/simple_mob/vore/alienanimals/teppi = 10,
/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1,
/mob/living/simple_mob/vore/redpanda = 40, //CHOMP Edit
/mob/living/simple_mob/vore/redpanda/fae = 2, //CHOMP Edit
/mob/living/simple_mob/vore/sheep = 20,
/mob/living/simple_mob/vore/rabbit/black = 20,
/mob/living/simple_mob/vore/rabbit/white = 20,
/mob/living/simple_mob/vore/rabbit/brown = 20,
/mob/living/simple_mob/vore/leopardmander = 2,
/mob/living/simple_mob/vore/horse/big = 10,
/mob/living/simple_mob/vore/bigdragon/friendly = 1,
/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
/mob/living/simple_mob/vore/bee = 5,
/mob/living/simple_mob/vore/horse/big = 5,
/mob/living/simple_mob/vore/pakkun = 2,
/mob/living/simple_mob/vore/fennix = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/animal/passive/bird/parrot = 1,
/mob/living/simple_mob/vore/squirrel = 20
)
grass_types = list(
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass
)
if("autumn") if("autumn")
tree_types = list( trees = "seasonalautumn" //CHOMPEdit
/obj/structure/flora/tree/bigtree
)
animal_types = list( animals = "seasonalautumn" //CHOMPEdit
/mob/living/simple_mob/vore/alienanimals/teppi = 10, grass = "seasonalautumn" //CHOMPEdit
/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1,
/mob/living/simple_mob/vore/redpanda = 40,
/mob/living/simple_mob/vore/redpanda/fae = 2,
/mob/living/simple_mob/vore/sheep = 20,
/mob/living/simple_mob/vore/rabbit/black = 20,
/mob/living/simple_mob/vore/rabbit/white = 20,
/mob/living/simple_mob/vore/rabbit/brown = 20,
/mob/living/simple_mob/vore/horse/big = 10,
/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
/mob/living/simple_mob/vore/horse/big = 1,
/mob/living/simple_mob/vore/wolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/squirrel = 20
)
grass_types = list(
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/pumpkin,
/obj/structure/flora/ausbushes
)
grass_chance = 10 grass_chance = 10
animal_chance = 0.25 animal_chance = 0.25
if("winter") if("winter")
grass_chance = 0 grass_chance = 0
tree_types = list( trees = "seasonalwinter"
/obj/structure/flora/tree/dead,
/obj/structure/flora/tree/pine
)
animal_types = list( animals = "seasonalwinter" //CHOMPEdit
/mob/living/simple_mob/vore/rabbit/white = 40,
/mob/living/simple_mob/vore/alienanimals/teppi = 10,
/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1,
/mob/living/simple_mob/vore/redpanda = 10,
/mob/living/simple_mob/vore/wolf = 10,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/otie/friendly = 2,
/mob/living/simple_mob/vore/otie/friendly/chubby = 1,
/mob/living/simple_mob/vore/otie/red/friendly = 1,
/mob/living/simple_mob/vore/otie/red/chubby = 1,
/mob/living/simple_mob/vore/squirrel = 20
)
if(prob(snow_chance)) if(prob(snow_chance))
chill() chill()
return return
grass_types = list( grass = "seasonalwinter" //CHOMPEdit
/obj/structure/flora/grass/both,
/obj/structure/flora/grass/brown,
/obj/structure/flora/grass/green,
/obj/structure/flora/bush
)
grass_chance = 1 grass_chance = 1
animal_chance = 0.1 animal_chance = 0.1
if(tree_chance && prob(tree_chance) && !check_density()) if(tree_chance && prob(tree_chance) && !check_density())
var/tree_type = pickweight(tree_types) var/tree_type = pickweight(GLOB.grass_trees[trees]) //CHOMPEdit
new tree_type(src) new tree_type(src)
if(animal_chance && prob(animal_chance) && !check_density()) if(animal_chance && prob(animal_chance) && !check_density())
var/animal_type = pickweight(animal_types) var/animal_type = pickweight(GLOB.grass_animals[animals]) //CHOMPEdit
new animal_type(src) new animal_type(src)

25
code/game/turfs/simulated/floor_types_eris.dm
View File

@@ -35,7 +35,7 @@
icon_base = "tiles" icon_base = "tiles"
icon = 'icons/turf/flooring/eris/tiles_steel.dmi' icon = 'icons/turf/flooring/eris/tiles_steel.dmi'
build_type = /obj/item/stack/tile/floor/eris/steel build_type = /obj/item/stack/tile/floor/eris/steel
/decl/flooring/tiling/eris/steel/panels /decl/flooring/tiling/eris/steel/panels
icon_base = "panels" icon_base = "panels"
build_type = /obj/item/stack/tile/floor/eris/steel/panels build_type = /obj/item/stack/tile/floor/eris/steel/panels
@@ -983,16 +983,13 @@
icon_state = "grass-heavy0" icon_state = "grass-heavy0"
edge_blending_priority = 4 edge_blending_priority = 4
initial_flooring = /decl/flooring/grass/heavy initial_flooring = /decl/flooring/grass/heavy
turf_layers = list( /*turf_layers = list(
/turf/simulated/floor/outdoors/rocks, /turf/simulated/floor/outdoors/rocks,
/turf/simulated/floor/outdoors/dirt /turf/simulated/floor/outdoors/dirt
) ) CHOMP Removal */
grass_chance = 40 grass_chance = 40
grass_types = list( grass = "heavy"
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass
)
//=========Eris Plating==========\\ //=========Eris Plating==========\\
// This is the light grey tiles with random geometric shapes extruded // This is the light grey tiles with random geometric shapes extruded
@@ -1005,17 +1002,17 @@
can_paint = 1 can_paint = 1
has_base_range = 18 has_base_range = 18
is_plating = TRUE is_plating = TRUE
build_type = null build_type = null
plating_type = /decl/flooring/eris_plating/under plating_type = /decl/flooring/eris_plating/under
/* /*
footstep_sound = "plating" footstep_sound = "plating"
space_smooth = FALSE space_smooth = FALSE
removal_time = 150 removal_time = 150
health = 100 health = 100
floor_smooth = SMOOTH_BLACKLIST floor_smooth = SMOOTH_BLACKLIST
flooring_blacklist = list(/decl/flooring/reinforced/plating/under,/decl/flooring/reinforced/plating/hull) //Smooth with everything except the contents of this list flooring_blacklist = list(/decl/flooring/reinforced/plating/under,/decl/flooring/reinforced/plating/hull) //Smooth with everything except the contents of this list
smooth_movable_atom = SMOOTH_GREYLIST smooth_movable_atom = SMOOTH_GREYLIST
@@ -1049,11 +1046,11 @@
flooring_whitelist = list( flooring_whitelist = list(
/decl/flooring/tiling/eris /decl/flooring/tiling/eris
) )
plating_type = null plating_type = null
//build_type = /obj/item/stack/material/underplating //build_type = /obj/item/stack/material/underplating
/* Eris features we lack on flooring decls /* Eris features we lack on flooring decls
removal_time = 250 removal_time = 250
health = 200 health = 200
@@ -1085,7 +1082,7 @@
has_base_range = 35 has_base_range = 35
is_plating = FALSE is_plating = FALSE
build_type = /obj/item/stack/material/plasteel build_type = /obj/item/stack/material/plasteel
/* Eris features we lack on flooring decls /* Eris features we lack on flooring decls
try_update_icon = 0 try_update_icon = 0
plating_type = null plating_type = null

2
code/game/turfs/simulated/outdoors/dirt.dm
View File

@@ -3,6 +3,6 @@
desc = "Quite dirty!" desc = "Quite dirty!"
icon_state = "dirt-dark" icon_state = "dirt-dark"
edge_blending_priority = 2 edge_blending_priority = 2
turf_layers = list(/turf/simulated/floor/outdoors/rocks) //turf_layers = list(/turf/simulated/floor/outdoors/rocks) CHOMP Removal
initial_flooring = /decl/flooring/dirt initial_flooring = /decl/flooring/dirt
can_dig = TRUE can_dig = TRUE

36
code/game/turfs/simulated/outdoors/grass.dm
View File

@@ -1,6 +1,3 @@
var/list/grass_types = list(
)
/turf/simulated/floor/outdoors/grass /turf/simulated/floor/outdoors/grass
name = "grass" name = "grass"
@@ -8,23 +5,23 @@ var/list/grass_types = list(
edge_blending_priority = 4 edge_blending_priority = 4
initial_flooring = /decl/flooring/grass/outdoors // VOREStation Edit initial_flooring = /decl/flooring/grass/outdoors // VOREStation Edit
can_dig = TRUE can_dig = TRUE
turf_layers = list( /*turf_layers = list( CHOMP Removal Begin
/turf/simulated/floor/outdoors/rocks, /turf/simulated/floor/outdoors/rocks,
/turf/simulated/floor/outdoors/dirt /turf/simulated/floor/outdoors/dirt
) )CHOMP Removal End*/
var/grass_chance = 12 var/grass_chance = 12
var/animal_chance = 1 var/animal_chance = 1
// Weighted spawn list. // Weighted spawn list.
var/list/animal_types = list( /*var/list/animal_types = list( CHOMP Removal begin
/mob/living/simple_mob/animal/passive/tindalos = 1 /mob/living/simple_mob/animal/passive/tindalos = 1
) )
var/list/grass_types = list( var/list/grass_types = list(
/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass /obj/structure/flora/ausbushes/fullgrass
) ) CHOMP Removal End */
/datum/category_item/catalogue/flora/sif_grass /datum/category_item/catalogue/flora/sif_grass
name = "Sivian Flora - Moss" name = "Sivian Flora - Moss"
@@ -45,7 +42,7 @@ var/list/grass_types = list(
animal_chance = 0.25 //CHOMPedit animal_chance = 0.25 //CHOMPedit
/* CHOMP Removal Begin
animal_types = list( animal_types = list(
/mob/living/simple_mob/animal/sif/diyaab = 7, /mob/living/simple_mob/animal/sif/diyaab = 7,
/mob/living/simple_mob/animal/sif/glitterfly = 2, /mob/living/simple_mob/animal/sif/glitterfly = 2,
@@ -59,7 +56,7 @@ var/list/grass_types = list(
/obj/structure/flora/sif/eyes = 1, /obj/structure/flora/sif/eyes = 1,
/obj/structure/flora/sif/tendrils = 10 /obj/structure/flora/sif/tendrils = 10
) )
CHOMP Removal End*/
catalogue_data = list(/datum/category_item/catalogue/flora/sif_grass) catalogue_data = list(/datum/category_item/catalogue/flora/sif_grass)
catalogue_delay = 2 SECONDS catalogue_delay = 2 SECONDS
@@ -69,13 +66,13 @@ var/list/grass_types = list(
. = ..() . = ..()
/turf/simulated/floor/outdoors/grass/Initialize() /turf/simulated/floor/outdoors/grass/Initialize()
if(grass_chance && prob(grass_chance) && !check_density()) if(grass && grass_chance && prob(grass_chance) && !check_density()) //CHOMPEdit
var/grass_type = pickweight(grass_types) var/grass_type = pickweight(GLOB.grass_grass[grass]) //CHOMPEdit
if(grass_type) //ChompEDIT - runtime if(grass_type) //ChompEDIT - runtime
new grass_type(src) new grass_type(src)
if(animal_chance && prob(animal_chance) && !check_density()) if(animals && animal_chance && prob(animal_chance) && !check_density()) //CHOMPEdit
var/animal_type = pickweight(animal_types) var/animal_type = pickweight(GLOB.grass_animals[animals]) //CHOMPEdit
if(animal_type) //ChompEDIT - runtime if(animal_type) //ChompEDIT - runtime
new animal_type(src) new animal_type(src)
@@ -97,24 +94,15 @@ var/list/grass_types = list(
tree_chance = 4 tree_chance = 4
grass_chance = 1 grass_chance = 1
grass_types = list( grass = "sifforest"
/obj/structure/flora/sif/frostbelle = 1,
/obj/structure/flora/sif/eyes = 5,
/obj/structure/flora/sif/tendrils = 30
)
//CHOMPedit: animal spawning for sif rocks. This probably doesn't belong in grass.dm but it's where there other Sif spawns are, sue me. //CHOMPedit: animal spawning for sif rocks. This probably doesn't belong in grass.dm but it's where there other Sif spawns are, sue me.
/turf/simulated/floor/outdoors/rocks/sif /turf/simulated/floor/outdoors/rocks/sif
var/animal_chance = 0.3 //Should spawn around... 0-7 per round? Tweak as needed. var/animal_chance = 0.3 //Should spawn around... 0-7 per round? Tweak as needed.
var/animal_types = list(
/mob/living/simple_mob/vore/slug = 1
)
/turf/simulated/floor/outdoors/rocks/sif/Initialize() /turf/simulated/floor/outdoors/rocks/sif/Initialize()
if(animal_chance && prob(animal_chance) && !check_density()) if(animal_chance && prob(animal_chance) && !check_density())
var/animal_type = pickweight(animal_types) new /mob/living/simple_mob/vore/slug(src)
new animal_type(src)
. = ..() . = ..()
//CHOMPedit end //CHOMPedit end

232
code/game/turfs/simulated/outdoors/grass_ch.dm Normal file
View File

@@ -0,0 +1,232 @@
/turf/simulated/floor/outdoors/grass
var/animals = "base"
var/grass = "base"
/turf/simulated/floor/outdoors/grass/sif
animals = "sif"
grass = "sif"
/turf/simulated/floor/outdoors/grass/sif/forest
grass = "sifforest"
GLOBAL_LIST_INIT(grass_animals,list(
"base" = list(
/mob/living/simple_mob/animal/passive/tindalos = 1
),
"sif" = list(
/mob/living/simple_mob/animal/sif/diyaab = 7,
/mob/living/simple_mob/animal/sif/glitterfly = 2,
/mob/living/simple_mob/animal/sif/duck = 2,
/mob/living/simple_mob/animal/sif/shantak/retaliate = 2,
/mob/living/simple_mob/animal/passive/gaslamp/snow = 1,
/obj/random/mob/multiple/sifmobs = 1
),
"valley" = list(
/mob/living/simple_mob/animal/sif/diyaab = 24,
/mob/living/simple_mob/animal/sif/glitterfly = 24,
/mob/living/simple_mob/animal/sif/duck = 24,
/obj/random/mob/multiple/sifmobs = 6,
/mob/living/simple_mob/humanoid/cultist/tesh = 2,
/mob/living/simple_mob/humanoid/eclipse/solar/froststalker = 2,
/mob/living/simple_mob/humanoid/eclipse/lunar/pummler = 1,
/mob/living/simple_mob/humanoid/merc/ranged/laser = 2,
/mob/living/simple_mob/humanoid/cultist/magus/rift = 0.05
),
"valleyedge" = list(
/mob/living/simple_mob/animal/sif/diyaab = 12,
/mob/living/simple_mob/animal/sif/glitterfly = 12,
/mob/living/simple_mob/animal/sif/duck = 12,
/mob/living/simple_mob/animal/giant_spider/tunneler = 12,
/mob/living/simple_mob/animal/giant_spider/nurse = 12,
/mob/living/simple_mob/animal/giant_spider/phorogenic = 12
),
"sifcave" = list(
/mob/living/simple_mob/animal/giant_spider/tunneler = 12,
/mob/living/simple_mob/animal/giant_spider/nurse = 12,
/mob/living/simple_mob/animal/giant_spider/phorogenic = 12,
/mob/living/simple_mob/animal/giant_spider/electric = 12,
/mob/living/simple_mob/animal/space/mouse_army/operative = 6,
/mob/living/simple_mob/animal/space/mouse_army/pyro = 6,
/mob/living/simple_mob/animal/space/mouse_army/ammo = 6,
/mob/living/simple_mob/mechanical/mecha/mouse_tank/livewire = 2,
/mob/living/simple_mob/humanoid/eclipse/lunar/miner = 6
),
"seasonalspring" = list(
/mob/living/simple_mob/vore/alienanimals/teppi = 10, //CHOMP Edit
/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1, //CHOMP Edit
/mob/living/simple_mob/vore/redpanda = 40,
/mob/living/simple_mob/vore/redpanda/fae = 2, //CHOMP Edit
/mob/living/simple_mob/vore/sheep = 20,
/mob/living/simple_mob/vore/rabbit/black = 20,
/mob/living/simple_mob/vore/rabbit/white = 20,
/mob/living/simple_mob/vore/rabbit/brown = 20,
/mob/living/simple_mob/vore/leopardmander = 2,
/mob/living/simple_mob/vore/horse/big = 10,
/mob/living/simple_mob/vore/bigdragon/friendly = 1,
/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
/mob/living/simple_mob/vore/bee = 20,
/mob/living/simple_mob/vore/horse/big = 5,
/mob/living/simple_mob/vore/wolf = 5,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/squirrel = 20
),
"seasonalsummer" = list(
/mob/living/simple_mob/vore/alienanimals/teppi = 10,
/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1,
/mob/living/simple_mob/vore/redpanda = 40, //CHOMP Edit
/mob/living/simple_mob/vore/redpanda/fae = 2, //CHOMP Edit
/mob/living/simple_mob/vore/sheep = 20,
/mob/living/simple_mob/vore/rabbit/black = 20,
/mob/living/simple_mob/vore/rabbit/white = 20,
/mob/living/simple_mob/vore/rabbit/brown = 20,
/mob/living/simple_mob/vore/leopardmander = 2,
/mob/living/simple_mob/vore/horse/big = 10,
/mob/living/simple_mob/vore/bigdragon/friendly = 1,
/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
/mob/living/simple_mob/vore/bee = 5,
/mob/living/simple_mob/vore/horse/big = 5,
/mob/living/simple_mob/vore/pakkun = 2,
/mob/living/simple_mob/vore/fennix = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/animal/passive/bird/parrot = 1,
/mob/living/simple_mob/vore/squirrel = 20
),
"seasonalautumn" = list(
/mob/living/simple_mob/vore/alienanimals/teppi = 10,
/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1,
/mob/living/simple_mob/vore/redpanda = 40,
/mob/living/simple_mob/vore/redpanda/fae = 2,
/mob/living/simple_mob/vore/sheep = 20,
/mob/living/simple_mob/vore/rabbit/black = 20,
/mob/living/simple_mob/vore/rabbit/white = 20,
/mob/living/simple_mob/vore/rabbit/brown = 20,
/mob/living/simple_mob/vore/horse/big = 10,
/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
/mob/living/simple_mob/vore/horse/big = 1,
/mob/living/simple_mob/vore/wolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/squirrel = 20
),
"seasonalwinter" = list(
/mob/living/simple_mob/vore/rabbit/white = 40,
/mob/living/simple_mob/vore/alienanimals/teppi = 10,
/mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1,
/mob/living/simple_mob/vore/redpanda = 10,
/mob/living/simple_mob/vore/wolf = 10,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/otie/friendly = 2,
/mob/living/simple_mob/vore/otie/friendly/chubby = 1,
/mob/living/simple_mob/vore/otie/red/friendly = 1,
/mob/living/simple_mob/vore/otie/red/chubby = 1,
/mob/living/simple_mob/vore/squirrel = 20
),
"smokestar" = list(
/mob/living/simple_mob/vore/smokestar/drider = 1
),
))
GLOBAL_LIST_INIT(grass_grass,list(
"base" = list(
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass
),
"sif" = list(
/obj/structure/flora/sif/eyes = 1,
/obj/structure/flora/sif/tendrils = 10
),
"sifforest" = list(
/obj/structure/flora/sif/frostbelle = 1,
/obj/structure/flora/sif/eyes = 5,
/obj/structure/flora/sif/tendrils = 30
),
"valley" = list(
/obj/structure/flora/sif/eyes = 20,
/obj/structure/flora/sif/tendrils = 20,
/obj/structure/flora/mushroom = 20,
/obj/structure/flora/sif/subterranean = 20,
/obj/structure/flora/sif/tendrils = 20,
/obj/structure/flora/sif/frostbelle = 20
),
"valleyedge" = list(
/obj/structure/flora/sif/eyes = 20,
/obj/structure/flora/sif/tendrils = 20,
/obj/structure/flora/mushroom = 20,
/obj/structure/flora/sif/subterranean = 20,
/obj/structure/flora/sif/tendrils = 20,
/obj/structure/flora/sif/frostbelle = 20
),
"sifcave" = list(
/obj/structure/flora/mushroom = 1,
/obj/structure/flora/sif/subterranean = 1,
/obj/structure/outcrop/phoron = 1,
/obj/structure/outcrop/diamond = 1,
/obj/structure/outcrop/uranium = 1,
/obj/structure/outcrop = 1,
/obj/structure/boulder = 1
),
"seasonalspring" = list(
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/brflowers,
/obj/structure/flora/ausbushes/genericbush,
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/leafybush,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sunnybush,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/mushroom
),
"seasonalsummer" = list(
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass
),
"seasonalautumn" = list(
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/pumpkin,
/obj/structure/flora/ausbushes
),
"seasonalwinter" = list(
/obj/structure/flora/grass/both,
/obj/structure/flora/grass/brown,
/obj/structure/flora/grass/green,
/obj/structure/flora/bush
),
"smokestar" = list(
/obj/structure/flora/opalflowers,
/obj/structure/flora/weepinggrass,
/obj/random/outcrop
),
"thor" = list(
/obj/structure/flora/ausbushes/fullgrass = 40,
/obj/structure/flora/ausbushes/sparsegrass = 40,
/obj/structure/prop/desert_planet64x64/palmuria = 10,
/obj/structure/prop/desert_planet64x64/palmuria1 = 10
),
"heavy" = list(
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass
),
))
GLOBAL_LIST_INIT(grass_trees, list(
"seasonalspring" = list(
/obj/structure/flora/tree/bigtree,
/obj/structure/flora/tree/jungle_small,
/obj/structure/flora/tree/jungle
),
"seasonalsummer" = list(
/obj/structure/flora/tree/bigtree,
/obj/structure/flora/tree/jungle_small,
/obj/structure/flora/tree/jungle
),
"seasonalfall" = list(
/obj/structure/flora/tree/bigtree
),
"seasonalwinter" = list(
/obj/structure/flora/tree/dead,
/obj/structure/flora/tree/pine
),
))

5
code/game/turfs/simulated/outdoors/outdoors.dm
View File

@@ -23,7 +23,7 @@ var/list/turf_edge_cache = list()
can_build_into_floor = TRUE can_build_into_floor = TRUE
// When a turf gets demoted or promoted, this list gets adjusted. The top-most layer is the layer on the bottom of the list, due to how pop() works. // When a turf gets demoted or promoted, this list gets adjusted. The top-most layer is the layer on the bottom of the list, due to how pop() works.
var/list/turf_layers = list(/turf/simulated/floor/outdoors/rocks) //var/list/turf_layers = list(/turf/simulated/floor/outdoors/rocks) CHOMPEdit kill. See outdoors_ch.dm for replacement.
var/can_dig = FALSE var/can_dig = FALSE
var/loot_count var/loot_count
@@ -130,6 +130,7 @@ var/list/turf_edge_cache = list()
outdoors = OUTDOORS_NO outdoors = OUTDOORS_NO
// This proc adds a 'layer' on top of the turf. // This proc adds a 'layer' on top of the turf.
/* CHOMP Removal start
/turf/simulated/floor/outdoors/proc/promote(var/new_turf_type) /turf/simulated/floor/outdoors/proc/promote(var/new_turf_type)
var/list/new_turf_layer_list = turf_layers.Copy() var/list/new_turf_layer_list = turf_layers.Copy()
var/list/coords = list(x, y, z) var/list/coords = list(x, y, z)
@@ -152,7 +153,7 @@ var/list/turf_edge_cache = list()
var/turf/simulated/floor/outdoors/T = locate(coords[1], coords[2], coords[3]) var/turf/simulated/floor/outdoors/T = locate(coords[1], coords[2], coords[3])
if(istype(T)) if(istype(T))
T.turf_layers = new_turf_layer_list.Copy() T.turf_layers = new_turf_layer_list.Copy()
CHOMP Removal End */
// Called by weather processes, and maybe technomancers in the future. // Called by weather processes, and maybe technomancers in the future.
/turf/simulated/floor/proc/chill() /turf/simulated/floor/proc/chill()
return return

27
code/game/turfs/simulated/outdoors/outdoors_ch.dm Normal file
View File

@@ -0,0 +1,27 @@
/turf/simulated/floor/outdoors
var/demote_to = /turf/simulated/floor/outdoors/rocks
/turf/simulated/floor/outdoors/proc/promote(var/new_turf_type)
var/mytype = src.type
var/list/coords = list(x, y, z)
ChangeTurf(new_turf_type)
var/turf/simulated/floor/outdoors/T = locate(coords[1], coords[2], coords[3])
if(istype(T))
T.demote_to = mytype
// This proc removes the topmost layer.
/turf/simulated/floor/outdoors/proc/demote()
if(!demote_to)
return // Cannot demote further.
ChangeTurf(demote_to)
/turf/simulated/floor/outdoors/grass
demote_to = /turf/simulated/floor/outdoors/dirt
/turf/simulated/floor/outdoors/snow
demote_to = /turf/simulated/floor/outdoors/dirt
/turf/simulated/floor/outdoors/fur
demote_to = null

4
code/game/turfs/simulated/outdoors/snow.dm
View File

@@ -4,10 +4,10 @@
edge_blending_priority = 6 edge_blending_priority = 6
movement_cost = 2 movement_cost = 2
initial_flooring = /decl/flooring/snow initial_flooring = /decl/flooring/snow
turf_layers = list( /*turf_layers = list( CHOMP Removal Begin
/turf/simulated/floor/outdoors/rocks, /turf/simulated/floor/outdoors/rocks,
/turf/simulated/floor/outdoors/dirt /turf/simulated/floor/outdoors/dirt
) ) CHOMP Removal End*/
var/list/crossed_dirs = list() var/list/crossed_dirs = list()

12
code/game/turfs/simulated/wall_types.dm
View File

@@ -400,8 +400,8 @@
icon = 'icons/turf/wall_masks_eris.dmi' icon = 'icons/turf/wall_masks_eris.dmi'
icon_state = "generic" icon_state = "generic"
wall_masks = 'icons/turf/wall_masks_eris.dmi' wall_masks = 'icons/turf/wall_masks_eris.dmi'
var/list/blend_objects = list(/obj/machinery/door) var/static/list/blend_objects = list(/obj/machinery/door) //CHOMPEdit convert to static list
var/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) var/static/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) //CHOMPEdit convert to static list
/turf/simulated/wall/eris/can_join_with_low_wall(var/obj/structure/low_wall/WF) /turf/simulated/wall/eris/can_join_with_low_wall(var/obj/structure/low_wall/WF)
return istype(WF, /obj/structure/low_wall/eris) return istype(WF, /obj/structure/low_wall/eris)
@@ -437,8 +437,8 @@
icon = 'icons/turf/wall_masks_bay.dmi' icon = 'icons/turf/wall_masks_bay.dmi'
icon_state = "generic" icon_state = "generic"
wall_masks = 'icons/turf/wall_masks_bay.dmi' wall_masks = 'icons/turf/wall_masks_bay.dmi'
var/list/blend_objects = list(/obj/machinery/door) var/static/list/blend_objects = list(/obj/machinery/door) //CHOMPEdit convert to static list
var/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) var/static/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) //CHOMPEdit convert to static list
var/stripe_color // Adds a colored stripe to the walls var/stripe_color // Adds a colored stripe to the walls
@@ -485,8 +485,8 @@
wall_masks = 'icons/turf/wall_masks_tgmc.dmi' // not really a MASK per-se, I guess wall_masks = 'icons/turf/wall_masks_tgmc.dmi' // not really a MASK per-se, I guess
icon_state = "metal0" icon_state = "metal0"
var/list/blend_objects = list(/obj/machinery/door) var/static/list/blend_objects = list(/obj/machinery/door) //CHOMPEdit convert to static list
var/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) var/static/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) //CHOMPEdit convert to static list
var/wall_base_state = "metal" var/wall_base_state = "metal"
var/wall_blend_category = "metal" var/wall_blend_category = "metal"

2
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
View File

@@ -377,7 +377,7 @@
edge_blending_priority = 4 edge_blending_priority = 4
initial_flooring = /decl/flooring/fur initial_flooring = /decl/flooring/fur
can_dig = FALSE can_dig = FALSE
turf_layers = list() //turf_layers = list() CHOMP Removal
var/tree_chance = 25 var/tree_chance = 25
var/tree_color = null var/tree_color = null
var/tree_type = /obj/structure/flora/tree/fur var/tree_type = /obj/structure/flora/tree/fur

7
maps/southern_cross/overmap/planets/thor/thor.dm
View File

@@ -293,10 +293,5 @@
if(tree_chance && prob(tree_chance) && !check_density()) if(tree_chance && prob(tree_chance) && !check_density())
new /obj/structure/flora/tree/jungle(src) new /obj/structure/flora/tree/jungle(src)
grass_types = list( grass = "thor"
/obj/structure/flora/ausbushes/fullgrass = 40,
/obj/structure/flora/ausbushes/sparsegrass = 40,
/obj/structure/prop/desert_planet64x64/palmuria = 10,
/obj/structure/prop/desert_planet64x64/palmuria1 = 10
)
. = ..() . = ..()

4
maps/southern_cross/turfs/outdoors.dm
View File

@@ -181,10 +181,10 @@
edge_blending_priority = 6 edge_blending_priority = 6
movement_cost = 2 movement_cost = 2
initial_flooring = /decl/flooring/snow initial_flooring = /decl/flooring/snow
turf_layers = list( /*turf_layers = list( CHOMP Removal Begin
/turf/simulated/floor/outdoors/rocks, /turf/simulated/floor/outdoors/rocks,
/turf/simulated/floor/outdoors/dirt /turf/simulated/floor/outdoors/dirt
) ) CHOMP Removal End */
/turf/simulated/floor/outdoors/snow/sif/planetuse/Entered(atom/A) /turf/simulated/floor/outdoors/snow/sif/planetuse/Entered(atom/A)
if(isliving(A)) if(isliving(A))

3
modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
View File

@@ -82,7 +82,8 @@
opacity = TRUE opacity = TRUE
edge_blending_priority = 7 edge_blending_priority = 7
initial_flooring = /decl/flooring/desert_planet/stonewall initial_flooring = /decl/flooring/desert_planet/stonewall
turf_layers = list(/turf/simulated/floor/outdoors/rocks) //turf_layers = list(/turf/simulated/floor/outdoors/rocks)
demote_to = /turf/simulated/floor/outdoors/rocks
var/last_act = 0 var/last_act = 0
// Stolen from mineral turf code. // Stolen from mineral turf code.

6
modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm
View File

@@ -19,7 +19,8 @@
opacity = TRUE opacity = TRUE
edge_blending_priority = 7 edge_blending_priority = 7
initial_flooring = /decl/flooring/lavaland/ashrock initial_flooring = /decl/flooring/lavaland/ashrock
turf_layers = list(/turf/simulated/floor/outdoors/lavaland/ash) //turf_layers = list(/turf/simulated/floor/outdoors/lavaland/ash)
demote_to = /turf/simulated/floor/outdoors/lavaland/ash
var/last_act = 0 var/last_act = 0
// Stolen from mineral turf code. // Stolen from mineral turf code.
@@ -58,7 +59,8 @@
icon_state = "basalt0" icon_state = "basalt0"
edge_blending_priority = 3 edge_blending_priority = 3
initial_flooring = /decl/flooring/basalt initial_flooring = /decl/flooring/basalt
turf_layers = list(/turf/simulated/floor/outdoors/lavaland/ash) //turf_layers = list(/turf/simulated/floor/outdoors/lavaland/ash)
demote_to = /turf/simulated/floor/outdoors/lavaland/ash
/turf/simulated/floor/outdoors/lavaland/basalt/get_edge_icon_state() /turf/simulated/floor/outdoors/lavaland/basalt/get_edge_icon_state()
return "basalt0" return "basalt0"

61
modular_chomp/code/game/turfs/simulated/outdoors/valley.dm
View File

@@ -9,26 +9,9 @@
initial_flooring = /decl/flooring/grass/sif initial_flooring = /decl/flooring/grass/sif
animal_types = list( animals = "valley"
/mob/living/simple_mob/animal/sif/diyaab = 24,
/mob/living/simple_mob/animal/sif/glitterfly = 24,
/mob/living/simple_mob/animal/sif/duck = 24,
/obj/random/mob/multiple/sifmobs = 6,
/mob/living/simple_mob/humanoid/cultist/tesh = 2,
/mob/living/simple_mob/humanoid/eclipse/solar/froststalker = 2,
/mob/living/simple_mob/humanoid/eclipse/lunar/pummler = 1,
/mob/living/simple_mob/humanoid/merc/ranged/laser = 2,
/mob/living/simple_mob/humanoid/cultist/magus/rift = 0.05
)
grass_types = list( grass = "valley"
/obj/structure/flora/sif/eyes = 20,
/obj/structure/flora/sif/tendrils = 20,
/obj/structure/flora/mushroom = 20,
/obj/structure/flora/sif/subterranean = 20,
/obj/structure/flora/sif/tendrils = 20,
/obj/structure/flora/sif/frostbelle = 20
)
/turf/simulated/floor/outdoors/grass/sif/valley/edge /turf/simulated/floor/outdoors/grass/sif/valley/edge
tree_chance = 0.25 tree_chance = 0.25
@@ -41,23 +24,9 @@
initial_flooring = /decl/flooring/dirt initial_flooring = /decl/flooring/dirt
animal_types = list( animals = "valleyedge"
/mob/living/simple_mob/animal/sif/diyaab = 12,
/mob/living/simple_mob/animal/sif/glitterfly = 12,
/mob/living/simple_mob/animal/sif/duck = 12,
/mob/living/simple_mob/animal/giant_spider/tunneler = 12,
/mob/living/simple_mob/animal/giant_spider/nurse = 12,
/mob/living/simple_mob/animal/giant_spider/phorogenic = 12
)
grass_types = list( grass = "valleyedge"
/obj/structure/flora/sif/eyes = 20,
/obj/structure/flora/sif/tendrils = 20,
/obj/structure/flora/mushroom = 20,
/obj/structure/flora/sif/subterranean = 20,
/obj/structure/flora/sif/tendrils = 20,
/obj/structure/flora/sif/frostbelle = 20
)
/turf/simulated/floor/outdoors/grass/sif/cave /turf/simulated/floor/outdoors/grass/sif/cave
@@ -73,27 +42,9 @@
initial_flooring = /decl/flooring/dirt initial_flooring = /decl/flooring/dirt
animal_types = list( animals = "sifcave"
/mob/living/simple_mob/animal/giant_spider/tunneler = 12,
/mob/living/simple_mob/animal/giant_spider/nurse = 12,
/mob/living/simple_mob/animal/giant_spider/phorogenic = 12,
/mob/living/simple_mob/animal/giant_spider/electric = 12,
/mob/living/simple_mob/animal/space/mouse_army/operative = 6,
/mob/living/simple_mob/animal/space/mouse_army/pyro = 6,
/mob/living/simple_mob/animal/space/mouse_army/ammo = 6,
/mob/living/simple_mob/mechanical/mecha/mouse_tank/livewire = 2,
/mob/living/simple_mob/humanoid/eclipse/lunar/miner = 6
)
grass_types = list( grass = "sifcave"
/obj/structure/flora/mushroom = 1,
/obj/structure/flora/sif/subterranean = 1,
/obj/structure/outcrop/phoron = 1,
/obj/structure/outcrop/diamond = 1,
/obj/structure/outcrop/uranium = 1,
/obj/structure/outcrop = 1,
/obj/structure/boulder = 1
)
/* /*
/decl/flooring/grass/sif/valleycave /decl/flooring/grass/sif/valleycave

1
modular_chomp/code/game/turfs/turf.dm
View File

@@ -1,3 +1,2 @@
/turf /turf
var/list/temp_check = list()
var/blocks_nonghost_incorporeal = FALSE var/blocks_nonghost_incorporeal = FALSE

12
modular_chomp/code/modules/planet/smokestar/turf.dm
View File

@@ -13,15 +13,9 @@
animal_chance = 0.1 animal_chance = 0.1
animal_types = list( animals = "smokestar"
/mob/living/simple_mob/vore/smokestar/drider = 1
)
grass_types = list( grass = "smokestar"
/obj/structure/flora/opalflowers,
/obj/structure/flora/weepinggrass,
/obj/random/outcrop
)
/obj/structure/flora/opalflowers /obj/structure/flora/opalflowers
@@ -42,4 +36,4 @@
destroy_on_harvest = TRUE destroy_on_harvest = TRUE
harvest_tool = /obj/item/weapon/material/knife harvest_tool = /obj/item/weapon/material/knife
randomize_harvest_count = TRUE randomize_harvest_count = TRUE
harvest_loot = list(/obj/item/stack/material/fiber = 1) harvest_loot = list(/obj/item/stack/material/fiber = 1)

2
vorestation.dme
View File

@@ -1821,8 +1821,10 @@
#include "code\game\turfs\simulated\outdoors\atmoscaves_vr.dm" #include "code\game\turfs\simulated\outdoors\atmoscaves_vr.dm"
#include "code\game\turfs\simulated\outdoors\dirt.dm" #include "code\game\turfs\simulated\outdoors\dirt.dm"
#include "code\game\turfs\simulated\outdoors\grass.dm" #include "code\game\turfs\simulated\outdoors\grass.dm"
#include "code\game\turfs\simulated\outdoors\grass_ch.dm"
#include "code\game\turfs\simulated\outdoors\ironsand_vr.dm" #include "code\game\turfs\simulated\outdoors\ironsand_vr.dm"
#include "code\game\turfs\simulated\outdoors\outdoors.dm" #include "code\game\turfs\simulated\outdoors\outdoors.dm"
#include "code\game\turfs\simulated\outdoors\outdoors_ch.dm"
#include "code\game\turfs\simulated\outdoors\outdoors_vr.dm" #include "code\game\turfs\simulated\outdoors\outdoors_vr.dm"
#include "code\game\turfs\simulated\outdoors\sky.dm" #include "code\game\turfs\simulated\outdoors\sky.dm"
#include "code\game\turfs\simulated\outdoors\snow.dm" #include "code\game\turfs\simulated\outdoors\snow.dm"