From 20e337f8c4cadd30dfb4eaf27aae1819f8504484 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sun, 7 Sep 2014 18:42:46 -0600 Subject: [PATCH] Labor Camp Quotas - Caps labor camp quotas at 1000 points (the equivalent of 10 minutes in the brig) - Adds a line explaining the conversion rate between points and minutes - Removes erroneous information that claimed zero point quotass equalled to unlimited --- code/game/machinery/computer/prisoner.dm | 2 ++ code/modules/mining/laborcamp/laborstacker.dm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 4fc05d7ef41..f802260196d 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -26,6 +26,7 @@ dat += text("[inserted_id]
") dat += text("Collected Points: [inserted_id.points]. Reset.
") dat += text("Card goal: [inserted_id.goal]. Set
") + dat += text("Space Law recommends sentences of 100 points per minute they would normally serve in the brig.
") else dat += text("Insert Prisoner ID.
") dat += "

Prisoner Implant Management

" @@ -105,6 +106,7 @@ if("setgoal") var/num = round(input(usr, "Choose prisoner's goal:", "Input an Integer", null) as num|null) if(num >= 0) + num = min(num,1000) //Cap the quota to the equivilent of 10 minutes. inserted_id.goal = num else if(href_list["inject1"]) var/obj/item/weapon/implant/I = locate(href_list["inject1"]) diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 81c682355d5..645dd8d9772 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -40,7 +40,7 @@ else if(istype(inserted_id)) //There's an ID in there. dat += text("ID: [inserted_id.registered_name] Eject ID.
") dat += text("Points Collected:[inserted_id.points]
") - dat += text("Point Quota: [inserted_id.goal ? inserted_id.goal : "Unlimited"] - Reach your quota to earn your release
") + dat += text("Point Quota: [inserted_id.goal] - Reach your quota to earn your release
") dat += text("Unclaimed Collection Points: [machine.points]. Claim points.
") else //No ID in sight. Complain about it. dat += text("No ID inserted. Insert ID.
") @@ -157,7 +157,7 @@ var/obj/item/weapon/card/id/prisoner/prisoner_id = I user << "ID: [prisoner_id.registered_name]" user << "Points Collected:[prisoner_id.points]" - user << "Point Quota: [prisoner_id.goal ? prisoner_id.goal : "Unlimited"]" + user << "Point Quota: [prisoner_id.goal]" user << "Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release." else user << "Error: Invalid ID"