cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 16:38:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519)

Browse Source
This commit is contained in:
Fluffy
2023-01-10 19:22:14 +01:00
committed by GitHub
parent 933e8521eb
commit 04d89f212a
512 changed files with 7623 additions and 7233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/effects/map_effects/sound_emitter.dm
+5 -5
View File
@@ -49,12 +49,12 @@
..()
/obj/effect/map_effect/interval/sound_emitter/punching
sounds_to_play = list(/decl/sound_category/punch_sound)
sounds_to_play = list(/singleton/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(/decl/sound_category/explosion_sound)
sounds_to_play = list(/singleton/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(/decl/sound_category/gunshots)
sounds_to_play = list(/singleton/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(/decl/sound_category/gunshots/ballistic)
sounds_to_play = list(/singleton/sound_category/gunshots/ballistic)
/obj/effect/map_effect/interval/sound_emitter/gunfight/energy
sounds_to_play = list(/decl/sound_category/gunshots/energy)
sounds_to_play = list(/singleton/sound_category/gunshots/energy)
// I'm not sorry.
code/modules/effects/sparks/spawner.dm
+2 -2
View File
@@ -27,11 +27,11 @@
if (location)
var/obj/effect/visual/sparks/S = new(location, src, 0) //Trigger one on the tile it's on
S.start()
playsound(location, /decl/sound_category/spark_sound, 100, 1)
playsound(location, /singleton/sound_category/spark_sound, 100, 1)
QUEUE_VISUAL(S) // Queue it.
while (total_sparks <= src.amount)
playsound(location, /decl/sound_category/spark_sound, 100, 1)
playsound(location, /singleton/sound_category/spark_sound, 100, 1)
var/direction = 0
if (LAZYLEN(src.spread))