Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit e94cba9

Browse files
committed
strange
1 parent a49f618 commit e94cba9

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

code/game/machinery/doors/door.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
qdel(spark_system)
121121
spark_system = null
122122
air_update_turf()
123+
lose_hearing_sensitivity() // used by password door, hopefully clears
123124
return ..()
124125

125126
/obj/machinery/door/Bumped(atom/movable/AM)

code/game/machinery/doors/passworddoor.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
if(voice_activated)
7272
become_hearing_sensitive()
7373

74-
/obj/machinery/door/password/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list())
74+
/obj/machinery/door/password/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list(), message_range)
7575
. = ..()
7676
if(!density || !voice_activated || radio_freq)
7777
return
@@ -104,13 +104,13 @@
104104
switch(animation)
105105
if("opening")
106106
flick("opening", src)
107-
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
107+
playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE)
108108
if("closing")
109109
flick("closing", src)
110-
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
110+
playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE)
111111
if("deny")
112112
//Deny animation would be nice to have.
113-
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
113+
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
114114

115115
/obj/machinery/door/password/proc/ask_for_pass(mob/user)
116116
var/guess = stripped_input(user,"Enter the password:", "Password", "")

code/modules/clothing/masks/hailer.dm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,6 @@
7070
"Hehe" = 'sound/voice/cpvoicelines/chuckle.ogg',
7171
)
7272

73-
/obj/item/clothing/mask/gas/sechailer/Initialize(mapload)
74-
. = ..()
75-
become_hearing_sensitive()
76-
77-
/obj/item/clothing/mask/gas/sechailer/Destroy()
78-
. = ..()
79-
lose_hearing_sensitivity() // makes sure this item hears and if destroyed removes from list
8073

8174
/obj/item/clothing/mask/gas/sechailer/swat/spacepol
8275
name = "spacepol mask"

code/modules/mob/living/silicon/robot/robot.dm

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
1313
light_system = MOVABLE_LIGHT_DIRECTIONAL
1414
light_on = FALSE
15-
radio = /obj/item/radio/borg
1615

1716
var/custom_name = ""
1817
var/braintype = "Cyborg"
@@ -213,8 +212,8 @@
213212
GLOB.available_ai_shells -= src
214213
else
215214
if(T && istype(radio) && istype(radio.keyslot))
216-
radio.keyslot.forceMove(T)
217-
radio.keyslot = null
215+
radio?.keyslot?.forceMove(T)
216+
radio?.keyslot = null
218217
qdel(wires)
219218
qdel(module)
220219
qdel(eye_lights)

0 commit comments

Comments
 (0)