Small fixes and ports discovered during merge. (#5138)

* POLARIS: No string compare for assistants

* POLARIS: Move these planes to more useful places

* POLARIS: Only spam ghosts with chat messages from things with real clients

* Fix small forgotten lines of text accidentally left out of VS syncs.

* Fix typo'd plane in lighting.dm and remove redundant definitions.
This commit is contained in:
Leshana
2018-04-04 17:35:15 -07:00
committed by Atermonera
parent cdf794950e
commit 8c3e41a705
7 changed files with 20 additions and 14 deletions
@@ -94,7 +94,7 @@
if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age))
. += "<del>[rank]</del></td><td> \[MINIMUM CHARACTER AGE: [job.minimum_character_age]]</td></tr>"
continue
if((pref.job_civilian_low & ASSISTANT) && job.flag != ASSISTANT)
if((pref.job_civilian_low & ASSISTANT) && job.type != /datum/job/assistant)
. += "<font color=grey>[rank]</font></td><td></td></tr>"
continue
if((rank in command_positions) || (rank == "AI"))//Bold head jobs
@@ -106,7 +106,7 @@
. += "<a href='?src=\ref[src];set_job=[rank]'>"
if(job.flag == ASSISTANT)//Assistant is special
if(job.type == /datum/job/assistant)//Assistant is special
if(pref.job_civilian_low & ASSISTANT)
. += " <font color=55cc55>\[Yes]</font>"
else
@@ -180,7 +180,7 @@
if(!job)
return 0
if(job.flag == ASSISTANT)
if(job.type == /datum/job/assistant)
if(pref.job_civilian_low & job.flag)
pref.job_civilian_low &= ~job.flag
else
+1 -1
View File
@@ -29,7 +29,7 @@
var/turf/T = get_turf(src)
if(!T) return
var/list/in_range = get_mobs_and_objs_in_view_fast(T,range,2)
var/list/in_range = get_mobs_and_objs_in_view_fast(T,range,2,remote_ghosts = client ? TRUE : FALSE)
var/list/m_viewers = in_range["mobs"]
var/list/o_viewers = in_range["objs"]
@@ -756,6 +756,9 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
//update whether handcuffs appears on our hud.
/mob/living/carbon/proc/update_hud_handcuffed()
if(QDESTROYING(src))
return
if(hud_used && hud_used.l_hand_hud_object && hud_used.r_hand_hud_object)
hud_used.l_hand_hud_object.update_icon()
hud_used.r_hand_hud_object.update_icon()
+1 -1
View File
@@ -292,7 +292,7 @@ proc/get_radio_key_from_channel(var/channel)
sound_vol *= 0.5
//Obtain the mobs and objects in the message range
var/list/results = get_mobs_and_objs_in_view_fast(T, world.view)
var/list/results = get_mobs_and_objs_in_view_fast(T, world.view, remote_ghosts = client ? TRUE : FALSE)
listening = results["mobs"]
listening_obj = results["objs"]
else
@@ -156,6 +156,7 @@
/mob/living/simple_animal/cat/fluff/Runtime
name = "Runtime"
desc = "Her fur has the look and feel of velvet, and her tail quivers occasionally."
tt_desc = "Felis medicalis"
gender = FEMALE
icon_state = "cat"
item_state = "cat"
+5 -4
View File
@@ -16,7 +16,7 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "tube-construct-stage1"
anchored = 1
plane = MOB_LAYER
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
var/stage = 1
var/fixture_type = "tube"
@@ -133,8 +133,6 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "bulb-construct-stage1"
anchored = 1
plane = MOB_LAYER
layer = ABOVE_MOB_LAYER
stage = 1
fixture_type = "bulb"
sheets_refunded = 1
@@ -145,6 +143,8 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "flamp-construct-stage1"
anchored = 0
plane = OBJ_PLANE
layer = OBJ_LAYER
stage = 1
fixture_type = "flamp"
sheets_refunded = 2
@@ -157,7 +157,7 @@
icon_state = "tube1"
desc = "A lighting fixture."
anchored = 1
plane = MOB_LAYER
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
use_power = 2
idle_power_usage = 2
@@ -194,6 +194,7 @@
fitting = "bulb"
brightness_range = 5
brightness_power = 2
plane = OBJ_PLANE
layer = OBJ_LAYER
brightness_color = "#FFF4E5"
desc = "A floor lamp."