cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/multiz/movement.dm
View File

@@ -455,7 +455,7 @@
if(status_flags & GODMODE) // Godmode
visible_message(SPAN_NOTICE("\The [src] lands flawlessly on their legs, bending their knee to the floor. They promptly stand up."))
playsound(src.loc, /singleton/sound_category/swing_hit_sound, 50, 1)
playsound(src.loc, /decl/sound_category/swing_hit_sound, 50, 1)
return FALSE
visible_message("\The [src] falls and lands on \the [loc]!",
@@ -477,7 +477,7 @@
if(51 to INFINITY)
playsound(src.loc, "sound/weapons/heavysmash.ogg", 100, 1)
else
playsound(src.loc, /singleton/sound_category/swing_hit_sound, 75, 1)
playsound(src.loc, /decl/sound_category/swing_hit_sound, 75, 1)
else
playsound(src.loc, "sound/weapons/smash.ogg", 75, 1)
@@ -499,7 +499,7 @@
if(status_flags & GODMODE) // Godmode
visible_message(SPAN_NOTICE("\The [src] lands flawlessly on their legs, bending their knee to the floor. They promptly stand up."))
playsound(src.loc, /singleton/sound_category/swing_hit_sound, 50, 1)
playsound(src.loc, /decl/sound_category/swing_hit_sound, 50, 1)
return FALSE
var/combat_roll = 1
@@ -634,11 +634,11 @@
if(-INFINITY to 10)
playsound(src.loc, "sound/weapons/bladeslice.ogg", 50, 1)
if(11 to 50)
playsound(src.loc, /singleton/sound_category/punch_sound, 75, 1)
playsound(src.loc, /decl/sound_category/punch_sound, 75, 1)
if(51 to INFINITY)
playsound(src.loc, "sound/weapons/heavysmash.ogg", 100, 1)
else
playsound(src.loc, /singleton/sound_category/swing_hit_sound, 75, 1)
playsound(src.loc, /decl/sound_category/swing_hit_sound, 75, 1)
else
playsound(src.loc, "sound/weapons/smash.ogg", 75, 1)