cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes modular computer game sound volume

Browse Source
This commit is contained in:
Chompstation Bot
2021-02-19 13:32:36 +00:00
parent e7ca4001ac
commit 29ebaa8320
1 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
code/modules/modular_computers/file_system/programs/generic/game.dm
View File

@@ -31,7 +31,13 @@
sleep(5) sleep(5)
if(boss_hp <= 0) if(boss_hp <= 0)
heads_up = "You have crushed [boss_name]! Rejoice!" heads_up = "You have crushed [boss_name]! Rejoice!"
<<<<<<< HEAD
playsound(computer.loc, 'sound/arcade/win.ogg', 10, TRUE, extrarange = -3, falloff = 10) playsound(computer.loc, 'sound/arcade/win.ogg', 10, TRUE, extrarange = -3, falloff = 10)
||||||| parent of 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
playsound(computer.loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3, falloff = 10)
=======
playsound(computer.loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3, falloff = 0.1)
>>>>>>> 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
game_active = FALSE game_active = FALSE
program_icon_state = "arcade_off" program_icon_state = "arcade_off"
if(istype(computer)) if(istype(computer))
@@ -41,7 +47,13 @@
sleep(10) sleep(10)
else if(player_hp <= 0 || player_mp <= 0) else if(player_hp <= 0 || player_mp <= 0)
heads_up = "You have been defeated... how will the station survive?" heads_up = "You have been defeated... how will the station survive?"
<<<<<<< HEAD
playsound(computer.loc, 'sound/arcade/lose.ogg', 10, TRUE, extrarange = -3, falloff = 10) playsound(computer.loc, 'sound/arcade/lose.ogg', 10, TRUE, extrarange = -3, falloff = 10)
||||||| parent of 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
playsound(computer.loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3, falloff = 10)
=======
playsound(computer.loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3, falloff = 0.1)
>>>>>>> 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
game_active = FALSE game_active = FALSE
program_icon_state = "arcade_off" program_icon_state = "arcade_off"
if(istype(computer)) if(istype(computer))
@@ -62,17 +74,35 @@
return return
if(boss_mp <= 5) if(boss_mp <= 5)
heads_up = "[boss_mpamt] magic power has been stolen from you!" heads_up = "[boss_mpamt] magic power has been stolen from you!"
<<<<<<< HEAD
playsound(computer.loc, 'sound/arcade/steal.ogg', 15, TRUE, extrarange = -3, falloff = 10) playsound(computer.loc, 'sound/arcade/steal.ogg', 15, TRUE, extrarange = -3, falloff = 10)
||||||| parent of 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
playsound(computer.loc, 'sound/arcade/steal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
=======
playsound(computer.loc, 'sound/arcade/steal.ogg', 50, TRUE, extrarange = -3, falloff = 0.1)
>>>>>>> 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
player_mp -= boss_mpamt player_mp -= boss_mpamt
boss_mp += boss_mpamt boss_mp += boss_mpamt
else if(boss_mp > 5 && boss_hp <12) else if(boss_mp > 5 && boss_hp <12)
heads_up = "[boss_name] heals for [bossheal] health!" heads_up = "[boss_name] heals for [bossheal] health!"
<<<<<<< HEAD
playsound(computer.loc, 'sound/arcade/heal.ogg', 15, TRUE, extrarange = -3, falloff = 10) playsound(computer.loc, 'sound/arcade/heal.ogg', 15, TRUE, extrarange = -3, falloff = 10)
||||||| parent of 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
=======
playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 0.1)
>>>>>>> 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
boss_hp += bossheal boss_hp += bossheal
boss_mp -= boss_mpamt boss_mp -= boss_mpamt
else else
heads_up = "[boss_name] attacks you for [boss_attackamt] damage!" heads_up = "[boss_name] attacks you for [boss_attackamt] damage!"
<<<<<<< HEAD
playsound(computer.loc, 'sound/arcade/hit.ogg', 15, TRUE, extrarange = -3, falloff = 10) playsound(computer.loc, 'sound/arcade/hit.ogg', 15, TRUE, extrarange = -3, falloff = 10)
||||||| parent of 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10)
=======
playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 0.1)
>>>>>>> 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
player_hp -= boss_attackamt player_hp -= boss_attackamt
pause_state = FALSE pause_state = FALSE
@@ -122,7 +152,13 @@
attackamt = rand(2,6) // + rand(0, gamerSkill) attackamt = rand(2,6) // + rand(0, gamerSkill)
pause_state = TRUE pause_state = TRUE
heads_up = "You attack for [attackamt] damage." heads_up = "You attack for [attackamt] damage."
<<<<<<< HEAD
playsound(computer.loc, 'sound/arcade/hit.ogg', 15, TRUE, extrarange = -3, falloff = 10) playsound(computer.loc, 'sound/arcade/hit.ogg', 15, TRUE, extrarange = -3, falloff = 10)
||||||| parent of 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10)
=======
playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 0.1)
>>>>>>> 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
boss_hp -= attackamt boss_hp -= attackamt
sleep(10) sleep(10)
game_check() game_check()
@@ -139,7 +175,13 @@
healcost = rand(1, maxPointCost) healcost = rand(1, maxPointCost)
pause_state = TRUE pause_state = TRUE
heads_up = "You heal for [healamt] damage." heads_up = "You heal for [healamt] damage."
<<<<<<< HEAD
playsound(computer.loc, 'sound/arcade/heal.ogg', 15, TRUE, extrarange = -3, falloff = 10) playsound(computer.loc, 'sound/arcade/heal.ogg', 15, TRUE, extrarange = -3, falloff = 10)
||||||| parent of 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
=======
playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 0.1)
>>>>>>> 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
player_hp += healamt player_hp += healamt
player_mp -= healcost player_mp -= healcost
sleep(10) sleep(10)
@@ -152,7 +194,13 @@
rechargeamt = rand(4,7) // + rand(0, gamerSkill) rechargeamt = rand(4,7) // + rand(0, gamerSkill)
pause_state = TRUE pause_state = TRUE
heads_up = "You regain [rechargeamt] magic power." heads_up = "You regain [rechargeamt] magic power."
<<<<<<< HEAD
playsound(computer.loc, 'sound/arcade/mana.ogg', 15, TRUE, extrarange = -3, falloff = 10) playsound(computer.loc, 'sound/arcade/mana.ogg', 15, TRUE, extrarange = -3, falloff = 10)
||||||| parent of 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
playsound(computer.loc, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3, falloff = 10)
=======
playsound(computer.loc, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3, falloff = 0.1)
>>>>>>> 4436af558c... Merge pull request #9745 from VOREStation/Verkister-patch-8
player_mp += rechargeamt player_mp += rechargeamt
sleep(10) sleep(10)
game_check() game_check()