From f721e13ebcc2b8fcbf768edb5180f1960c84d46c Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Fri, 25 Dec 2015 01:50:34 +0100 Subject: [PATCH 1/5] Prevents people from murdering people playing the Battle arcade Reduces sound range for 12 to 3 --- code/game/machinery/computer/arcade.dm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index fa58b9526fc..5e4554e4c17 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -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', 50, 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', 50, 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', 50, 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', 50, 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', 50, 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', 50, 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', 50, 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', 50, 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', 50, 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', 50, 1, extrarange = -6, falloff = 10) if(emagged) feedback_inc("arcade_loss_hp_emagged") usr.gib() @@ -1071,4 +1071,4 @@ #undef ORION_TRAIL_MALFUNCTION #undef ORION_TRAIL_COLLISION #undef ORION_TRAIL_SPACEPORT -#undef ORION_TRAIL_BLACKHOLE \ No newline at end of file +#undef ORION_TRAIL_BLACKHOLE From 06e06b614f13ab3dd7199a9d40108de7276161ee Mon Sep 17 00:00:00 2001 From: monster860 Date: Fri, 25 Dec 2015 12:08:35 -0500 Subject: [PATCH 2/5] Changed Traffic Control to use POST for NTSL code --- code/game/machinery/telecomms/traffic_control.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index d484fd144fd..f110d740b63 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -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 @@
[compiling_errors]
+ +
+ + + +
"} else dat += {"
[temp]
From 81ce03572ba91d9e13cf0c591745b27e17dd4c97 Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Sat, 26 Dec 2015 23:54:24 -0500 Subject: [PATCH 3/5] Evil Santa Fixes/Tweaks Adds all Santa mobs to the global blocked_mobs list - Will prevent gold cores and rifts from spawning stage 2 santas Gives Final Form Santa (Stage 4) a small buff to health and minimum damage - All other stages left unchanged, Stage 4 was just a bit lackluster for a "final form" Fixes melee snowmen not ever dropping the brand new CANDY SWORD. They now will have a 50% chance. - It's a sharpened candy cane. Festive and painful. - Ranged snowmen do not drop the candy sword, as they don't carry a weapon. --- code/_globalvars/lists/mobs.dm | 7 ++++++- .../mob/living/simple_animal/hostile/winter_mobs.dm | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index c20101cd510..381ade73a80 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -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() diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm index 7b28a5eb266..8ca70430d44 100644 --- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm @@ -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("The [src.name] shimmers as its animating magic fades away!") @@ -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() From d86d233b58d6f0cfea0b95d4686915851b3fecd9 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 27 Dec 2015 21:58:11 +0100 Subject: [PATCH 4/5] Actually reduces the volume by a fair bit --- code/game/machinery/computer/arcade.dm | 42 +++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 5e4554e4c17..8f1c29a82be 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -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 = -6, 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 = -6, 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 = -6, 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 = -6, 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 = -6, 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 = -6, 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 = -6, 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 = -6, 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 = -6, 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 = -6, 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() @@ -485,7 +485,7 @@ var/mob/living/carbon/M = usr //for some vars switch(event) if(ORION_TRAIL_RAIDERS) - if(prob(50)) + if(prob(20)) usr << "You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?" M.hallucination += 30 else @@ -504,8 +504,8 @@ M.Stun(5) sleep(30) atom_say("[M] violently throws up!") - playsound(loc, 'sound/effects/splat.ogg', 50, 1) - M.nutrition -= 50 //lose a lot of food + playsound(loc, 'sound/effects/splat.ogg', 20, 1) + M.nutrition -= 20 //lose a lot of food var/turf/location = usr.loc if(istype(location, /turf/simulated)) location.add_vomit_floor(src, 1) @@ -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("[src] malfunctions, randomizing in-game stats!") var/oldfood = food var/oldfuel = fuel @@ -549,7 +549,7 @@ src.audible_message("[src] lets out a somehow ominous chime.") 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() @@ -597,7 +597,7 @@ usr.Stun(10) //you can't run :^) var/S = new /obj/singularity/academy(usr.loc) emagged = 0 //immediately removes emagged status so people can't kill themselves by sprinting up and interacting - sleep(50) + sleep(20) atom_say("[S] winks out, just as suddenly as it appeared.") qdel(S) else @@ -720,7 +720,7 @@ switch(event) if(ORION_TRAIL_RAIDERS) eventdat += "Raiders have come aboard your ship!" - if(prob(50)) + if(prob(20)) var/sfood = rand(1,10) var/sfuel = rand(1,10) food -= sfood @@ -826,7 +826,7 @@ var/chance2attack = alive*20 if(prob(chance2attack)) - var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 50%, 2 lings, 2 crew is 50% chance + var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 20%, 2 lings, 2 crew is 20% chance if(prob(chancetokill)) var/deadguy = remove_crewmember() eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] up to [deadguy] and capitulates them!" @@ -949,7 +949,7 @@ if(specific) newcrew = specific else - if(prob(50)) + if(prob(20)) newcrew = pick(first_names_male) else newcrew = pick(first_names_female) @@ -994,7 +994,7 @@ /obj/machinery/computer/arcade/orion_trail/emag_act(mob/user) if(!emagged) - user << "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode." + user << "You override the cheat code menu and skip to Cheat #[rand(1, 20)]: Realism Mode." name = "The Orion Trail: Realism Edition" desc = "Learn how our ancestors got to Orion, and try not to die in the process!" newgame() From 258d8278b58162fe8d2fd2f8a09cd8706d6e3b78 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 27 Dec 2015 22:39:57 +0100 Subject: [PATCH 5/5] Fixes mistake --- code/game/machinery/computer/arcade.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 8f1c29a82be..17ec358a4a8 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -485,7 +485,7 @@ var/mob/living/carbon/M = usr //for some vars switch(event) if(ORION_TRAIL_RAIDERS) - if(prob(20)) + if(prob(50)) usr << "You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?" M.hallucination += 30 else @@ -504,8 +504,8 @@ M.Stun(5) sleep(30) atom_say("[M] violently throws up!") - playsound(loc, 'sound/effects/splat.ogg', 20, 1) - M.nutrition -= 20 //lose a lot of food + playsound(loc, 'sound/effects/splat.ogg', 50, 1) + M.nutrition -= 50 //lose a lot of food var/turf/location = usr.loc if(istype(location, /turf/simulated)) location.add_vomit_floor(src, 1) @@ -597,7 +597,7 @@ usr.Stun(10) //you can't run :^) var/S = new /obj/singularity/academy(usr.loc) emagged = 0 //immediately removes emagged status so people can't kill themselves by sprinting up and interacting - sleep(20) + sleep(50) atom_say("[S] winks out, just as suddenly as it appeared.") qdel(S) else @@ -720,7 +720,7 @@ switch(event) if(ORION_TRAIL_RAIDERS) eventdat += "Raiders have come aboard your ship!" - if(prob(20)) + if(prob(50)) var/sfood = rand(1,10) var/sfuel = rand(1,10) food -= sfood @@ -826,7 +826,7 @@ var/chance2attack = alive*20 if(prob(chance2attack)) - var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 20%, 2 lings, 2 crew is 20% chance + var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 50%, 2 lings, 2 crew is 50% chance if(prob(chancetokill)) var/deadguy = remove_crewmember() eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] up to [deadguy] and capitulates them!" @@ -949,7 +949,7 @@ if(specific) newcrew = specific else - if(prob(20)) + if(prob(50)) newcrew = pick(first_names_male) else newcrew = pick(first_names_female) @@ -994,7 +994,7 @@ /obj/machinery/computer/arcade/orion_trail/emag_act(mob/user) if(!emagged) - user << "You override the cheat code menu and skip to Cheat #[rand(1, 20)]: Realism Mode." + user << "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode." name = "The Orion Trail: Realism Edition" desc = "Learn how our ancestors got to Orion, and try not to die in the process!" newgame()