Skip to content

Commit

Permalink
remove a pointless static var from radios
Browse files Browse the repository at this point in the history
likely fixes some issue because it was nulled in disposing scream
also OpenDream doesn't seem to support default var values being global vars so there's that
  • Loading branch information
pali6 committed Apr 18, 2023
1 parent 36c3653 commit f5982e1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions code/obj/item/device/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ TYPEINFO(/obj/item/device/radio)
var/has_microphone = TRUE
var/list/datum/component/packet_connected/radio/secure_connections = null
var/speaker_range = 2
var/static/mutable_appearance/speech_bubble = living_speech_bubble //typing_indicator.dm
///This is for being able to run through signal jammers (just solar flares for now). acceptable values = 0 and 1.
var/hardened = 1
///Set to make it not work, used by flock victory screech
Expand Down Expand Up @@ -75,7 +74,6 @@ var/list/headset_channel_lookup
src.traitorradio = null
src.secure_connections = null
src.secure_frequencies = null
src.speech_bubble = null
..()

/obj/item/device/radio/proc/set_frequency(new_frequency)
Expand Down Expand Up @@ -636,7 +634,7 @@ var/list/headset_channel_lookup

/obj/item/device/radio/proc/speech_bubble(var/bubbleOverride)
if (!bubbleOverride)
bubbleOverride = src.speech_bubble
bubbleOverride = global.living_speech_bubble
if ((src.listening && src.wires & WIRE_RECEIVE))
if (istype(src, /obj/item/device/radio/intercom))
UpdateOverlays(bubbleOverride, "speech_bubble")
Expand Down
2 changes: 1 addition & 1 deletion code/obj/item/device/studio_monitor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TYPEINFO(/obj/item/device/radio/nukie_studio_monitor)
return hear

speech_bubble()
UpdateOverlays(speech_bubble, "speech_bubble")
UpdateOverlays(global.living_speech_bubble, "speech_bubble")
SPAWN(1.5 SECONDS)
UpdateOverlays(null, "speech_bubble")

Expand Down

0 comments on commit f5982e1

Please sign in to comment.