Merge pull request #1 from ToonClyde/cumcom

Cumcom

_maps/layeniastation.dm

@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/layeniastation.json"

_maps/layeniastation.json

@@ -0,0 +1,11 @@
+{
+    "map_name": "Layenia Station",
+    "map_path": "map_files/LayeniaStation",
+    "map_file": "LayeniaStation.dmm",
+    "shuttles": {
+	    "cargo": "cargo_box",
+	    "ferry": "ferry_fancy",
+	    "whiteship": "whiteship_box",
+	    "emergency": "emergency_box"
+    }
+}

code/datums/components/chasm.dm

@@ -38,7 +38,7 @@
 
 /datum/component/chasm/proc/is_safe()
 	//if anything matching this typecache is found in the chasm, we don't drop things
-	var/static/list/chasm_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile))
+	var/static/list/chasm_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/lattice, /obj/structure/stone_tile))
 
 	var/atom/parent = src.parent
 	var/list/found_safeties = typecache_filter_list(parent.contents, chasm_safeties_typecache)

code/game/area/areas/layenia.dm

@@ -0,0 +1,25 @@
+area/layenia
+	name = "Layenia"
+	icon_state = "mining"
+	has_gravity = STANDARD_GRAVITY
+	blob_allowed = FALSE
+	requires_power = TRUE
+	outdoors = TRUE
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+	ambientsounds = MINING
+
+area/layenia/cloudlayer
+	name = "Laneya clouds"
+	icon_state = "space"
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+
+area/layenia/powered
+	name = "Layenia Powered"
+	icon_state = "centcom"
+	requires_power = FALSE
+	has_gravity = STANDARD_GRAVITY
+	noteleport = FALSE
+	blob_allowed = TRUE
+	flags_1 = NONE
+	outdoors = FALSE
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED

code/game/objects/structures/lattice.dm

@@ -15,6 +15,7 @@
 	/turf/closed/wall,
 	/obj/structure/falsewall)
 	smooth = SMOOTH_MORE
+	obj_flags = BLOCK_Z_FALL
 	//	flags = CONDUCT_1
 
 /obj/structure/lattice/examine(mob/user)

code/game/turfs/open.dm

@@ -92,6 +92,22 @@
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
 	tiled_dirt = FALSE
 
+/turf/open/indestructible/layenia/crystal
+	name = "Lattice Crystal"
+	desc = "A glowing azure crystal, with strange properties to make things float."
+	icon = 'icons/turf/floors/crystal_floor.dmi'
+	baseturfs = /turf/open/indestructible/layenia/crystal
+	slowdown = 1
+	light_range = 4
+	light_power = 0.5
+	barefootstep = FOOTSTEP_HARD_BAREFOOT
+	clawfootstep = FOOTSTEP_HARD_CLAW
+	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+	light_color = LIGHT_COLOR_BLUE
+	initial_gas_mix = FROZEN_ATMOS
+	smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
+	canSmoothWith = list(/turf/open/indestructible/layenia/crystal)
+
 /turf/open/indestructible/necropolis
 	name = "necropolis floor"
 	desc = "It's regarding you suspiciously."

code/game/turfs/simulated/chasm.dm

@@ -115,3 +115,13 @@
 	var/turf/T = safepick(get_area_turfs(/area/fabric_of_reality))
 	if(T)
 		set_target(T)
+
+/turf/open/chasm/cloud
+	gender = PLURAL
+	name = "hazy clouds"
+	desc = "Clouds as far as the eye can see... Or is it just fog? Best not fall into it."
+	icon = 'icons/turf/floors/cloud_chasm.dmi'
+	baseturfs = /turf/open/chasm/cloud
+	light_range = 5
+	light_power = 0.45
+	light_color = LIGHT_COLOR_WHITE

code/game/turfs/simulated/floor/plating/asteroid.dm

@@ -363,3 +363,37 @@
 /turf/open/floor/plating/asteroid/snow/atmosphere
 	initial_gas_mix = FROZEN_ATMOS
 	planetary_atmos = FALSE
+
+//Layenia stuff
+
+/turf/open/floor/plating/asteroid/layenia
+	gender = PLURAL //trans rights
+	name = "Crimson Rock"
+	desc = "A cold rock, rusted scarlet in color."
+	icon = 'icons/turf/floors.dmi'
+	baseturfs = /turf/open/floor/plating/asteroid/layenia
+	icon_state = "layenia"
+	icon_plating = "layenia"
+	initial_gas_mix = FROZEN_ATMOS
+	slowdown = 2
+	environment_type = "layenia"
+	flags_1 = NONE
+	planetary_atmos = TRUE
+	burnt_states = null
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null
+	digResult = /obj/item/stack/ore/glass/basalt
+	floor_variance = 50
+	light_range = 2
+	light_power = 0.15
+	light_color = LIGHT_COLOR_WHITE
+
+
+/turf/open/floor/plating/asteroid/layenia/Initialize()
+	. = ..()
+	set_layenia_light(src)
+
+/proc/set_layenia_light(turf/open/floor/B)
+	switch(B.icon_state)
+		if("layenia5", "layenia6")
+			B.set_light(2, 0.6, LIGHT_COLOR_BLUE) //more light

code/modules/mapping/mapping_helpers/baseturf.dm

@@ -64,6 +64,14 @@
 	name = "asteroid snow baseturf editor"
 	baseturf = /turf/open/floor/plating/asteroid/snow
 
+/obj/effect/baseturf_helper/asteroid/layenia
+	name = "layenia baseturf editor"
+	baseturf = /turf/open/floor/plating/asteroid/layenia
+
+/obj/effect/baseturf_helper/cloud
+	name = "cloud baseturf editor"
+	baseturf = /turf/open/chasm/cloud
+
 /obj/effect/baseturf_helper/beach/sand
 	name = "beach sand baseturf editor"
 	baseturf = /turf/open/floor/plating/beach/sand

tgstation.dme

@@ -15,7 +15,7 @@
 
 // BEGIN_INCLUDE
 #include "_maps\_basemap.dm"
-#include "_maps\boxstation.dm"
+#include "_maps\layeniastation.dm"
 #include "code\_compile_options.dm"
 #include "code\world.dm"
 #include "code\__DEFINES\_globals.dm"
@@ -553,6 +553,7 @@
 #include "code\game\area\areas\away_content.dm"
 #include "code\game\area\areas\centcom.dm"
 #include "code\game\area\areas\holodeck.dm"
+#include "code\game\area\areas\layenia.dm"
 #include "code\game\area\areas\mining.dm"
 #include "code\game\area\areas\shuttles.dm"
 #include "code\game\area\areas\ruins\_ruins.dm"