Merge branch 'master' into Unmodular

2019-06-16 20:02:56 -04:00
parent b45c870ae4 89dd3d4e87
commit 55fbbd8a3f
84 changed files with 1388 additions and 617 deletions
@@ -144,7 +144,12 @@ GLOBAL_LIST(labor_sheet_values)
 	points += inp.point_value * inp.amount
 	..()

-
+/obj/machinery/mineral/stacking_machine/laborstacker/attackby(obj/item/I, mob/living/user)
+	if(istype(I, /obj/item/stack/sheet) && user.canUnEquip(I))
+		var/obj/item/stack/sheet/inp = I
+		points += inp.point_value * inp.amount
+	return ..()
+	
 /**********************Point Lookup Console**************************/
 /obj/machinery/mineral/labor_points_checker
 	name = "points checking console"