Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync

This commit is contained in:
xPokee
2025-09-10 14:12:16 -04:00
277 changed files with 8854 additions and 7401 deletions
@@ -1001,26 +1001,6 @@ GLOBAL_LIST_INIT(pizza_sheet_recipes, list(
/obj/item/stack/sheet/pizza/five
amount = 5
/obj/item/stack/sheet/sandblock
name = "blocks of sand"
desc = "You're too old to be playing with sandcastles. Now you build... sandstations."
singular_name = "sand block"
icon_state = "sheet-sandstone"
mats_per_unit = list(/datum/material/sand = SHEET_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/sheet/sandblock
material_type = /datum/material/sand
material_modifier = 1
drop_sound = SFX_STONE_DROP
pickup_sound = SFX_STONE_PICKUP
/obj/item/stack/sheet/sandblock/fifty
amount = 50
/obj/item/stack/sheet/sandblock/twenty
amount = 20
/obj/item/stack/sheet/sandblock/five
amount = 5
/obj/item/stack/sheet/hauntium
name = "haunted sheets"
desc = "These sheets seem cursed."