Merge pull request #11489 from Markolie/lighting

Lighting fixes
This commit is contained in:
Fox McCloud
2019-05-08 16:17:12 -04:00
committed by GitHub
3 changed files with 10 additions and 12 deletions
@@ -629,6 +629,8 @@ It'll return null if the organ doesn't correspond, so include null checks when u
return has_organ[organ_slot]
/datum/species/proc/update_sight(mob/living/carbon/human/H)
H.sight = initial(H.sight)
var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
if(eyes)
H.sight |= eyes.vision_flags
@@ -636,7 +638,6 @@ It'll return null if the organ doesn't correspond, so include null checks when u
H.see_invisible = eyes.see_invisible
H.lighting_alpha = eyes.lighting_alpha
else
H.sight = initial(H.sight)
H.see_in_dark = initial(H.see_in_dark)
H.see_invisible = initial(H.see_invisible)
H.lighting_alpha = initial(H.lighting_alpha)
+1 -1
View File
@@ -211,7 +211,7 @@
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
see_in_dark = 8
see_invisible = SEE_INVISIBLE_OBSERVER
sync_lighting_plane_alpha()
+7 -10
View File
@@ -14,19 +14,16 @@
loc = locate(1,1,1)
lastarea = loc
client.screen = list() // Remove HUD items just in case.
client.images = list()
if(!hud_used)
create_mob_hud()
if(hud_used)
hud_used.show_hud(hud_used.hud_version)
sight |= SEE_TURFS
GLOB.player_list |= src
/*
var/list/watch_locations = list()
for(var/obj/effect/landmark/landmark in GLOB.landmarks_list)
if(landmark.tag == "landmark*new_player")
watch_locations += landmark.loc
if(watch_locations.len>0)
loc = pick(watch_locations)
*/
callHook("mob_login", list("client" = client, "mob" = src))
new_player_panel()