TGS Test Merge (#6737)

citadel.dme

@@ -1087,6 +1087,9 @@
 #include "code\game\content\factions\corporations\nanotrasen\nanotrasen-supply\supplies.dm"
 #include "code\game\content\factions\corporations\nanotrasen\nanotrasen-supply\vehicles.dm"
 #include "code\game\content\factions\corporations\nanotrasen\nanotrasen-supply\voidsuits.dm"
+#include "code\game\content\factions\derelict\derelict.dm\derelict_flora.dm"
+#include "code\game\content\factions\derelict\derelict.dm\derelict_props.dm"
+#include "code\game\content\factions\derelict\derelict.dm\derelict_structures.dm"
 #include "code\game\content\factions\orion\iwl\armor.dm"
 #include "code\game\content\factions\orion\iwl\guns.dm"
 #include "code\game\content\factions\orion\iwl\head.dm"
@@ -3494,10 +3497,10 @@
 #include "code\modules\mob\logout.dm"
 #include "code\modules\mob\mob-damage.dm"
 #include "code\modules\mob\mob-defense.dm"
+#include "code\modules\mob\mob-iff.dm"
 #include "code\modules\mob\mob-keybind-triggers.dm"
 #include "code\modules\mob\mob.dm"
 #include "code\modules\mob\mob_defines.dm"
-#include "code\modules\mob\mob-iff.dm"
 #include "code\modules\mob\mob_helpers.dm"
 #include "code\modules\mob\mob_transformation_simple.dm"
 #include "code\modules\mob\mobility.dm"

code/game/content/factions/derelict/derelict.dm/derelict_flora.dm

@@ -0,0 +1,193 @@
+// Walls
+
+/datum/material/alienalloy/hardenedstone
+	id = "hardenedstone"
+	name = "hardenedstone"
+
+	// Becomes "[display_name] wall" in the UI.
+	display_name = "hardened stone"
+
+	icon_base = 'code/game/content/factions/derelict/derelict.dmi/cave_walls.dmi'
+	icon_colour = "#422d0e"
+	wall_stripe_icon = null // leave null
+
+/turf/simulated/wall/event/cave_wall
+	icon = 'code/game/content/factions/derelict/derelict.dmi/cave_walls.dmi'
+	material_outer = /datum/material/alienalloy/hardenedstone
+	name = "cave wall"
+	desc = "A wall consisting of impenetrable rock. No way you're getting past this without heavy excavation equipment."
+	description_info = "No way you can get past this..."
+	block_tele = TRUE
+	integrity_enabled = 0
+
+
+// Floors
+
+/turf/simulated/floor/event/grass
+	footstep_sounds = list("human" = list(
+		'sound/effects/footstep/asteroid1.ogg',
+		'sound/effects/footstep/asteroid2.ogg',
+		'sound/effects/footstep/asteroid3.ogg',
+		'sound/effects/footstep/asteroid4.ogg'))
+
+/turf/simulated/floor/event/crystal_floor
+	name = "crystal patch"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "crystal_floor"
+	integrity_enabled = 0
+
+/turf/simulated/floor/event/grass/dirt1
+	name = "dirt"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "dirt1"
+	integrity_enabled = 0
+
+/turf/simulated/floor/event/grass/dirt2
+	name = "dirt"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "dirt2"
+	integrity_enabled = 0
+
+/turf/simulated/floor/event/cave1
+	name = "cave floor"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "cave1"
+	integrity_enabled = 0
+
+/turf/simulated/floor/event/grass/grass1
+	name = "grass"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "grass1"
+	integrity_enabled = 0
+
+// Decals
+
+/obj/effect/decal/event/crystal_small
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "crystal_small"
+	integrity_enabled = 0
+
+/obj/effect/decal/event/mound_small
+	name = "small mound"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "mound_small"
+	integrity_enabled = 0
+
+/obj/effect/decal/event/mound_medium
+	name = "chunky mound"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "mound_medium"
+	integrity_enabled = 0
+
+/obj/effect/decal/event/mound_large
+	name = "large mound"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "mound_large"
+	integrity_enabled = 0
+
+// Rocks
+
+/obj/stucture/flora/rock/crystal_medium
+	name = "large crystal"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "crystal_medium"
+	integrity_enabled = 0
+	light_power = 2
+	light_range = 2
+	light_color = "#9966cc"
+
+/obj/stucture/flora/rock/crystal_large
+	name = "hefty crystal"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "crystal_large"
+	integrity_enabled = 0
+	light_power = 3
+	light_range = 4
+	light_color = "#9966cc"
+
+/obj/structure/flora/rock/rock1
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "rock1"
+
+/obj/structure/flora/rock/rock2
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "rock2"
+
+/obj/structure/flora/rock/rock3
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "rock3"
+
+/obj/structure/flora/rock/rock4
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	icon_state = "rock4"
+
+// Grass
+
+/obj/structure/flora/grass/event
+	name = "grass"
+	icon = 'code/game/content/factions/derelict/derelict.dmi/derelict_flora.dmi'
+	anchored = 1
+
+/obj/structure/flora/grass/event/sparse_grass1
+	icon_state = "sparsegrass1"
+
+/obj/structure/flora/grass/event/sparse_grass2
+	icon_state = "sparsegrass2"
+
+/obj/structure/flora/grass/event/sparse_grass3
+	icon_state = "sparse_grass3"
+
+/obj/structure/flora/grass/event/full_grass1
+	icon_state = "fullgrass1"
+
+/obj/structure/flora/grass/event/full_grass2
+	icon_state = "fullgrass2"
+
+/obj/structure/flora/grass/event/full_grass3
+	icon_state = "fullgrass3"
+
+/obj/structure/flora/grass/event/leafy_bush1
+	icon_state = "leafybush1"
+
+/obj/structure/flora/grass/event/leafy_bush2
+	icon_state = "leafybush2"
+
+/obj/structure/flora/grass/event/leafy_bush3
+	icon_state = "leafy_bush3"
+
+/obj/structure/flora/grass/event/grassy_bush1
+	icon_state = "grassybush1"
+
+/obj/structure/flora/grass/event/stalky_bush1
+	icon_state = "stalkybush1"
+
+/obj/structure/flora/grass/event/bush1
+	icon_state = "bush1"
+
+/obj/structure/flora/grass/event/reed_bush1
+	icon_state = "reedbush1"
+
+/obj/structure/flora/grass/event/ferny_bush1
+	icon_state = "fernybush1"
+
+/obj/structure/flora/grass/event/sunny_bush1
+	icon_state = "sunnybush1"
+
+/obj/structure/flora/grass/event/generic_bush1
+	icon_state = "genericbush1"
+
+/obj/structure/flora/grass/event/point_bush1
+	icon_state = "pointybush1"
+
+/obj/structure/flora/grass/event/lavender_grass1
+	icon_state = "lavendergrass1"
+
+/obj/structure/flora/grass/event/yellow_flowers1
+	icon_state = "ywflowers1"
+
+/obj/structure/flora/grass/event/bright_flowers1
+	icon_state = "brflowers1"
+
+/obj/structure/flora/grass/event/purple_flowers1
+	icon_state = "ppflowers1"
+