diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 1280012d307..e775c2cf9dd 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -344,7 +344,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() circuitboard = "/obj/item/circuitboard/telecomms/relay" netspeed = 5 long_range_link = 1 - var/broadcasting = 1 + var/broadcasting = TRUE var/receiving = 1 /obj/machinery/telecomms/relay/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index ebf0e13c4a7..ba1ee6bc4e8 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -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" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 0864032c254..f8f042eab02 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -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 diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index a9e7f8b05bf..1153f0cb78b 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -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" diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 2a13c2b22c1..a595c38c7cb 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -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() diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index fd35d941a06..74101d16299 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -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 ..() \ No newline at end of file + return ..() diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index b3c4f666598..7b1bf582c7c 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -6,7 +6,7 @@ pickup_sound = 'sound/items/pickup/component.ogg' origin_tech = list(TECH_MAGNET = 1) matter = list(DEFAULT_WALL_MATERIAL = 500, MATERIAL_GLASS = 50) - var/listening = 0 + var/listening = FALSE var/recorded //the activation message /obj/item/device/assembly/voice/New() @@ -20,7 +20,7 @@ /obj/item/device/assembly/voice/hear_talk(mob/living/M as mob, msg) if(listening) recorded = msg - listening = 0 + listening = FALSE var/turf/T = get_turf(src) //otherwise it won't work in hand T.visible_message("\icon[src] beeps, \"Activation message is '[recorded]'.\"") else @@ -43,4 +43,4 @@ /obj/item/device/assembly/voice/toggle_secure() . = ..() - listening = 0 + listening = FALSE diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 99bacb8e628..c8c4fcba194 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -147,7 +147,7 @@ New() ..() radio = new(src)//Spawns a radio inside the MMI. - radio.broadcasting = 1//So it's broadcasting from the start. + radio.broadcasting = TRUE//So it's broadcasting from the start. verb//Allows the brain to toggle the radio functions. Toggle_Broadcasting() @@ -187,4 +187,4 @@ brainmob.emp_damage += rand(10,20) if(3) brainmob.emp_damage += rand(0,10) - ..() \ No newline at end of file + ..() diff --git a/html/changelogs/wezzy_intercombuttons.yml b/html/changelogs/wezzy_intercombuttons.yml new file mode 100644 index 00000000000..75b26963c9d --- /dev/null +++ b/html/changelogs/wezzy_intercombuttons.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Intercom buttons are red when off (but still powered)." diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 94105c5e3a3..7aad9d46244 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index b3f2cf9eda2..a470a48f3ec 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -2493,7 +2493,7 @@ /area/syndicate_mothership/control) "akn" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; name = "Syndicate Ops Intercom"; @@ -2558,10 +2558,10 @@ /area/syndicate_mothership/elite_squad) "akz" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; - listening = 0; + listening = FALSE; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1; @@ -6111,10 +6111,10 @@ /area/centcom/specops) "avV" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -6478,7 +6478,7 @@ name = "Hull Door Control" }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; @@ -7643,10 +7643,10 @@ dir = 8 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1443; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -7919,10 +7919,10 @@ /area/centcom/specops) "azU" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index dec2986cfd1..b5f956d0f01 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -6701,7 +6701,7 @@ pixel_x = -27 }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = -27 }, @@ -7520,7 +7520,7 @@ /area/turret_protected/ai) "aou" = ( /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 19 }, @@ -8313,7 +8313,7 @@ pixel_x = -27 }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 19 }, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index e67e0aaba7f..82e59762e60 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -3335,9 +3335,9 @@ /area/security/brig) "agl" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1449; - listening = 0; + listening = FALSE; pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_pump/on{ diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index e5e5859b914..1092ab48c23 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -3755,9 +3755,9 @@ /area/security/training) "hP" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1481; - listening = 0; + listening = FALSE; name = "station intercom (Isolation Room)"; pixel_x = 27 }, diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 4fddf73d9d4..65339fea195 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -3295,9 +3295,9 @@ dir = 8 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_x = -30 }, @@ -4134,9 +4134,9 @@ /area/security/brig) "ahN" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1449; - listening = 0; + listening = FALSE; pixel_y = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4762,9 +4762,9 @@ "aja" = ( /obj/structure/table/standard, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_x = -30 }, @@ -10183,9 +10183,9 @@ "asL" = ( /obj/structure/table/standard, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_y = -30 }, @@ -21785,7 +21785,7 @@ dir = 1 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25 @@ -23170,7 +23170,7 @@ "aSL" = ( /obj/machinery/light/small, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25 @@ -31937,7 +31937,7 @@ name = "tripai" }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 20 }, @@ -31947,7 +31947,7 @@ pixel_y = -26 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_x = -25; pixel_y = -4 @@ -31985,7 +31985,7 @@ pixel_y = 5 }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_x = -27; pixel_y = 4 @@ -31994,7 +31994,7 @@ name = "AI" }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_y = 25 }, @@ -32042,7 +32042,7 @@ name = "tripai" }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 19 }, @@ -32052,7 +32052,7 @@ pixel_y = -26 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_x = 27; pixel_y = -3 @@ -44792,9 +44792,9 @@ /area/medical/psych) "bHh" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1481; - listening = 0; + listening = FALSE; name = "station intercom (Isolation Room)"; pixel_x = 27 }, diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index 9d123c76f85..23d52e77570 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -1639,7 +1639,7 @@ /area/syndicate_mothership/control) "ahq" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; name = "Syndicate Ops Intercom"; @@ -1704,10 +1704,10 @@ /area/syndicate_mothership/elite_squad) "ahR" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; - listening = 0; + listening = FALSE; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1; @@ -5352,10 +5352,10 @@ /area/centcom/specops) "atK" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -6090,10 +6090,10 @@ /area/centcom/specops) "awE" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -7862,7 +7862,7 @@ name = "Hull Door Control" }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; @@ -14224,10 +14224,10 @@ dir = 8 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1443; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 },