Merge pull request #947 from molnizz/cringe24

Add: Night planet types and some fixes

_maps/_mod_celadon/configs/inteq_executer.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"map_name": "Executer-Class laser experiment",
+	"map_name": "Executer-class Laser Experiment",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",
 	"description": "Боевой фрегат класса Палач. Данный корабль обладает большим количеством лазерного вооружения из-за кооперации с Нанотрейзен при создании данного корабля.",

_maps/_mod_celadon/configs/solfed_lightning_bolt.json

@@ -28,7 +28,7 @@
 		},
 		"Assault": {
 			"outfit": "/datum/outfit/job/solgov/bolt/security",
-			"slots": 2
+			"slots": 1
 		},
 		"Stormtrooper": {
 			"outfit": "/datum/outfit/job/solgov/bolt/security",

_maps/_mod_celadon/outpost/elysium_ice.dmm

@@ -4714,19 +4714,12 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/outpost/crew/cryo)
 "jA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/junction/flip{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
 	},
@@ -4738,6 +4731,9 @@
 	},
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned/cargo_one{
 	light_color = "#1B1D2E";
 	light_range = 2

_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm

@@ -525,12 +525,6 @@
 	},
 /turf/open/floor/carpet,
 /area/outpost/crew/library)
-"cb" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-12"
-	},
-/turf/open/space/basic,
-/area/outpost/external)
 "cc" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/industrial/warning{
@@ -905,9 +899,7 @@
 /turf/open/floor/plasteel/dark,
 /area/outpost/security)
 "dx" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-38"
-	},
+/obj/structure/lattice/clockwork,
 /turf/open/space/basic,
 /area/outpost/external)
 "dA" = (
@@ -2026,12 +2018,6 @@
 	},
 /turf/open/floor/plasteel/sepia,
 /area/outpost/crew/canteen)
-"hH" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-3"
-	},
-/turf/open/space/basic,
-/area/outpost/external)
 "hI" = (
 /obj/machinery/computer/atmos_alert{
 	dir = 1
@@ -14373,12 +14359,6 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/plasteel,
 /area/outpost/operations)
-"YE" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-11"
-	},
-/turf/open/space/basic,
-/area/outpost/external)
 "YF" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/coffee{
@@ -27329,7 +27309,7 @@ Zp
 sN
 vV
 vV
-cb
+dx
 Ft
 OP
 wH
@@ -27516,8 +27496,8 @@ Zp
 HY
 Ft
 dx
-YE
-hH
+dx
+dx
 DD
 kc
 sn
@@ -27703,8 +27683,8 @@ Zp
 HY
 HY
 Ft
-hH
-hH
+dx
+dx
 nP
 wB
 vf

code/__DEFINES/overmap.dm

@@ -64,7 +64,11 @@
 	DYNAMIC_WORLD_GAS_GIANT,\
 	DYNAMIC_WORLD_PLASMA_GIANT,\
 	DYNAMIC_WORLD_OLD_TOWN,\
-	DYNAMIC_WORLD_EARTH_SAND)
+	DYNAMIC_WORLD_EARTH_SAND,\
+	DYNAMIC_WORLD_ICE_NIGHT,\
+	DYNAMIC_WORLD_JUNGLE_NIGHT,\
+	DYNAMIC_WORLD_ROCKPLANET_NIGHT,\
+	DYNAMIC_WORLD_BEACHPLANET_NIGHT)
 // [/CELADON-EDIT] - CELADON_CONFIGS_MAPS
 
 //Possible ship states

code/__DEFINES/~mod_celadon/map.dm

@@ -3,3 +3,8 @@
 
 #define RUINTYPE_PLASMA "Plasma"
 #define RUINTYPE_EARTH_SAND "EarthSand"
+
+#define DYNAMIC_WORLD_ICE_NIGHT "ice night"
+#define DYNAMIC_WORLD_JUNGLE_NIGHT "jungle night"
+#define DYNAMIC_WORLD_ROCKPLANET_NIGHT "rockplanet night"
+#define DYNAMIC_WORLD_BEACHPLANET_NIGHT "beachplanet night"

mod_celadon/maps/_configs.dme

@@ -5,11 +5,16 @@
 
 #include "code/mapgen/SandGenerator.dm"
 #include "code/mapgen/PlasmaGenerator.dm"
+#include "code/mapgen/JungleGenerator.dm"
+#include "code/mapgen/SnowGenerator.dm"
+#include "code/mapgen/BeachGenerator.dm"
+#include "code/mapgen/RockGenerator.dm"
 
 #include "code/planet_types.dm"
 #include "code/random_ruins.dm"
 #include "code/subshuttles.dm"
 #include "code/outpost.dm"
+#include "code/turfs_planet.dm"
 #include "code/ruins/ruin.dm"
 
 #endif

mod_celadon/maps/code/mapgen/BeachGenerator.dm

@@ -0,0 +1,203 @@
+/datum/map_generator/planet_generator/beach/night
+	mountain_height = 0.95
+	perlin_zoom = 75
+
+	primary_area_type = /area/overmap_encounter/planetoid/beachplanet
+
+	biome_table = list(
+		BIOME_COLDEST = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/ocean/deep/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/ocean/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/beach/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/beach/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/grass/night
+		),
+		BIOME_COLD = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/ocean/deep/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/ocean/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/beach/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/grass/dense/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/jungle/dense/night
+		),
+		BIOME_WARM = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/ocean/deep/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/ocean/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/beach/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/grass/dense/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/grass/night
+		),
+		BIOME_TEMPERATE = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/ocean/deep/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/ocean/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/beach/dense/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/beach/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/grass/night
+		),
+		BIOME_HOT = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/ocean/deep/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/ocean/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/beach/dense/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/beach/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/grass/night,
+		),
+		BIOME_HOTTEST = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/ocean/deep/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/ocean/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/beach/dense/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/beach/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/grass/night
+		)
+	)
+
+	cave_biome_table = list(
+		BIOME_COLDEST_CAVE = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/cave/beach/cove/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/beach/magical/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/beach/night
+		),
+		BIOME_COLD_CAVE = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/cave/beach/magical/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/beach/cove/night
+		),
+		BIOME_WARM_CAVE = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/beach/magical/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/beach/night
+		),
+		BIOME_HOT_CAVE = list(
+			BIOME_LOWEST_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_LOW_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/beach/night,
+			BIOME_HIGH_HUMIDITY = /datum/biome/cave/beach/cove/night,
+			BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/beach/night
+		)
+	)
+
+/datum/biome/grass/night
+	open_turf_types = list(/turf/open/floor/plating/grass/beach = 1)
+	flora_spawn_list = list(
+		/obj/structure/flora/tree/jungle = 1,
+		/obj/structure/flora/ausbushes/brflowers = 1,
+		/obj/structure/flora/ausbushes/fernybush = 1,
+		/obj/structure/flora/ausbushes/fullgrass = 1,
+		/obj/structure/flora/ausbushes/genericbush = 1,
+		/obj/structure/flora/ausbushes/grassybush = 1,
+		/obj/structure/flora/ausbushes/lavendergrass = 1,
+		/obj/structure/flora/ausbushes/leafybush = 1,
+		/obj/structure/flora/ausbushes/palebush = 1,
+		/obj/structure/flora/ausbushes/pointybush = 1,
+		/obj/structure/flora/ausbushes/ppflowers = 1,
+		/obj/structure/flora/ausbushes/reedbush = 1,
+		/obj/structure/flora/ausbushes/sparsegrass = 1,
+		/obj/structure/flora/ausbushes/stalkybush = 1,
+		/obj/structure/flora/ausbushes/stalkybush = 1,
+		/obj/structure/flora/ausbushes/sunnybush = 1,
+		/obj/structure/flora/ausbushes/ywflowers = 1,
+		/obj/structure/flora/tree/palm = 1,
+		/obj/structure/flora/ash/garden = 1,
+	)
+	flora_spawn_chance = 25
+	mob_spawn_list = list(
+		/mob/living/simple_animal/butterfly = 1,
+		/mob/living/simple_animal/chicken/rabbit/normal = 1,
+		/mob/living/simple_animal/mouse = 1,
+		/mob/living/simple_animal/cow = 1,
+		/mob/living/simple_animal/deer = 1
+	)
+	mob_spawn_chance = 1
+
+/datum/biome/grass/dense/night
+	open_turf_types = list(/turf/open/floor/grass/fairy/beach = 1)
+	flora_spawn_chance = 70
+	mob_spawn_list = list(
+
+		/mob/living/simple_animal/butterfly = 4,
+		/mob/living/simple_animal/hostile/retaliate/poison/snake = 5,
+		/mob/living/simple_animal/hostile/poison/bees = 3,
+	)
+	mob_spawn_chance = 2
+	feature_spawn_chance = 0.1
+
+/datum/biome/beach/night
+	open_turf_types = list(/turf/open/floor/plating/asteroid/sand = 1)
+	mob_spawn_list = list(/mob/living/simple_animal/crab = 7, /mob/living/simple_animal/hostile/asteroid/lobstrosity/beach = 5)
+	mob_spawn_chance = 1
+	flora_spawn_list = list(
+		/obj/structure/flora/tree/palm = 1,
+		/obj/structure/flora/rock/beach = 3,
+		/obj/structure/flora/driftwood = 3,
+		/obj/structure/flora/driftlog = 1,
+		/obj/item/toy/seashell = 1,
+	)
+	flora_spawn_chance = 5
+
+/datum/biome/beach/dense/night
+	open_turf_types = list(/turf/open/floor/plating/asteroid/sand/dense = 1)
+	flora_spawn_list = list(
+		/obj/structure/flora/rock/asteroid = 6,
+		/obj/structure/flora/rock/beach = 2,
+		/obj/structure/flora/driftwood = 6,
+		/obj/item/toy/seashell = 1,
+		/obj/structure/flora/driftlog = 2
+	)
+	flora_spawn_chance = 2
+
+/datum/biome/ocean/night
+	open_turf_types = list(/turf/open/water/beach/nolit = 1)
+	flora_spawn_list = list(
+		/obj/structure/flora/rock/beach = 1,
+		/obj/structure/flora/rock/pile = 1,
+		/obj/structure/flora/ash/garden/seaweed = 1
+	)
+	flora_spawn_chance = 1
+
+/datum/biome/ocean/deep/night
+	open_turf_types = list(/turf/open/water/beach/deep/nolit = 1)
+
+/datum/biome/cave/beach/night
+	open_turf_types = list(/turf/open/floor/plating/asteroid/sand/dense = 1)
+	closed_turf_types = list(/turf/closed/mineral/random/beach = 1)
+	flora_spawn_chance = 4
+	flora_spawn_list = list(/obj/structure/flora/rock/beach = 1, /obj/structure/flora/rock/asteroid = 6)
+	mob_spawn_chance = 1
+	mob_spawn_list = list(
+		/mob/living/simple_animal/hostile/bear/cave = 5,
+		/mob/living/simple_animal/hostile/asteroid/lobstrosity/beach = 1,
+	)
+
+/datum/biome/cave/beach/cove/night
+	open_turf_types = list(/turf/open/floor/plating/asteroid/sand/dense = 1)
+	flora_spawn_list = list(/obj/structure/flora/tree/dead_pine = 1, /obj/structure/flora/rock/beach = 1, /obj/structure/flora/driftwood = 3, /obj/structure/flora/driftlog = 2)
+	flora_spawn_chance = 6
+
+/datum/biome/cave/beach/magical/night
+	open_turf_types = list(/turf/open/floor/grass/fairy/beach = 1)
+	flora_spawn_chance = 20
+	flora_spawn_list = list(
+		/obj/structure/flora/ausbushes/grassybush = 1,
+		/obj/structure/flora/ausbushes/fernybush = 1,
+		/obj/structure/flora/ausbushes/fullgrass = 1,
+		/obj/structure/flora/ausbushes/genericbush = 1,
+		/obj/structure/flora/ausbushes/grassybush = 1,
+		/obj/structure/flora/ausbushes/leafybush = 1,
+		/obj/structure/flora/ausbushes/palebush = 1,
+		/obj/structure/flora/ausbushes/pointybush = 1,
+		/obj/structure/flora/ausbushes/reedbush = 1,
+		/obj/structure/flora/ausbushes/sparsegrass = 1,
+		/obj/structure/flora/ausbushes/stalkybush = 1,
+		/obj/structure/flora/ausbushes/stalkybush = 1,
+		/obj/structure/flora/ausbushes/sunnybush = 1,
+	)
+	mob_spawn_chance = 5
+	mob_spawn_list = list(
+		/mob/living/simple_animal/butterfly = 1,
+		/mob/living/simple_animal/slime/pet = 1,
+		/mob/living/simple_animal/hostile/lightgeist = 1
+	)