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

Update game.dm

Browse Source
This commit is contained in:
Nadyr
2021-02-28 07:09:38 -05:00
committed by GitHub
parent 29ebaa8320
commit d9e125f39c
1 changed files with 0 additions and 48 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,13 +31,7 @@
sleep(5)
if(boss_hp <= 0)
heads_up = "You have crushed [boss_name]! Rejoice!"
<<<<<<< HEAD
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
program_icon_state = "arcade_off"
if(istype(computer))
@@ -47,13 +41,7 @@
sleep(10)
else if(player_hp <= 0 || player_mp <= 0)
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)
||||||| 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
program_icon_state = "arcade_off"
if(istype(computer))
@@ -74,35 +62,17 @@
return
if(boss_mp <= 5)
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)
||||||| 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
boss_mp += boss_mpamt
else if(boss_mp > 5 && boss_hp <12)
heads_up = "[boss_name] heals for [bossheal] health!"
<<<<<<< HEAD
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_mp -= boss_mpamt
else
heads_up = "[boss_name] attacks you for [boss_attackamt] damage!"
<<<<<<< HEAD
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
pause_state = FALSE
@@ -152,13 +122,7 @@
attackamt = rand(2,6) // + rand(0, gamerSkill)
pause_state = TRUE
heads_up = "You attack for [attackamt] damage."
<<<<<<< HEAD
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
sleep(10)
game_check()
@@ -175,13 +139,7 @@
healcost = rand(1, maxPointCost)
pause_state = TRUE
heads_up = "You heal for [healamt] damage."
<<<<<<< HEAD
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_mp -= healcost
sleep(10)
@@ -194,13 +152,7 @@
rechargeamt = rand(4,7) // + rand(0, gamerSkill)
pause_state = TRUE
heads_up = "You regain [rechargeamt] magic power."
<<<<<<< HEAD
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
sleep(10)
game_check()