Merge pull request #11634 from Markolie/laborstacker

Updates the prison labor point system

code/game/objects/items/stacks/sheets/glass.dm

@@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 	created_window = /obj/structure/window/basic
 	full_window = /obj/structure/window/full/basic
 	merge_type = /obj/item/stack/sheet/glass
+	point_value = 1
 
 /obj/item/stack/sheet/glass/fifty
 	amount = 50
@@ -90,6 +91,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 	created_window = /obj/structure/window/reinforced
 	full_window = /obj/structure/window/full/reinforced
 	merge_type = /obj/item/stack/sheet/rglass
+	point_value = 4
 
 /obj/item/stack/sheet/rglass/cyborg
 	materials = list()
@@ -113,6 +115,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	origin_tech = "plasmatech=2;materials=2"
 	created_window = /obj/structure/window/plasmabasic
 	full_window = /obj/structure/window/full/plasmabasic
+	point_value = 19
 
 /obj/item/stack/sheet/plasmaglass/New(loc, amount)
 	recipes = GLOB.pglass_recipes
@@ -154,6 +157,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
 	created_window = /obj/structure/window/plasmareinforced
 	full_window = /obj/structure/window/full/plasmareinforced
 	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)
+	point_value = 23
 
 /obj/item/stack/sheet/plasmarglass/New(loc, amount)
 	recipes = GLOB.prglass_recipes

code/game/objects/items/stacks/sheets/mineral.dm

@@ -144,6 +144,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	origin_tech = "materials=6"
 	sheettype = "diamond"
 	materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
+	point_value = 25
 
 /obj/item/stack/sheet/mineral/diamond/New()
 	..()
@@ -156,6 +157,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	origin_tech = "materials=5"
 	sheettype = "uranium"
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
+	point_value = 20
 
 /obj/item/stack/sheet/mineral/uranium/New()
 	..()
@@ -170,6 +172,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
 	burn_state = FLAMMABLE
 	burntime = 5
+	point_value = 20
 
 /obj/item/stack/sheet/mineral/plasma/New()
 	..()
@@ -196,6 +199,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	origin_tech = "materials=4"
 	sheettype = "gold"
 	materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
+	point_value = 20
 
 /obj/item/stack/sheet/mineral/gold/New()
 	..()
@@ -208,6 +212,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	origin_tech = "materials=4"
 	sheettype = "silver"
 	materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
+	point_value = 20
 
 /obj/item/stack/sheet/mineral/silver/New()
 	..()
@@ -220,6 +225,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	origin_tech = "materials=4"
 	sheettype = "bananium"
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
+	point_value = 50
 
 /obj/item/stack/sheet/mineral/bananium/New(loc, amount=null)
 	..()
@@ -233,6 +239,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	sheettype = "tranquillite"
 	materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
 	wall_allowed = FALSE	//no tranquilite walls in code
+	point_value = 50
 
 /obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null)
 	..()
@@ -253,6 +260,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	throw_range = 3
 	sheettype = "titanium"
 	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
+	point_value = 20
 
 var/global/list/datum/stack_recipe/titanium_recipes = list (
 	new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20),
@@ -282,6 +290,7 @@ var/global/list/datum/stack_recipe/titanium_recipes = list (
 	throw_range = 3
 	sheettype = "plastitanium"
 	materials = list(MAT_TITANIUM=2000, MAT_PLASMA=2000)
+	point_value = 45
 
 var/global/list/datum/stack_recipe/plastitanium_recipes = list (
 	new/datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20),

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -105,6 +105,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	flags = CONDUCT
 	origin_tech = "materials=1"
 	merge_type = /obj/item/stack/sheet/metal
+	point_value = 2
 
 /obj/item/stack/sheet/metal/cyborg
 	materials = list()
@@ -151,6 +152,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
 	flags = CONDUCT
 	origin_tech = "materials=2"
 	merge_type = /obj/item/stack/sheet/plasteel
+	point_value = 23
 
 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
 	recipes = plasteel_recipes

code/game/objects/items/stacks/sheets/sheets.dm

@@ -9,22 +9,10 @@
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
 	var/perunit = MINERAL_MATERIAL_AMOUNT
 	var/sheettype = null //this is used for girders in the creation of walls/false walls
+	var/point_value = 0 //turn-in value for the gulag stacker - loosely relative to its rarity.
+
 	var/created_window = null		//apparently glass sheets don't share a base type for glass specifically, so each had to define these vars individually
 	var/full_window = null			//moving the var declaration to here so this can be checked cleaner until someone is willing to make them share a base type properly
 	usesound = 'sound/items/deconstruct.ogg'
 	toolspeed = 1
 	var/wall_allowed = TRUE	//determines if sheet can be used in wall construction or not.
-
-
-// Since the sheetsnatcher was consolidated into weapon/storage/bag we now use
-// item/attackby() properly, making this unnecessary
-
-/*/obj/item/stack/sheet/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/storage/bag/sheetsnatcher))
-		var/obj/item/storage/bag/sheetsnatcher/S = W
-		if(!S.mode)
-			S.add(src,user)
-		else
-			for(var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z))
-				S.add(stack,user)
-	..()*/