Merge pull request TS-Rogue-Star#295 from Very-Soft/moarredgateuwu

Fixes how certain lights work in certain situations, and preps some unfinished stuff
Very-Soft · May 13, 2024 · 6c1e17a · 6c1e17a
2 parents fe10fa7 + d2ae679
commit 6c1e17a
Show file tree

Hide file tree

Showing 7 changed files with 20,328 additions and 1 deletion.
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
@@ -140,6 +140,7 @@
 	icon = 'icons/effects/light_overlays/light_32.dmi'
 	icon_state = "light"
 	plane = PLANE_O_LIGHTING_VISUAL
+	layer = 999		//RS ADD
 	appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	alpha = 0
@@ -157,6 +158,7 @@
 	icon = 'icons/effects/light_overlays/light_cone.dmi'
 	icon_state = "light"
 	plane = PLANE_O_LIGHTING_VISUAL
+	layer = 999		//RS ADD
 	appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	vis_flags = NONE

diff --git a/code/modules/lighting/lighting_fake_sun_vr.dm b/code/modules/lighting/lighting_fake_sun_vr.dm
@@ -217,3 +217,17 @@ var/static/list/fake_sunlight_zs = list()
 			"color" = "#1c49ff"
 		)
 	)
+
+//RS ADD START
+/obj/effect/fake_sun/gloom
+	name = "gloomy fake sun"
+	do_weather = TRUE
+	weather_visuals_icon = 'icons/effects/weather.dmi'
+	weather_visuals_icon_state = "fog"
+	possible_light_setups = list(
+		list(
+			"brightness" = 1,
+			"color" = "#8627b3"
+		)
+	)
+//RS ADD END
diff --git a/code/modules/mob/dead/corpse.dm b/code/modules/mob/dead/corpse.dm
@@ -107,7 +107,6 @@
 	M.real_name = generateCorpseName()
 	M.set_stat(DEAD) //Kills the new mob
 	if(corpsesynthtype > 0)
-		to_world("Synth")
 		if(!corpsesynthbrand)
 			corpsesynthbrand = "Unbranded"
 		for(var/obj/item/organ/external/O in M.organs)

diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm
@@ -246,3 +246,24 @@
 
 /obj/machinery/light/small/torch/attackby()
 	return
+
+//RS ADD START
+
+/obj/light_object/torch
+	icon = 'icons/obj/lighting_vr.dmi'
+	name = "wall torch"
+	icon_state = "torch1"
+	desc = "A small torch held in a wall sconce."
+	anchored = TRUE
+	density = FALSE
+
+	light_system = MOVABLE_LIGHT
+	light_range = 6 // Pretty bright.
+	light_power = 1
+	light_color = "#fabf87"
+
+/obj/light_object/torch/Initialize(mapload)
+	. = ..()
+	set_light_on(TRUE)
+
+//RS ADD END
diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm
@@ -224,6 +224,7 @@
 		"Fantasy Town" = list("Redgate - Fantasy Dungeon", "Redgate - Fantasy Town"),
 		"Snowglobe" = list("Redgate - Snowglobe"),
 		"Pet Island" = list("Redgate - Pet Island")
+//		"North Star" = list("Redgate - North Star") // Not ready yet
 		)
 
 	lateload_gb_north = list(

diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm
@@ -337,6 +337,11 @@
 	desc = "A cozy island with a bunch of potential pets on it!"
 	mappath = 'maps/redgate/petisland.dmm'
 
+/datum/map_template/common_lateload/redgate/northstar
+	name = "Redgate - North Star"
+	desc = "A mysterious gloomy land."
+	mappath = 'maps/redgate/da2ns.dmm'
+
 // RS EDIT END
 
 //////////////////////////////////////////////////////////////////////////////////////