mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 18:44:48 +01:00
Changes a lot of lighting colors, ranges, and powers (#28226)
* 8u hiubntgvby9 gb * colors * undo airlock * bluer light * spaghetti review
This commit is contained in:
@@ -28,6 +28,7 @@
|
||||
active_power_consumption = 2500
|
||||
|
||||
light_color = LIGHT_COLOR_CYAN
|
||||
light_power = 0.5
|
||||
|
||||
/obj/machinery/sleeper/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
idle_power_consumption = 1250
|
||||
active_power_consumption = 2500
|
||||
light_color = "#00FF00"
|
||||
light_power = 0.5
|
||||
var/mob/living/carbon/human/occupant
|
||||
///What is the level of the stock parts in the body scanner. A scan_level of one detects organs of stealth_level 1 or below, while a scan level of 4 would detect 4 or below.
|
||||
var/scan_level = 1
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
if(stat & NOPOWER)
|
||||
set_light(0)
|
||||
else
|
||||
set_light(3, 3)
|
||||
set_light(3, 1)
|
||||
|
||||
/obj/machinery/gameboard/update_icon_state()
|
||||
if(stat & NOPOWER)
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
materials = list(MAT_METAL = 200, MAT_GLASS = 100)
|
||||
actions_types = list(/datum/action/item_action/toggle_light)
|
||||
light_color = "#ffffd0"
|
||||
var/on = FALSE
|
||||
var/brightness_on = 4 //luminosity when on
|
||||
var/togglesound = 'sound/weapons/empty.ogg'
|
||||
@@ -127,6 +128,7 @@
|
||||
flags = CONDUCT
|
||||
materials = list()
|
||||
on = TRUE
|
||||
light_color = "#fff4bb"
|
||||
|
||||
/obj/item/flashlight/lamp/examine(mob/user)
|
||||
. = ..()
|
||||
@@ -137,6 +139,7 @@
|
||||
desc = "A classic green-shaded desk lamp."
|
||||
icon_state = "lampgreen"
|
||||
item_state = "lampgreen"
|
||||
light_color = "#AAFFAA"
|
||||
|
||||
/obj/item/flashlight/lamp/green/off
|
||||
on = FALSE
|
||||
@@ -153,6 +156,7 @@
|
||||
desc = "Only a clown would think to make a ghetto banana-shaped lamp. Even has a goofy pullstring."
|
||||
icon_state = "bananalamp"
|
||||
item_state = "bananalamp"
|
||||
light_color = "#f7ff57"
|
||||
|
||||
// FLARES
|
||||
|
||||
|
||||
@@ -2990,7 +2990,7 @@
|
||||
SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Depower all APCs")
|
||||
log_and_message_admins("<span class='notice'>[key_name_admin(usr)] made all areas unpowered</span>", 1)
|
||||
else
|
||||
power_failure()
|
||||
power_failure(TRUE, 100)
|
||||
SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Short out APCs")
|
||||
log_and_message_admins("<span class='notice'>[key_name_admin(usr)] has shorted APCs</span>", 1)
|
||||
if("quickpower")
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
/obj/machinery/atmospherics/unary/cryo_cell/power_change()
|
||||
..()
|
||||
if(!(stat & (BROKEN | NOPOWER)))
|
||||
set_light(2)
|
||||
set_light(1.5, 1, LIGHT_COLOR_CYAN)
|
||||
else
|
||||
set_light(0)
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
current_area.powernet.power_change()
|
||||
log_and_message_admins("Power has been drained from all APCs.")
|
||||
|
||||
/proc/power_failure(announce = TRUE)
|
||||
/proc/power_failure(announce = TRUE, probability = APC_BREAK_PROBABILITY)
|
||||
// skip any APCs that are too critical to disable
|
||||
var/list/skipped_areas_apc = list(
|
||||
/area/station/engineering/engine,
|
||||
@@ -58,7 +58,7 @@
|
||||
if((current_area.type in skipped_areas_apc) || !is_station_level(A.z))
|
||||
continue
|
||||
// if we are going to break this one
|
||||
if(prob(APC_BREAK_PROBABILITY))
|
||||
if(prob(probability))
|
||||
A.apc_short()
|
||||
affected_apc_count++
|
||||
log_and_message_admins("APC Short Out event has shorted out [affected_apc_count] APCs.")
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
layer = MOB_LAYER - 0.1
|
||||
mob_biotypes = MOB_ROBOTIC
|
||||
light_range = 3
|
||||
light_power = 0.5
|
||||
light_color = "#f3ffbb"
|
||||
stop_automated_movement = TRUE
|
||||
wander = FALSE
|
||||
healable = FALSE
|
||||
|
||||
@@ -278,7 +278,7 @@
|
||||
/// Light intensity when in night shift mode
|
||||
var/nightshift_light_power = 0.45
|
||||
/// The colour of the light while it's in night shift mode
|
||||
var/nightshift_light_color = "#FFDDCC"
|
||||
var/nightshift_light_color = "#e0eeff"
|
||||
/// The colour of the light while it's in emergency mode
|
||||
var/bulb_emergency_colour = "#FF3232"
|
||||
|
||||
@@ -299,8 +299,9 @@
|
||||
exposure_icon_state = "circle"
|
||||
base_state = "bulb"
|
||||
brightness_range = 4
|
||||
brightness_color = "#a0a080"
|
||||
brightness_color = "#ffebb0"
|
||||
nightshift_light_range = 4
|
||||
nightshift_light_color = "#ffefa0" // #a0a080
|
||||
light_type = /obj/item/light/bulb
|
||||
deconstruct_type = /obj/machinery/light_construct/small
|
||||
|
||||
@@ -393,12 +394,10 @@
|
||||
break_light_tube(TRUE)
|
||||
if("bulb")
|
||||
brightness_range = 4
|
||||
brightness_color = "#a0a080"
|
||||
if(prob(5))
|
||||
break_light_tube(TRUE)
|
||||
if("floor")
|
||||
brightness_range = 6
|
||||
brightness_color = "#a0a080"
|
||||
if(prob(3))
|
||||
break_light_tube(TRUE)
|
||||
update(FALSE, TRUE, FALSE)
|
||||
@@ -631,9 +630,12 @@
|
||||
to_chat(user, "<span class='notice'>You insert [L].</span>")
|
||||
switchcount = L.switchcount
|
||||
rigged = L.rigged
|
||||
brightness_range = L.brightness_range
|
||||
brightness_power = L.brightness_power
|
||||
brightness_color = L.brightness_color
|
||||
if(L.brightness_range)
|
||||
brightness_range = L.brightness_range
|
||||
if(L.brightness_power)
|
||||
brightness_power = L.brightness_power
|
||||
if(L.brightness_color)
|
||||
brightness_color = L.brightness_color
|
||||
lightmaterials = L.materials
|
||||
on = has_power()
|
||||
update(TRUE, TRUE, FALSE)
|
||||
@@ -769,7 +771,7 @@
|
||||
update_icon()
|
||||
return
|
||||
emergency_mode = TRUE
|
||||
set_light(3, 1.7, bulb_emergency_colour)
|
||||
set_light((fitting == "tube" ? 3 : 2), 1, bulb_emergency_colour)
|
||||
update_icon()
|
||||
RegisterSignal(machine_powernet, COMSIG_POWERNET_POWER_CHANGE, PROC_REF(update), override = TRUE)
|
||||
|
||||
@@ -1037,7 +1039,6 @@
|
||||
base_state = "ltube"
|
||||
item_state = "c_tube"
|
||||
brightness_range = 8
|
||||
brightness_color = "#ffffff"
|
||||
|
||||
/obj/item/light/tube/large
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
@@ -1057,7 +1058,6 @@
|
||||
base_state = "lbulb"
|
||||
item_state = "contvapour"
|
||||
brightness_range = 5
|
||||
brightness_color = "#a0a080"
|
||||
|
||||
/obj/item/light/throw_impact(atom/hit_atom)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user