mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 09:05:11 +01:00
9/11
This commit is contained in:
@@ -97,7 +97,7 @@ var/list/lighting_update_overlays = list() // List of lighting overlays queued
|
||||
var/atom/movable/lighting_overlay/O = currentrun_overlays[currentrun_overlays.len]
|
||||
currentrun_overlays.len--
|
||||
|
||||
if (qdeleted(O))
|
||||
if (QDELETED(O))
|
||||
continue
|
||||
|
||||
O.update_overlay()
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
/mob/living/simple_animal/hostile/clockwork/fragment/New()
|
||||
..()
|
||||
SetLuminosity(2,1)
|
||||
set_light(2, 0.1)
|
||||
if(prob(1))
|
||||
name = "anime fragment"
|
||||
desc = "I-it's not like I want to show you the light of the Justiciar or anything, B-BAKA!"
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
/mob/living/simple_animal/hostile/clockwork/marauder/New()
|
||||
..()
|
||||
true_name = pick(possible_true_names)
|
||||
SetLuminosity(2,1)
|
||||
set_light(2, 0.1)
|
||||
|
||||
/mob/living/simple_animal/hostile/clockwork/marauder/Life()
|
||||
..()
|
||||
|
||||
@@ -325,7 +325,7 @@
|
||||
damage *= multiplier
|
||||
duration = max(round(damage * 0.2), 1)
|
||||
..()
|
||||
SetLuminosity(3, 2)
|
||||
set_light(3, 0.2)
|
||||
|
||||
/obj/effect/overlay/temp/ratvar/volt_hit/true/New(loc, caster, multiplier)
|
||||
..()
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
gender = PLURAL //"That's some lava."
|
||||
baseturf = /turf/open/floor/plating/lava //lava all the way down
|
||||
slowdown = 2
|
||||
light_range = 1
|
||||
var/static/list/safeties_typecache = list(/obj/structure/lattice/catwalk)
|
||||
//if anything matching this typecache is found in the lava, we don't burn things
|
||||
|
||||
|
||||
@@ -558,3 +558,5 @@ var/next_external_rsc = 0
|
||||
CRASH("change_view called without argument.")
|
||||
|
||||
view = new_size
|
||||
if (mob.hud_used)
|
||||
mob.hud_used.lighting_backdrop.update_size(new_size)
|
||||
|
||||
@@ -54,28 +54,10 @@
|
||||
user.update_inv_head() //So the mob overlay updates
|
||||
|
||||
if(on)
|
||||
turn_on(user)
|
||||
set_light(brightness_on)
|
||||
else
|
||||
turn_off(user)
|
||||
set_light(0)
|
||||
|
||||
for(var/X in actions)
|
||||
var/datum/action/A=X
|
||||
A.UpdateButtonIcon()
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/pickup(mob/user)
|
||||
..()
|
||||
if(on)
|
||||
user.AddLuminosity(brightness_on)
|
||||
SetLuminosity(0)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/dropped(mob/user)
|
||||
..()
|
||||
if(on)
|
||||
user.AddLuminosity(-brightness_on)
|
||||
SetLuminosity(brightness_on)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/proc/turn_on/(mob/user)
|
||||
user.AddLuminosity(brightness_on)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/proc/turn_off/(mob/user)
|
||||
user.AddLuminosity(-brightness_on)
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
// Creates or destroys it if needed, makes it update values, makes sure it's got the correct source turf...
|
||||
/atom/proc/update_light()
|
||||
set waitfor = FALSE
|
||||
if (qdeleted(src))
|
||||
if (QDELETED(src))
|
||||
return
|
||||
|
||||
if (!light_power || !light_range) // We won't emit light anyways, destroy the light source.
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
T.luminosity = 1
|
||||
|
||||
..()
|
||||
return QDEL_HINT_PUTINPOOL
|
||||
return QDEL_HINT_QUEUE
|
||||
|
||||
else
|
||||
return QDEL_HINT_LETMELIVE
|
||||
@@ -53,10 +53,10 @@
|
||||
var/turf/T = loc
|
||||
if (!istype(T)) // Erm...
|
||||
if (loc)
|
||||
warning("A lighting overlay realised its loc was NOT a turf (actual loc: [loc], [loc.type]) in update_overlay() and got pooled!")
|
||||
warning("A lighting overlay realised its loc was NOT a turf (actual loc: [loc], [loc.type]) in update_overlay()!")
|
||||
|
||||
else
|
||||
warning("A lighting overlay realised it was in nullspace in update_overlay() and got pooled!")
|
||||
warning("A lighting overlay realised it was in nullspace in update_overlay()!")
|
||||
|
||||
qdel(src, TRUE)
|
||||
return
|
||||
@@ -109,8 +109,3 @@
|
||||
/atom/movable/lighting_overlay/forceMove(atom/destination, var/no_tp=FALSE, var/harderforce = FALSE)
|
||||
if(harderforce)
|
||||
. = ..()
|
||||
|
||||
/atom/movable/lighting_overlay/ResetVars(...)
|
||||
color = LIGHTING_BASE_MATRIX
|
||||
|
||||
return ..("color")
|
||||
|
||||
@@ -13,4 +13,4 @@
|
||||
if (!IS_DYNAMIC_LIGHTING(A))
|
||||
continue
|
||||
|
||||
PoolOrNew(/atom/movable/lighting_overlay, list(T, TRUE))
|
||||
new/atom/movable/lighting_overlay(T, TRUE)
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
if (!lighting_corners_initialised)
|
||||
generate_missing_corners()
|
||||
|
||||
PoolOrNew(/atom/movable/lighting_overlay, src)
|
||||
new/atom/movable/lighting_overlay(src)
|
||||
|
||||
for (var/datum/lighting_corner/C in corners)
|
||||
if (!C.active) // We would activate the corner, calculate the lighting for it.
|
||||
@@ -68,7 +68,7 @@
|
||||
/turf/proc/is_softly_lit()
|
||||
if (!lighting_overlay)
|
||||
return FALSE
|
||||
|
||||
|
||||
return !lighting_overlay.luminosity
|
||||
|
||||
// Can't think of a good name, this proc will recalculate the has_opaque_atom variable.
|
||||
|
||||
@@ -850,11 +850,11 @@
|
||||
|
||||
/obj/item/organ/eyes/robotic/flashlight/Insert(var/mob/living/carbon/M, var/special = 0)
|
||||
..()
|
||||
M.AddLuminosity(15)
|
||||
set_light(15)
|
||||
|
||||
|
||||
/obj/item/organ/eyes/robotic/flashlight/Remove(var/mob/living/carbon/M, var/special = 0)
|
||||
M.AddLuminosity(-15)
|
||||
set_light(-15)
|
||||
..()
|
||||
|
||||
// Welding shield implant
|
||||
@@ -865,4 +865,4 @@
|
||||
flash_protect = 2
|
||||
|
||||
/obj/item/organ/eyes/robotic/shield/emp_act(severity)
|
||||
return
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user