mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-04a
This commit is contained in:
@@ -47,7 +47,7 @@
|
||||
/// Does this stack require a unique girder in order to make a wall?
|
||||
var/has_unique_girder = FALSE
|
||||
/// What typepath table we create from this stack
|
||||
var/obj/structure/table/tableVariant
|
||||
var/obj/structure/table/table_type
|
||||
/// What typepath stairs do we create from this stack
|
||||
var/obj/structure/stairs/stairs_type
|
||||
/// If TRUE, we'll use a radial instead when displaying recipes
|
||||
@@ -215,6 +215,12 @@
|
||||
else
|
||||
. = (amount)
|
||||
|
||||
/// Gets the table type we make, accounting for potential exceptions.
|
||||
/obj/item/stack/proc/get_table_type()
|
||||
if(ispath(table_type, /obj/structure/table/greyscale) && isnull(material_type))
|
||||
return // This table type breaks without a material type.
|
||||
return table_type
|
||||
|
||||
/**
|
||||
* Builds all recipes in a given recipe list and returns an association list containing them
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user