Intercom buttons are red when off (but still powered) (#9209)

also replaces listening and broadcast vars that used 1 and 0 to TRUE and FALSE cause it was bugging me
This commit is contained in:
Wowzewow (Wezzy)
2020-06-29 09:40:19 +03:00
committed by GitHub
parent b7bf8a8748
commit f3a83cf97d
16 changed files with 112 additions and 71 deletions
@@ -14,8 +14,8 @@
/obj/item/device/radio/intercom/custom
name = "station intercom (Custom)"
broadcasting = 0
listening = 0
broadcasting = FALSE
listening = FALSE
/obj/item/device/radio/intercom/interrogation
name = "station intercom (Interrogation)"
@@ -31,8 +31,8 @@
/obj/item/device/radio/intercom/department
canhear_range = 5
broadcasting = 0
listening = 1
broadcasting = FALSE
listening = TRUE
/obj/item/device/radio/intercom/department/medbay
name = "station intercom (Medbay)"
@@ -157,7 +157,7 @@
add_overlay(screen_overlays["intercom_l"])
/obj/item/device/radio/intercom/broadcasting
broadcasting = 1
broadcasting = TRUE
/obj/item/device/radio/intercom/locked
var/locked_frequency
@@ -172,8 +172,8 @@
/obj/item/device/radio/intercom/locked/ai_private
name = "\improper AI intercom"
frequency = AI_FREQ
broadcasting = 1
listening = 1
broadcasting = TRUE
listening = TRUE
/obj/item/device/radio/intercom/locked/confessional
name = "confessional intercom"
@@ -35,8 +35,8 @@ var/global/list/default_medbay_channels = list(
var/canhear_range = 3 // the range which mobs can hear this radio from
var/datum/wires/radio/wires = null
var/b_stat = 0
var/broadcasting = 0
var/listening = 1
var/broadcasting = FALSE
var/listening = TRUE
var/list/channels = list() //see communications.dm for full list. First non-common, non-entertainment channel is a "default" for :h
var/subspace_transmission = 0
var/syndie = 0//Holder to see if it's a syndicate encrypted radio
@@ -46,7 +46,7 @@ var/global/list/default_medbay_channels = list(
throw_range = 9
w_class = 2
matter = list(DEFAULT_WALL_MATERIAL = 75, MATERIAL_GLASS = 25)
var/const/FREQ_LISTENING = 1
var/const/FREQ_LISTENING = TRUE
var/list/internal_channels
var/clicksound = "button" //played sound on usage
var/clickvol = 10 //volume
@@ -591,8 +591,8 @@ var/global/list/default_medbay_channels = list(
else return
/obj/item/device/radio/emp_act(severity)
broadcasting = 0
listening = 0
broadcasting = FALSE
listening = FALSE
for (var/ch_name in channels)
channels[ch_name] = 0
..()
@@ -776,13 +776,13 @@ var/global/list/default_medbay_channels = list(
return
/obj/item/device/radio/off
listening = 0
listening = FALSE
/obj/item/device/radio/phone
broadcasting = 0
broadcasting = FALSE
icon = 'icons/obj/radio.dmi'
icon_state = "red_phone"
listening = 1
listening = TRUE
name = "phone"
var/radio_sound = null
+2 -2
View File
@@ -156,9 +156,9 @@
return 0
/obj/item/device/radio/spy
listening = 0
listening = FALSE
frequency = 1473
broadcasting = 0
broadcasting = FALSE
canhear_range = 1
name = "spy device"
icon_state = "syn_cypherkey"
@@ -11,7 +11,7 @@
w_class = 2.0
var/obj/item/implantcase/case = null
var/broadcasting = null
var/listening = 1.0
var/listening = TRUE
proc
update()
@@ -16,7 +16,7 @@
var/temp = null
var/frequency = 1451
var/broadcasting = null
var/listening = 1.0
var/listening = TRUE
flags = CONDUCT
w_class = 2.0
item_state = "electronic"
@@ -233,4 +233,4 @@ Frequency:
if(linked_teleporter?.linked_teleporter == src)
linked_teleporter.linked_teleporter = null
linked_teleporter = null
return ..()
return ..()