mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-29 16:19:36 +01:00
[MIRROR] Misc fixes (#12698)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
b7cd4306a4
commit
e9b4335888
@@ -59,7 +59,9 @@
|
||||
if(locate(/obj/effect/plant) in things)
|
||||
trigger_allergy()
|
||||
return
|
||||
if(locate(/obj/item/toy/bouquet) in things)
|
||||
for(var/obj/item/toy/bouquet/flowers in things)
|
||||
if(istype(flowers, /obj/item/toy/bouquet/fake)) //Plastic doesn't trigger pollen.
|
||||
continue
|
||||
trigger_allergy()
|
||||
return
|
||||
for(var/obj/machinery/portable_atmospherics/hydroponics/irritant_tray in things)
|
||||
|
||||
@@ -90,7 +90,9 @@
|
||||
stop()
|
||||
return
|
||||
if(!chance || prob(chance))
|
||||
play(get_sound(starttime))
|
||||
var/soundfile = get_sound(starttime)
|
||||
if(soundfile)
|
||||
play(soundfile)
|
||||
if(!timerid)
|
||||
timerid = addtimer(CALLBACK(src, PROC_REF(sound_loop), world.time), mid_length, TIMER_STOPPABLE | TIMER_LOOP)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user