Merge branch 'RepoStash:dev-sierra' into dev-sierra

maps/torch_fd/fd_torch.dm

@@ -238,6 +238,7 @@
 	// #include "../../mods/_maps/hand/_map_hand.dme" // Тоже зависим от предметов с карты Стража (инклюд над фарфлитом)
 
 		// ~NON-UPSTREAM MODS~ //
+	#include "../../mods/_fd/runechat/_runechat.dme"
 	#include "../../mods/_fd/fd_assets/_fd_assets.dme"
 
 	#include "../../mods/_fd/accent_labels/_accent_labels.dme"

mods/_fd/_maps/snow_cage/code/snow_cage.dm

@@ -10,26 +10,19 @@
 	)
 
 	var/list/lightmain
-	var/list/lightunderground
 
 /obj/overmap/visitable/sector/snow_cage/Initialize()
 	..()
 
 	lightmain = block(locate(world.maxx, world.maxy, max(map_z)), locate(1, 1, min(map_z)))
-	lightunderground = block(locate(world.maxx, world.maxy, max(map_z)), locate(1, 1, min(map_z)))
 	for(var/atom/A as anything in lightmain)
 		if(!istype(A.loc, /area/splanet/outdoors) || A.density || istype(A.loc, /area/splanet/underground))
 			lightmain -= A
-	for(var/atom/A as anything in lightunderground)
-		if(!istype(A.loc, /area/splanet/underground) || A.density || istype(A.loc, /area/splanet/outdoors))
-			lightunderground -= A
 	update_daynight()
 
-/obj/overmap/visitable/sector/snow_cage/proc/update_daynight(light = 0.7, light_color_m = "#5bbbc5",  light_color_s = "#1f538f")
+/obj/overmap/visitable/sector/snow_cage/proc/update_daynight(light = 0.7, light_color_m = "#5bbbc5")
 	for(var/turf/T as anything in lightmain)
-		T.set_light(light, 0.1, 2, l_color = light_color_m)
-	for(var/turf/T as anything in lightunderground)
-		T.set_light(light, 0.1, 2, l_color = light_color_s)
+		T.set_light(1, light, l_color = light_color_m)
 
 /datum/map_template/ruin/away_site/snow_cage
 	name = "arctic planet"

mods/_fd/backgrounds/code/factions_ipc.dm

@@ -34,16 +34,18 @@
 /obj/item/card/id
 	var/ipc_gen = null
 
+/obj/item/card/id/proc/extra_dat()
+	. = list()
+
 /mob/living/carbon/human/set_id_info(obj/item/card/id/id_card)
 	..()
 	if(is_species(SPECIES_IPC))
 		id_card.ipc_gen = get_cultural_value(TAG_FACTION)
 
-/obj/item/card/id/dat()
-	var/list/dat = list("<table><tr><td>")
+/obj/item/card/id/extra_dat()
+	. = ..()
 	if(ipc_gen)
-		dat += text("Registration: []</A><BR>\n", ipc_gen)
-	..()
+		. += "Registration: [ipc_gen]<br>"
 
 /singleton/cultural_info/faction/ipc
 	economic_power = 0.1

mods/_fd/fd_assets/code/structures/decor.dm

@@ -305,7 +305,7 @@
 
 /obj/structure/fd/bs_lamp/Initialize()
 	. = ..()
-	set_light(0.3, 1, 3, 1, COLOR_CYAN)
+	set_light(3, 0.3, l_color = COLOR_CYAN)
 
 /obj/structure/fd/bs_vines
 	name = "bluespace corrupted vines"
@@ -321,7 +321,7 @@
 
 /obj/structure/fd/bs_vines/Initialize()
 	. = ..()
-	set_light(0.3, 1, 2, 1, COLOR_CYAN)
+	set_light(1, 0.3, l_color = COLOR_CYAN)
 
 /obj/structure/fd/bs_vines/user_unbuckle_mob(mob/user)
 	if(buckled_mob && !user.stat && !user.restrained())

mods/_fd/runechat/_runechat.dme

@@ -3,13 +3,9 @@
 
 #include "_runechat.dm"
 
-#include "code/_list_helpers.dm"
-#include "code/atom.dm"
 #include "code/client.dm"
 #include "code/emote.dm"
 #include "code/hear.dm"
 #include "code/message.dm"
-#include "code/renderer.dm"
-#include "code/runechat_message.dm"
 
 #endif

mods/_fd/runechat/code/client.dm

@@ -1,19 +1,3 @@
-/client
-	// Runechat messages
-	var/list/seen_messages
-
-/datum/client_preference/runechat_mob
-	description = "Enable mob runechat"
-	key = "RUNECHAT_MOB"
-	options = list(GLOB.PREF_YES, GLOB.PREF_NO)
-	default_value = GLOB.PREF_YES
-
-/datum/client_preference/runechat_obj
-	description = "Enable obj runechat"
-	key = "RUNECHAT_OBJ"
-	options = list(GLOB.PREF_YES, GLOB.PREF_NO)
-	default_value = GLOB.PREF_YES
-
 /datum/client_preference/runechat_messages_length
 	description = "Length of runechat messages"
 	key = "RUNECHAT_MESSAGES_LENGTH"