Fix map and sierra light

SierraBay · Sep 29, 2023 · e2a97d9 · e2a97d9
1 parent ecb294c
commit e2a97d9
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 50 deletions.
diff --git a/maps/sierra/sierra_security_state.dm b/maps/sierra/sierra_security_state.dm
@@ -27,9 +27,8 @@
 /singleton/security_level/default/sierradept/code_green
 	name = "code green"
 
-	light_max_bright = 0.25
-	light_inner_range = 0.1
-	light_outer_range = 1
+	light_range = 2
+	light_power = 1
 	light_color_alarm = COLOR_GREEN
 	light_color_status_display = COLOR_GREEN
 
@@ -51,9 +50,8 @@
 	name = "code purple"
 	alarm_level = "on"
 
-	light_max_bright = 0.25
-	light_inner_range = 1
-	light_outer_range = 2
+	light_range = 2
+	light_power = 1
 	light_color_alarm = COLOR_VIOLET
 	light_color_status_display = COLOR_VIOLET
 
@@ -83,9 +81,8 @@
 	name = "code orange"
 	alarm_level = "on"
 
-	light_max_bright = 0.25
-	light_inner_range = 1
-	light_outer_range = 2
+	light_range = 2
+	light_power = 1
 	light_color_alarm = COLOR_ORANGE
 	light_color_status_display = COLOR_ORANGE
 	overlay_alarm = "alarm_orange"
@@ -114,9 +111,8 @@
 	name = "code blue"
 	alarm_level = "on"
 
-	light_max_bright = 0.5
-	light_inner_range = 1
-	light_outer_range = 2
+	light_range = 4
+	light_power = 2
 	light_color_alarm = COLOR_BLUE
 	light_color_status_display = COLOR_BLUE
 	overlay_alarm = "alarm_blue"
@@ -142,9 +138,8 @@
 	name = "code red"
 	alarm_level = "on"
 
-	light_max_bright = 0.5
-	light_inner_range = 1
-	light_outer_range = 2
+	light_range = 4
+	light_power = 2
 	light_color_alarm = COLOR_RED
 	light_color_status_display = COLOR_RED
 	overlay_alarm = "alarm_red"
@@ -177,9 +172,8 @@
 	name = "code delta"
 	alarm_level = "on"
 
-	light_max_bright = 0.7
-	light_inner_range = 1
-	light_outer_range = 3
+	light_range = 4
+	light_power = 2
 	light_color_alarm = COLOR_RED
 	light_color_status_display = COLOR_NAVY_BLUE
 

diff --git a/maps/sierra/structures/signs.dm b/maps/sierra/structures/signs.dm
@@ -27,7 +27,7 @@
 
 	levitation_sound = GLOB.sound_player.PlayLoopingSound(src, "\ref[src]", 'maps/sierra/structures/memorial/levitation_sound.ogg', 35, 6)
 
-	set_light(0.8, 2, 5, 2, COLOR_TEAL)
+	set_light(2, 0.8, COLOR_TEAL)
 
 	desc = "You see a holographic sign that says: 'Model of N.S.V. Sierra - Modified Mako Class'"
 	description = {"<div style="max-width: 480px; margin: 12px auto;"><div style="border: 1px solid #4e9bcf; padding: 20px; color: #4e9bcf; margin-bottom: 10px; font-family: monospace;"><div style="font-size: 14px; text-align: center; font-weight: bold;"><div>N.S.V. Sierra - Modified Mako Class</div><div>NanoTrasen Registry 3525 - Blume Ship Yards.</div></div><hr style="border-color: #4e9bcf;"><div style="font-style: italic; text-align: center;"><div>Earth - Fourth Vessel To Bear The Name</div><div>Launched [GLOB.using_map.game_year - 12] - Sol Central Government</div><div>"Travels to the abyss always pays off"</div></div><hr style="border-color: #4e9bcf;"><div>Special thanks to the engineers of section '#2179-INF'.<br><br>Adjustment Engineers: [developers] for invaluable contributions to the development of the NSV Sierra.</div></div><div class="notice">Next comes an extremely long list of names and job titles, as well as a photograph of the team of engineers responsible for building this ship.</div></div>"}

diff --git a/maps/using.dm b/maps/using.dm
@@ -1,15 +1,5 @@
 //Easily change which map to build by uncommenting ONE below.
 
-<<<<<<< ours
-<<<<<<< ours
 //#include "example\map.dm"
 //#include "torch\map.dm"
 #include "sierra\map.dm"
-=======
-#include "example\map.dm"
-//#include "torch\map.dm"
->>>>>>> theirs
-=======
-//#include "example\map.dm"
-#include "torch\map.dm"
->>>>>>> theirs
diff --git a/mods/atmos_ret_field/code/atmospheric_retention_field.dm b/mods/atmos_ret_field/code/atmospheric_retention_field.dm
@@ -209,9 +209,8 @@
 	atmos_canpass = CANPASS_NEVER
 	var/basestate = "arfg_field"
 
-	light_inner_range = 1
-	light_outer_range = 13
-	light_max_bright = 0.5
+	light_range = 13
+	light_power = 2
 	light_color = "#ffffff"
 
 /obj/structure/atmospheric_retention_field/on_update_icon()

diff --git a/mods/gravity_generator/code/base.dm b/mods/gravity_generator/code/base.dm
@@ -415,16 +415,16 @@
 			set_light(0)
 		if(21 to 40)
 			overlay_state = "startup"
-			set_light(0.2, l_outer_range = 4, l_color = "#6496fa")
+			set_light(4, 0.2, "#6496fa")
 		if(41 to 60)
 			overlay_state = "idle"
-			set_light(0.5, l_outer_range = 6, l_color = "#7d9bff")
+			set_light(6, 0.5, "#7d9bff")
 		if(61 to 80)
 			overlay_state = "activating"
-			set_light(0.8, l_outer_range = 6, l_color = "#7dc3ff")
+			set_light(6, 0.8, "#7dc3ff")
 		if(81 to 100)
 			overlay_state = "activated"
-			set_light(1,l_outer_range = 8, l_color = "#7de1e1")
+			set_light(8, 1, "#7de1e1")
 
 	if(middle)
 		middle.ClearOverlays()

diff --git a/packs/infinity/items/modular_computer.dm b/packs/infinity/items/modular_computer.dm
@@ -44,7 +44,7 @@
 		AddOverlays(overlay_image(_screen_overlay.icon, _screen_overlay.icon_state, flags = RESET_COLOR))
 
 	if(enabled)
-		set_light(0.2, 0.1, light_strength, l_color = (bsod || os.updating) ? "#0000ff" : light_color)
+		set_light(light_strength, 0.2, l_color = (bsod || os.updating) ? "#0000ff" : light_color)
 
 	if(enabled && os)
 		var/image/_screen_overlay = os.get_screen_overlay()

diff --git a/packs/infinity/machinery/heater.dm b/packs/infinity/machinery/heater.dm
@@ -13,10 +13,10 @@
 		set_light(0)
 	else if(active > 0)
 		icon_state = "stheater-heat"
-		set_light(0.7, 1, 2, 3, COLOR_SEDONA)
+		set_light(3, 0.7, COLOR_SEDONA)
 	else if(active < 0)
 		icon_state = "stheater-cool"
-		set_light(0.7, 1, 2, 3, COLOR_DEEP_SKY_BLUE)
+		set_light(3, 0.7, COLOR_DEEP_SKY_BLUE)
 	else
 		icon_state = "stheater-standby"
 		set_light(0)

diff --git a/packs/infinity/machinery/lighting.dm b/packs/infinity/machinery/lighting.dm
@@ -9,8 +9,7 @@
 	base_state = "big_tape"
 	item_state = null
 
-	b_inner_range = 1
-	b_outer_range = 2
+	b_range = 2
 	b_colour = LIGHT_DEFAULT_LED_NEON
 
 	random_tone = FALSE
@@ -47,8 +46,7 @@
 /obj/item/light/led_neon/large
 	base_state = "big_tape"
 	icon_state = "big_tape_preset"
-	b_inner_range = 2
-	b_outer_range = 4
+	b_range = 4
 
 /obj/item/light/led_neon/small
 	base_state = "small_tape"

diff --git a/packs/infinity/structures/holoplants.dm b/packs/infinity/structures/holoplants.dm
@@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(recomended_holoplants_colors, list(COLOR_PALE_RED_GRAY,COLOR_BL
 
 	if(enabled)
 		AddOverlays(plant)
-	set_light(brightness_on, l_outer_range = 1, l_color = plant_color)
+	set_light(1, brightness_on, plant_color)
 
 /obj/structure/holoplant/proc/change_plant(state)
 	plant = prepare_icon(state)
@@ -116,19 +116,19 @@ GLOBAL_LIST_INIT(recomended_holoplants_colors, list(COLOR_PALE_RED_GRAY,COLOR_BL
 		return
 	interference = TRUE
 	ClearOverlays()
-	set_light(0, l_outer_range = 0, l_color = plant_color)
+	set_light(0, 0, l_color = plant_color)
 	sleep(3)
 	if(QDELETED(src))
 		return
 
 	AddOverlays(plant)
-	set_light(brightness_on, l_outer_range = 1, l_color = plant_color)
+	set_light(1, brightness_on, l_color = plant_color)
 	sleep(3)
 	if(QDELETED(src))
 		return
 
 	CutOverlays(plant)
-	set_light(0, l_outer_range = 0, l_color = plant_color)
+	set_light(0, 0, l_color = plant_color)
 	sleep(3)
 	if(QDELETED(src))
 		return

diff --git a/packs/sierra-tweaks/objects/vehicles/vehicle.dm b/packs/sierra-tweaks/objects/vehicles/vehicle.dm
@@ -11,8 +11,8 @@
 	density = TRUE
 	anchored = TRUE
 	animate_movement=1
-	light_max_bright = 0.7
-	light_outer_range = 3
+	light_power = 0.7
+	light_range = 3
 
 	can_buckle = 1
 	buckle_movable = 1
@@ -188,7 +188,7 @@
 	if(powered && cell.charge < (charge_use * CELLRATE))
 		return 0
 	on = 1
-	set_light(0.8, 1, 5)
+	set_light(5, 0.8)
 	update_icon()
 	return 1