Skip to content

Commit 9934d19

Browse files
another loop lock
1 parent 58db4e3 commit 9934d19

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

code/game/machinery/OpTable.dm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
var/rating = 1 //Use this for upgrades some day
1515
pass_flags_self = PASSTABLE
1616
var/obj/machinery/computer/operating/computer = null
17+
var/pulsing = FALSE
1718

1819
/obj/machinery/optable/New()
1920
..()
@@ -182,14 +183,16 @@
182183

183184
update()
184185

185-
while(victim.loc == src.loc && victim.lying && victim.pulse != PULSE_NONE && victim.stat != DEAD && !victim.timestopped)
186+
while(!pulsing && victim.loc == src.loc && victim.lying && victim.pulse != PULSE_NONE && victim.stat != DEAD && !victim.timestopped)
187+
pulsing = TRUE
186188
var/pulsespeed = victim.get_pulsespeed()
187189
if(pulsespeed)
188190
if(computer)
189191
playsound(computer.loc, 'sound/machines/Heartbeat.ogg', 50)
190192
computer.icon_state = "operating-living"
191193
icon_state = "table2-active"
192194
sleep(max(1,pulsespeed))
195+
pulsing = FALSE
193196

194197
/obj/machinery/optable/attackby(obj/item/weapon/W as obj, mob/living/carbon/user as mob)
195198
if(W.is_wrench(user))

code/modules/clothing/accessories/accessory.dm

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,12 @@
209209
user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [M]'s [body_part]. You [sound_strength] [sound].")
210210

211211
spawn()
212-
if(!listening)
213-
while(M.pulse != PULSE_NONE && loc == user && M.Adjacent(user) && !M.timestopped)
214-
listening = TRUE
215-
var/pulsespeed = M.get_pulsespeed()
216-
if(pulsespeed)
217-
to_chat(M,"*thump*")
218-
sleep(max(1,pulsespeed))
212+
while(!listening && M.pulse != PULSE_NONE && loc == user && M.Adjacent(user) && !M.timestopped)
213+
listening = TRUE
214+
var/pulsespeed = M.get_pulsespeed()
215+
if(pulsespeed)
216+
to_chat(M,"*thump*")
217+
sleep(max(1,pulsespeed))
219218
listening = FALSE
220219
return
221220
return ..(M,user)

0 commit comments

Comments
 (0)