cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'

Browse Source
This commit is contained in:
KasparoVy
2015-12-27 18:44:45 -05:00
parent 6ba20458e5 8ad4d33b7f
commit 8bbd18846d
4 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/mobs.dm
+6 -1
View File
@@ -61,7 +61,12 @@ var/global/list/blocked_mobs = list(/mob/living/simple_animal,
/mob/living/simple_animal/hostile/guardian/punch/sealpunch,
/mob/living/simple_animal/hostile/guardian/healer/sealhealer,
/mob/living/simple_animal/hostile/guardian/ranged,
/mob/living/simple_animal/hostile/guardian/bomb
/mob/living/simple_animal/hostile/guardian/bomb,
/mob/living/simple_animal/hostile/winter/santa,
/mob/living/simple_animal/hostile/winter/santa/stage_1,
/mob/living/simple_animal/hostile/winter/santa/stage_2,
/mob/living/simple_animal/hostile/winter/santa/stage_3,
/mob/living/simple_animal/hostile/winter/santa/stage_4
)
var/global/list/med_hud_users = list()
code/game/machinery/computer/arcade.dm
+14 -14
View File
@@ -154,7 +154,7 @@
src.blocked = 1
var/attackamt = rand(2,6)
src.temp = "You attack for [attackamt] damage!"
playsound(src.loc, 'sound/arcade/Hit.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Hit.ogg', 20, 1, extrarange = -6, falloff = 10)
src.updateUsrDialog()
if(turtle > 0)
turtle--
@@ -168,7 +168,7 @@
var/pointamt = rand(1,3)
var/healamt = rand(6,8)
src.temp = "You use [pointamt] magic to heal for [healamt] damage!"
playsound(src.loc, 'sound/arcade/Heal.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Heal.ogg', 20, 1, extrarange = -6, falloff = 10)
src.updateUsrDialog()
turtle++
@@ -183,7 +183,7 @@
src.blocked = 1
var/chargeamt = rand(4,7)
src.temp = "You regain [chargeamt] points"
playsound(src.loc, 'sound/arcade/Mana.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Mana.ogg', 20, 1, extrarange = -6, falloff = 10)
src.player_mp += chargeamt
if(turtle > 0)
turtle--
@@ -218,7 +218,7 @@
if(!gameover)
src.gameover = 1
src.temp = "[src.enemy_name] has fallen! Rejoice!"
playsound(src.loc, 'sound/arcade/Win.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Win.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_win_emagged")
@@ -235,13 +235,13 @@
else if (emagged && (turtle >= 4))
var/boomamt = rand(5,10)
src.temp = "[src.enemy_name] throws a bomb, exploding you for [boomamt] damage!"
playsound(src.loc, 'sound/arcade/Boom.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Boom.ogg', 20, 1, extrarange = -6, falloff = 10)
src.player_hp -= boomamt
else if ((src.enemy_mp <= 5) && (prob(70)))
var/stealamt = rand(2,3)
src.temp = "[src.enemy_name] steals [stealamt] of your power!"
playsound(src.loc, 'sound/arcade/Steal.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Steal.ogg', 20, 1, extrarange = -6, falloff = 10)
src.player_mp -= stealamt
src.updateUsrDialog()
@@ -249,7 +249,7 @@
src.gameover = 1
sleep(10)
src.temp = "You have been drained! GAME OVER"
playsound(src.loc, 'sound/arcade/Lose.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Lose.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_loss_mana_emagged")
usr.gib()
@@ -258,20 +258,20 @@
else if ((src.enemy_hp <= 10) && (src.enemy_mp > 4))
src.temp = "[src.enemy_name] heals for 4 health!"
playsound(src.loc, 'sound/arcade/Heal.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Heal.ogg', 20, 1, extrarange = -6, falloff = 10)
src.enemy_hp += 4
src.enemy_mp -= 4
else
var/attackamt = rand(3,6)
src.temp = "[src.enemy_name] attacks for [attackamt] damage!"
playsound(src.loc, 'sound/arcade/Hit.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Hit.ogg', 20, 1, extrarange = -6, falloff = 10)
src.player_hp -= attackamt
if ((src.player_mp <= 0) || (src.player_hp <= 0))
src.gameover = 1
src.temp = "You have been crushed! GAME OVER"
playsound(src.loc, 'sound/arcade/Lose.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/Lose.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_loss_hp_emagged")
usr.gib()
@@ -533,9 +533,9 @@
T.ChangeTurf(/turf/simulated/floor/plating/)
else
atom_say("Something slams into the floor around [src] - luckily, it didn't get through!")
playsound(src.loc, 'sound/effects/bang.ogg', 50, 1)
playsound(src.loc, 'sound/effects/bang.ogg', 20, 1)
if(ORION_TRAIL_MALFUNCTION)
playsound(src.loc, 'sound/effects/EMPulse.ogg', 50, 1)
playsound(src.loc, 'sound/effects/EMPulse.ogg', 20, 1)
src.visible_message("<span class='danger'>[src] malfunctions, randomizing in-game stats!</span>")
var/oldfood = food
var/oldfuel = fuel
@@ -549,7 +549,7 @@
src.audible_message("<span class='danger'>[src] lets out a somehow ominous chime.</span>")
food = oldfood
fuel = oldfuel
playsound(src.loc, 'sound/machines/chime.ogg', 50, 1)
playsound(src.loc, 'sound/machines/chime.ogg', 20, 1)
else if(href_list["newgame"]) //Reset everything
newgame()
@@ -1071,4 +1071,4 @@
#undef ORION_TRAIL_MALFUNCTION
#undef ORION_TRAIL_COLLISION
#undef ORION_TRAIL_SPACEPORT
#undef ORION_TRAIL_BLACKHOLE
#undef ORION_TRAIL_BLACKHOLE
code/game/machinery/telecomms/traffic_control.dm
+8 -1
View File
@@ -116,7 +116,8 @@
function compileCode() {
var codeText = cMirror_fSubmit.getValue();
window.location = "byond://?src=\ref[src];choice=Compile;cMirror=" + encodeURIComponent(codeText);
document.getElementById("cMirrorPost").value = codeText;
document.getElementById("theform").submit();
}
function clearCode() {
@@ -129,6 +130,12 @@
<div class="item">
[compiling_errors]
</div>
<form action="byond://" method="POST" id="theform">
<input type="hidden" name="choice" value="Compile">
<input type="hidden" name="src" value="\ref[src]">
<input type="hidden" id="cMirrorPost" name="cMirror" value="">
</form>
"}
else
dat += {"<br>[temp]<br>
code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
+5 -3
View File
@@ -43,6 +43,8 @@
/mob/living/simple_animal/hostile/winter/snowman/death()
if(weapon1 && prob(50)) //50% chance to drop weapon on death, if it has one to drop
new weapon1(get_turf(src))
if(prob(20)) //chance to become a stationary snowman structure instead of a corpse
new /obj/structure/snowman(get_turf(src))
visible_message("<span class='notice'>The [src.name] shimmers as its animating magic fades away!</span>")
@@ -121,12 +123,12 @@
/mob/living/simple_animal/hostile/winter/santa/stage_4 //stage 4: fast spinebreaker
name = "Final Form Santa"
desc = "WHAT THE HELL IS HE!?! WHY WON'T HE STAY DEAD!?!"
ranged = 0
rapid = 0
maxHealth = 200
health = 200
speed = 0 //he's lost some weight from the fighting
environment_smash = 2 //naughty walls must be punished too
melee_damage_lower = 10
melee_damage_lower = 15
melee_damage_upper = 25 //that's gonna leave a mark, for sure
/mob/living/simple_animal/hostile/winter/santa/stage_4/death()