Revert "Singletons + refactor of /datum/observ (#15487)" (#15515)

This commit is contained in:
Matt Atlas
2023-01-05 19:21:22 +01:00
committed by GitHub
parent 34b1bcd055
commit b1869884c1
506 changed files with 7214 additions and 7561 deletions

View File

@@ -49,12 +49,12 @@
..()
/obj/effect/map_effect/interval/sound_emitter/punching
sounds_to_play = list(/singleton/sound_category/punch_sound)
sounds_to_play = list(/decl/sound_category/punch_sound)
interval_lower_bound = 5
interval_upper_bound = 1 SECOND
/obj/effect/map_effect/interval/sound_emitter/explosions
sounds_to_play = list(/singleton/sound_category/explosion_sound)
sounds_to_play = list(/decl/sound_category/explosion_sound)
interval_lower_bound = 5 SECONDS
interval_upper_bound = 10 SECONDS
@@ -62,15 +62,15 @@
sounds_to_play = list('sound/effects/explosionfar.ogg')
/obj/effect/map_effect/interval/sound_emitter/gunfight
sounds_to_play = list(/singleton/sound_category/gunshots)
sounds_to_play = list(/decl/sound_category/gunshots)
interval_lower_bound = 5
interval_upper_bound = 2 SECONDS
/obj/effect/map_effect/interval/sound_emitter/gunfight/ballistic
sounds_to_play = list(/singleton/sound_category/gunshots/ballistic)
sounds_to_play = list(/decl/sound_category/gunshots/ballistic)
/obj/effect/map_effect/interval/sound_emitter/gunfight/energy
sounds_to_play = list(/singleton/sound_category/gunshots/energy)
sounds_to_play = list(/decl/sound_category/gunshots/energy)
// I'm not sorry.