diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 53da3463c70..a170ad86591 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -146,12 +146,11 @@ var/deathpoints = score_deadcrew * 25 var/researchpoints = score_researchdone * 30 var/eventpoints = score_eventsendured * 50 - var/borgpoints = score_cyborgsmade * 50 var/escapoints = score_escapees * 25 - var/harvests = score_stuffharvested * 5 + var/harvests = score_stuffharvested * 5 //done var/shipping = score_stuffshipped * 5 - var/mining = score_oremined * 2 - var/meals = score_meals * 5 + var/mining = score_oremined * 2 //done + var/meals = score_meals * 5 //done, but this only counts cooked meals, not drinks served var/power = score_powerloss * 20 var/messpoints if (score_mess != 0) messpoints = score_mess @@ -179,7 +178,6 @@ score_crewscore += shipping score_crewscore += harvests score_crewscore += mining - score_crewscore += borgpoints score_crewscore += researchpoints score_crewscore += eventpoints score_crewscore += escapoints @@ -302,7 +300,6 @@ Ore Mined: [score_oremined] ([score_oremined * 2] Points)
Refreshments Prepared: [score_meals] ([score_meals * 5] Points)
Research Completed: [score_researchdone] ([score_researchdone * 30] Points)
- Cyborgs Constructed: [score_cyborgsmade] ([score_cyborgsmade * 50] Points)
"} if (emergency_shuttle.location == 2) dat += "Shuttle Escapees: [score_escapees] ([score_escapees * 25] Points)
" dat += {"Random Events Endured: [score_eventsendured] ([score_eventsendured * 50] Points)
Whole Station Powered: [score_powerbonus ? "Yes" : "No"] ([score_powerbonus * 2500] Points)
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index d25e1ecc145..3bf91422728 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -269,6 +269,7 @@ stop() if(cooked) cooked.loc = src.loc + score_meals++ return /obj/machinery/microwave/proc/wzhzhzh(var/seconds as num) diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 16c66a8506e..e4470729d1d 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -6,7 +6,7 @@ anchored = 1 density = 1 // mats = 10 - var/money = 2500000 + var/money = 25000 var/plays = 0 var/working = 0 var/obj/item/weapon/card/id/scan = null @@ -41,7 +41,7 @@ var/dat = {"Slot Machine


Five credits to play!
- Prize Money Available: [src.scan.money]
+ Prize Money Available: [src.money]
Your Card: [src.scan]
Credits Remaining: [src.scan.money]
[src.plays] players have tried their luck today!
@@ -55,17 +55,18 @@ if(href_list["ops"]) var/operation = text2num(href_list["ops"]) if(operation == 1) // Play +/* if (src.working == 1) + usr << "\red You need to wait until the machine stops spinning!" + return */ if (src.scan.money < 5) - for(var/mob/O in hearers(src, null)) - O.show_message(text("[] says, 'Insufficient money to play!'", src), 1) + usr << "\red Insufficient money to play!" return src.scan.money -= 5 src.money += 5 src.plays += 1 src.working = 1 src.icon_state = "slots-on" - for(var/mob/O in hearers(src, null)) - O.show_message(text("[] says, 'Let's roll!'", src), 1) + usr << "Let's roll!" var/roll = rand(1,10000) spawn(100) if (roll == 1) @@ -85,13 +86,11 @@ src.scan.money += 500 src.money -= 500 else if (roll > 100 && roll <= 1000) - for(var/mob/O in hearers(src, null)) - O.show_message(text("[] says, 'You win a free game!'", src), 1) + usr << "\blue You win a free game!" src.scan.money += 5 src.money -= 5 else - for(var/mob/O in hearers(src, null)) - O.show_message(text("[] says, 'No luck!'", src), 1) + usr << "\red No luck!" src.working = 0 src.icon_state = "slots-off" if(operation == 2) // Eject Card diff --git a/code/global.dm b/code/global.dm index 7e4071f3b73..d32b1a837b3 100644 --- a/code/global.dm +++ b/code/global.dm @@ -255,7 +255,6 @@ var/score_crewscore = 0 // this is the overall var/score for the whole round var/score_stuffshipped = 0 // how many useful items have cargo shipped out? var/score_stuffharvested = 0 // how many harvests have hydroponics done? var/score_oremined = 0 // obvious -var/score_cyborgsmade = 0 var/score_researchdone = 0 var/score_eventsendured = 0 // how many random events did the station survive? var/score_powerloss = 0 // how many APCs have poor charge? diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index df97e620462..6ec190a983d 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -426,6 +426,7 @@ commented out in r5061, I left it because of the shroom thingies drop_mineral() pop(excavation_minerals) mineralAmt-- + score_oremined++ //drop some rocks next_rock += P.excavation_amount * 10 @@ -467,6 +468,7 @@ commented out in r5061, I left it because of the shroom thingies //if the turf has already been excavated, some of it's ore has been removed for (var/i=0;i