From c15ed4eca0de53efc2f4ecda8c48e09df97d9042 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 2 May 2021 01:07:16 +0200 Subject: [PATCH] [MIRROR] fixes poopy bronze tiles sstuff (#5237) * fixes stuff made with bronze sheets deconstructing into tiles or not being able to make bronze golems (#58708) * fixes poopy bronze tiles sstuff Co-authored-by: Fikou Co-authored-by: Gandalf --- _maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm | 2 +- code/datums/materials/basemats.dm | 2 +- code/game/objects/effects/spawners/lootdrop.dm | 2 +- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/items/storage/bags.dm | 3 +-- code/game/objects/structures/beds_chairs/chair.dm | 2 +- code/game/objects/structures/door_assembly_types.dm | 2 +- code/game/objects/structures/girders.dm | 2 +- code/game/objects/structures/tables_racks.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/modules/ruins/lavaland_ruin_code.dm | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm index 49cd9208c7e..3303f8acde4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm @@ -15,7 +15,7 @@ /area/ruin/unpowered/ratvar) "e" = ( /obj/item/stack/sheet/bronze, -/turf/open/floor/bronze/filled/lavaland, +/floor/bronze/filled/lavaland, /area/ruin/unpowered/ratvar) "f" = ( /turf/closed/mineral/volcanic/lava_land_surface, diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index 8d0f668a332..0a466cd5610 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -412,7 +412,7 @@ Unless you know what you're doing, only use the first three numbers. They're in desc = "Clock Cult? Never heard of it." color = "#92661A" categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE) - sheet_type = /obj/item/stack/tile/bronze + sheet_type = /obj/item/stack/sheet/bronze value_per_unit = 0.025 armor_modifiers = list(MELEE = 1, BULLET = 1, LASER = 1, ENERGY = 1, BOMB = 1, BIO = 1, RAD = 1.5, FIRE = 1.5, ACID = 1.5) beauty_modifier = 0.2 diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 55ce96d3e83..a9f4b16ac45 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -713,7 +713,7 @@ loot = list( /obj/item/stack/sheet/sandblock{amount = 30} = 25, /obj/item/stack/sheet/mineral/wood{amount = 30} = 25, - /obj/item/stack/tile/bronze/thirty = 20, + /obj/item/stack/sheet/bronze/thirty = 20, /obj/item/stack/tile/noslip{amount = 20} = 10, /obj/item/stack/sheet/plastic{amount = 30} = 10, /obj/item/stack/tile/pod{amount = 20} = 4, diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 2366e9e5050..965f1f93ab0 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -618,7 +618,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ pixel_x = 0 pixel_y = 0 -/obj/item/stack/tile/bronze/thirty +/obj/item/stack/sheet/bronze/thirty amount = 30 /* diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 65e1eb0e884..8e0a359f738 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -251,8 +251,7 @@ var/datum/component/storage/concrete/stack/STR = GetComponent(/datum/component/storage/concrete/stack) STR.allow_quick_empty = TRUE STR.set_holdable(list( - /obj/item/stack/sheet, - /obj/item/stack/tile/bronze + /obj/item/stack/sheet ), list( /obj/item/stack/sheet/mineral/sandstone, diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 7fa485b097b..1da4411aa90 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -419,7 +419,7 @@ desc = "A spinny chair made of bronze. It has little cogs for wheels!" anchored = FALSE icon_state = "brass_chair" - buildstacktype = /obj/item/stack/tile/bronze + buildstacktype = /obj/item/stack/sheet/bronze buildstackamount = 1 item_chair = null var/turns = 0 diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 5fb454b5bc2..9b9e0971a62 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -247,7 +247,7 @@ base_name = "bronze airlock" airlock_type = /obj/machinery/door/airlock/bronze noglass = TRUE - material_type = /obj/item/stack/tile/bronze + material_type = /obj/item/stack/sheet/bronze /obj/structure/door_assembly/door_assembly_bronze/seethru airlock_type = /obj/machinery/door/airlock/bronze/seethru diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 39c865800f4..27cdcba43d1 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -422,7 +422,7 @@ to_chat(user, "You start slicing apart [src]...") if(W.use_tool(src, user, 40, volume=50)) to_chat(user, "You slice apart [src].") - var/obj/item/stack/tile/bronze/B = new(drop_location(), 2) + var/obj/item/stack/sheet/bronze/B = new(drop_location(), 2) transfer_fingerprints_to(B) qdel(src) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index ca37b0dc7a6..996c7b4ec94 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -534,7 +534,7 @@ icon_state = "brass_table-0" base_icon_state = "brass_table" resistance_flags = FIRE_PROOF | ACID_PROOF - buildstack = /obj/item/stack/tile/bronze + buildstack = /obj/item/stack/sheet/bronze smoothing_groups = list(SMOOTH_GROUP_BRONZE_TABLES) //Don't smooth with SMOOTH_GROUP_TABLES canSmoothWith = list(SMOOTH_GROUP_BRONZE_TABLES) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index b905a99d60e..25d1382ad7e 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -845,7 +845,7 @@ desc = "A paper-thin pane of translucent yet reinforced brass. Nevermind, this is just weak bronze!" icon = 'icons/obj/smooth_structures/clockwork_window.dmi' icon_state = "clockwork_window_single" - glass_type = /obj/item/stack/tile/bronze + glass_type = /obj/item/stack/sheet/bronze /obj/structure/window/bronze/unanchored anchored = FALSE diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index f82427935ef..eebbd1e1771 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -77,7 +77,7 @@ /obj/item/stack/medical/gauze = /datum/species/golem/cloth, /obj/item/stack/sheet/cloth = /datum/species/golem/cloth, /obj/item/stack/sheet/mineral/adamantine = /datum/species/golem/adamantine, - /obj/item/stack/sheet/plastic = /datum/species/golem/plastic, + /obj/item/stack/sheet/bronze = /datum/species/golem/bronze, /obj/item/stack/sheet/cardboard = /datum/species/golem/cardboard, /obj/item/stack/sheet/leather = /datum/species/golem/leather,