mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +01:00
[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 <piotrbryla@onet.pl> Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
/*
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -422,7 +422,7 @@
|
||||
to_chat(user, "<span class='notice'>You start slicing apart [src]...</span>")
|
||||
if(W.use_tool(src, user, 40, volume=50))
|
||||
to_chat(user, "<span class='notice'>You slice apart [src].</span>")
|
||||
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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user