Merge pull request #17108 from Bawhoppen/sandbagsz

Some sandbag changes

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

@@ -28,6 +28,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
 	new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("Breakdown into sand", /obj/item/weapon/ore/glass, 1, one_per_turf = 0, on_floor = 1), \
 /*	new/datum/stack_recipe("sandstone wall", ???), \
 		new/datum/stack_recipe("sandstone floor", ???),\ */
 	)
@@ -53,13 +54,13 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
 	amount = 30
 
 /*
- * Sandbags(
+ * Sandbags
  */
 
 /obj/item/stack/sheet/mineral/sandbags
 	name = "sandbags"
 	icon = 'icons/obj/items.dmi'
-	icon_state = "sandbag"
+	icon_state = "sandbags"
 	singular_name = "sandbag"
 	force = 5
 	throwforce = 5

code/game/objects/items/weapons/miscellaneous.dm

@@ -11,9 +11,3 @@
 	w_class = 2
 	attack_verb = list("warned", "cautioned", "smashed")
 
-/obj/item/weapon/emptysandbag
-	name = "empty sandbag"
-	desc = "A bag to be filled with sand."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "sandbag"
-	w_class = 1

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -69,6 +69,7 @@
 	new /obj/item/weapon/holosign_creator/engineering(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/glasses/meson/engine(src)
+	new /obj/item/weapon/storage/box/emptysandbags(src)
 
 
 /obj/structure/closet/secure_closet/atmospherics

code/modules/crafting/recipes.dm

@@ -172,14 +172,6 @@
 	time = 10
 	category = CAT_WEAPON
 
-/datum/table_recipe/sandbags
-	name = "Sandbags"
-	result = /obj/item/stack/sheet/mineral/sandbags
-	reqs = list(/obj/item/weapon/ore/glass = 5,
-			/obj/item/weapon/emptysandbag = 1)
-	time = 10
-	category = CAT_WEAPON
-
 /datum/table_recipe/meteorshot
 	name = "Meteorshot Shell"
 	result = /obj/item/ammo_casing/shotgun/meteorshot

code/modules/mining/mine_items.dm

@@ -36,6 +36,8 @@
 
 /obj/structure/closet/secure_closet/miner/New()
 	..()
+	new /obj/item/stack/sheet/mineral/sandbags(src, 5)
+	new /obj/item/weapon/storage/box/emptysandbags(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src)
 	new /obj/item/weapon/storage/bag/ore(src)
@@ -46,6 +48,7 @@
 	new /obj/item/weapon/survivalcapsule(src)
 
 
+
 /**********************Shuttle Computer**************************/
 
 /obj/machinery/computer/shuttle/mining
@@ -450,3 +453,21 @@
 	anchored = 1
 	layer = MOB_LAYER - 0.2
 	density = 0
+
+/obj/item/weapon/emptysandbag
+	name = "empty sandbag"
+	desc = "A bag to be filled with sand."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "sandbag"
+	w_class = 1
+
+/obj/item/weapon/emptysandbag/attackby(obj/item/W, mob/user, params)
+	if(istype(W,/obj/item/weapon/ore/glass))
+		user << "<span class='notice'>You fill the sandbag.</span>"
+		var/obj/item/stack/sheet/mineral/sandbags/I = new /obj/item/stack/sheet/mineral/sandbags
+		user.unEquip(src)
+		user.put_in_hands(I)
+		qdel(W)
+		qdel(src)
+		return
+	else return ..()