From ea840a85d259bff25e274067c2b79ae16f0ad1da Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 30 Nov 2020 01:01:11 -0500 Subject: [PATCH 1/3] fix da grass makes outdoor grass not have the interior grass edging --- code/game/turfs/simulated/outdoors/grass.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 5c764a97da..078a1033dc 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -6,7 +6,7 @@ var/list/grass_types = list( name = "grass" icon_state = "grass0" edge_blending_priority = 4 - initial_flooring = /decl/flooring/grass + //initial_flooring = /decl/flooring/grass //VOREStation Removal turf_layers = list( /turf/simulated/floor/outdoors/rocks, /turf/simulated/floor/outdoors/dirt From 4285fa61f823f760b74e03bb5ca3335c964432c8 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 30 Nov 2020 16:19:44 -0500 Subject: [PATCH 2/3] makeda grass hav grass footstep sounds and still not have interior edging --- code/game/turfs/flooring/flooring.dm | 7 +++++++ code/game/turfs/simulated/outdoors/grass.dm | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 08133f1b72..44031b43cd 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -140,6 +140,13 @@ var/list/flooring_types 'sound/effects/footstep/grass3.ogg', 'sound/effects/footstep/grass4.ogg')) +/decl/flooring/grass/outdoors // VOREStation Edit + flags = TURF_REMOVE_SHOVEL // VOREStation Edit + +/decl/flooring/grass/outdoors/forest // VOREStation Edit + icon = 'icons/turf/outdoors.dmi' // VOREStation Edit + icon_base = "grass-dark" // VOREStation Edit + /decl/flooring/grass/sif // Subtype for Sif's grass. name = "growth" desc = "A natural moss that has adapted to the sheer cold climate." diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 078a1033dc..09784b21a3 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -6,7 +6,7 @@ var/list/grass_types = list( name = "grass" icon_state = "grass0" edge_blending_priority = 4 - //initial_flooring = /decl/flooring/grass //VOREStation Removal + initial_flooring = /decl/flooring/grass/outdoors // VOREStation Edit turf_layers = list( /turf/simulated/floor/outdoors/rocks, /turf/simulated/floor/outdoors/dirt @@ -81,6 +81,7 @@ var/list/grass_types = list( grass_chance = 80 //tree_chance = 20 edge_blending_priority = 5 + initial_flooring = /decl/flooring/grass/outdoors/forest // VOREStation Edit /turf/simulated/floor/outdoors/grass/sif/forest name = "thick growth" @@ -94,3 +95,4 @@ var/list/grass_types = list( /obj/structure/flora/sif/eyes = 5, /obj/structure/flora/sif/tendrils = 30 ) + From 1fdeabfa29a028feeabebcad18b56b1895676182 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 30 Nov 2020 18:09:18 -0500 Subject: [PATCH 3/3] satisfies Ascian's dangerous need for orderly vorestation edits --- code/game/turfs/flooring/flooring.dm | 7 ------- code/game/turfs/flooring/flooring_vr.dm | 9 ++++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 44031b43cd..08133f1b72 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -140,13 +140,6 @@ var/list/flooring_types 'sound/effects/footstep/grass3.ogg', 'sound/effects/footstep/grass4.ogg')) -/decl/flooring/grass/outdoors // VOREStation Edit - flags = TURF_REMOVE_SHOVEL // VOREStation Edit - -/decl/flooring/grass/outdoors/forest // VOREStation Edit - icon = 'icons/turf/outdoors.dmi' // VOREStation Edit - icon_base = "grass-dark" // VOREStation Edit - /decl/flooring/grass/sif // Subtype for Sif's grass. name = "growth" desc = "A natural moss that has adapted to the sheer cold climate." diff --git a/code/game/turfs/flooring/flooring_vr.dm b/code/game/turfs/flooring/flooring_vr.dm index 3ece493930..2567ffd1a6 100644 --- a/code/game/turfs/flooring/flooring_vr.dm +++ b/code/game/turfs/flooring/flooring_vr.dm @@ -16,4 +16,11 @@ name = "flesh" desc = "This slick flesh ripples and squishes under your touch" icon = 'icons/turf/stomach_vr.dmi' - icon_base = "flesh_floor" \ No newline at end of file + icon_base = "flesh_floor" + +/decl/flooring/grass/outdoors + flags = TURF_REMOVE_SHOVEL + +/decl/flooring/grass/outdoors/forest + icon = 'icons/turf/outdoors.dmi' + icon_base = "grass-dark" \ No newline at end of file