Hell

SS13-Source-Archive · Oct 13, 2020 · 28b23e3 · 28b23e3
1 parent b857e1b
commit 28b23e3
Show file tree

Hide file tree

Showing 11 changed files with 165 additions and 98 deletions.
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
@@ -32,6 +32,21 @@
 	..()
 	icon_state = "tree_[rand(1, 6)]"
 
+/obj/structure/flora/tree/hell
+	icon = 'icons/obj/flora/deadtrees.dmi'
+	icon_state = "hell_tree"
+
+/obj/structure/flora/tree/hell/New()
+	..()
+	icon_state = "hell_tree"
+
+/obj/structure/flora/tree/plant
+	icon = 'icons/obj/flora/deadtrees.dmi'
+	icon_state = "hell_plant"
+
+/obj/structure/flora/tree/plant/New()
+	..()
+	icon_state = "hell_plant"
 
 //grass
 /obj/structure/flora/grass
@@ -199,12 +214,31 @@
 /obj/structure/flora/ausbushes/hellgrass
 	icon_state = "hell_grass"
 
+/obj/structure/flora/ausbushes/hellgrass/New()
+	..()
+	icon_state = "hell_grass"
+
 /obj/structure/flora/ausbushes/hellgrass2
 	icon_state = "hell_grass2"
 
+/obj/structure/flora/ausbushes/hellgrass2/New()
+	..()
+	icon_state = "hell_grass2"
+
 /obj/structure/flora/ausbushes/hellgrass3
 	icon_state = "hell_grass3"
 
+/obj/structure/flora/ausbushes/hellgrass3/New()
+	..()
+	icon_state = "hell_grass3"
+
+/obj/structure/flora/ausbushes/hellgrass4
+	icon_state = "hell_grass4"
+
+/obj/structure/flora/ausbushes/hellgrass4/New()
+	..()
+	icon_state = "hell_grass4"
+
 //potted plants credit: Flashkirby
 /obj/structure/flora/pottedplant
 	name = "potted plant"

diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
@@ -515,6 +515,11 @@
 	icon = 'icons/turf/dirt.dmi'
 	icon_state = "hell_dirt"
 
+/turf/simulated/floor/hellslate
+	name = "rock slate"
+	icon = 'icons/turf/dirt.dmi'
+	icon_state = "slat"
+
 /turf/simulated/floor/light
 /turf/simulated/floor/airless/ceiling
 

diff --git a/icons/obj/flora/ausflora.dmi b/icons/obj/flora/ausflora.dmi
diff --git a/icons/obj/flora/deadtrees.dmi b/icons/obj/flora/deadtrees.dmi
diff --git a/icons/turf/dirt.dmi b/icons/turf/dirt.dmi
diff --git a/icons/turf/flooring/dirt.dmi b/icons/turf/flooring/dirt.dmi
diff --git a/icons/turf/flooring/tiles.dmi b/icons/turf/flooring/tiles.dmi
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
diff --git a/maps/away/blueriver/blueriver.dm b/maps/away/blueriver/blueriver.dm
@@ -158,3 +158,22 @@
 
 /turf/unsimulated/wall/supermatter/no_spread/Process()
 	return PROCESS_KILL
+
+/turf/unsimulated/wall/supermatter/hell
+	name = "blood"
+	desc = "Looks like glowing blood, I dont think it is a good idea to touch it."
+	icon='blueriver.dmi'
+	icon_state = "bloodf2"
+	layer = SUPERMATTER_WALL_LAYER
+	plane = EFFECTS_ABOVE_LIGHTING_PLANE
+	opacity = 0
+	dynamic_lighting = 0
+
+/turf/unsimulated/wall/supermatter/hell/Initialize()
+	.=..()
+
+	icon_state = "bloodf2"
+	set_light(l_range = 5, l_power = 2, l_color = "#e53131")
+
+/turf/unsimulated/wall/supermatter/hell/Process()
+	return PROCESS_KILL
diff --git a/maps/away/blueriver/blueriver.dmi b/maps/away/blueriver/blueriver.dmi
diff --git a/maps/hell/hell-1.dmm b/maps/hell/hell-1.dmm