From e2a97d9d6311d3b3268efc54a0ea9e888a36bf1e Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 29 Sep 2023 17:26:02 +0300 Subject: [PATCH] Fix map and sierra light --- maps/sierra/sierra_security_state.dm | 30 ++++++++----------- maps/sierra/structures/signs.dm | 2 +- maps/using.dm | 10 ------- .../code/atmospheric_retention_field.dm | 5 ++-- mods/gravity_generator/code/base.dm | 8 ++--- packs/infinity/items/modular_computer.dm | 2 +- packs/infinity/machinery/heater.dm | 4 +-- packs/infinity/machinery/lighting.dm | 6 ++-- packs/infinity/structures/holoplants.dm | 8 ++--- .../sierra-tweaks/objects/vehicles/vehicle.dm | 6 ++-- 10 files changed, 31 insertions(+), 50 deletions(-) diff --git a/maps/sierra/sierra_security_state.dm b/maps/sierra/sierra_security_state.dm index 640bf63d171e5..bf9cf9d867490 100644 --- 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 index cb8f7ccdc4416..3a3f9070600ad 100644 --- 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 = {"
N.S.V. Sierra - Modified Mako Class
NanoTrasen Registry 3525 - Blume Ship Yards.
Earth - Fourth Vessel To Bear The Name
Launched [GLOB.using_map.game_year - 12] - Sol Central Government
"Travels to the abyss always pays off"
Special thanks to the engineers of section '#2179-INF'.

Adjustment Engineers: [developers] for invaluable contributions to the development of the NSV Sierra.
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.
"} diff --git a/maps/using.dm b/maps/using.dm index 76dcb3d2e26c0..926908a4411b1 100644 --- 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 index 119b75573ac45..8229214286399 100644 --- 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 index 988a2971b198c..3f601c3416d42 100644 --- 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 index d2a72ff871a2b..4416534e7ad16 100644 --- 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 index 8eec35e4af084..3895e3dbbbfcf 100644 --- 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 index 04ce352e927aa..6053096598b64 100644 --- 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 index b66e4138f54cf..ca5043154324c 100644 --- 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 index d6222d4a9f166..b2fc74ab62ed5 100644 --- 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