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

Labor Camp (Gulag) Rework (#14707)

Browse Source 
* remap, machines and a lot

* Update cyberiad.dmm
This commit is contained in:
Varghh
2020-10-26 18:25:06 -04:00
committed by GitHub
parent 818bebc39d
commit 7a1326664d
6 changed files with 1448 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/laborcamp/laborstacker.dm
+4 -12
View File
@@ -18,7 +18,6 @@
. = ..()
announcer = new /obj/item/radio/intercom(null)
announcer.config(list("Security" = 0))
locate_stacking_machine()
if(!sheet_values)
for(var/sheet_type in subtypesof(/obj/item/stack/sheet))
@@ -70,7 +69,7 @@
data["id_inserted"] = inserted_id != null
if(inserted_id)
data["id_name"] = inserted_id.registered_name
data["id_points"] = inserted_id.points
data["id_points"] = inserted_id.mining_points
data["id_goal"] = inserted_id.goal
if(check_auth())
can_go_home = TRUE
@@ -103,7 +102,7 @@
if("claim_points")
if(!inserted_id)
return
inserted_id.points += stacking_machine.points
inserted_id.mining_points += stacking_machine.points
stacking_machine.points = 0
to_chat(usr, "Points transferred.")
if("move_shuttle")
@@ -129,14 +128,7 @@
/obj/machinery/mineral/labor_claim_console/proc/check_auth()
if(emagged)
return TRUE //Shuttle is emagged, let any ol' person through
return (istype(inserted_id) && inserted_id.points >= inserted_id.goal) //Otherwise, only let them out if the prisoner's reached his quota.
/obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine()
stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
if(stacking_machine)
stacking_machine.CONSOLE = src
else
qdel(src)
return (istype(inserted_id) && inserted_id.mining_points >= inserted_id.goal) //Otherwise, only let them out if the prisoner's reached his quota.
/obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
if(!(emagged))
@@ -179,7 +171,7 @@
if(istype(I, /obj/item/card/id/prisoner))
var/obj/item/card/id/prisoner/prisoner_id = I
to_chat(user, "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>")
to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.points]</span>")
to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.mining_points]</span>")
to_chat(user, "<span class='notice'>Point Quota: [prisoner_id.goal]</span>")
to_chat(user, "<span class='notice'>Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.</span>")
else