mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync
This commit is contained in:
@@ -130,3 +130,36 @@
|
||||
RND_CATEGORY_INITIAL,
|
||||
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
|
||||
)
|
||||
|
||||
/datum/design/bs_crystal
|
||||
name = "Bluespace Crystal"
|
||||
id = "bscrystal"
|
||||
build_type = AUTOLATHE
|
||||
materials = list(/datum/material/bluespace = SHEET_MATERIAL_AMOUNT)
|
||||
build_path = /obj/item/stack/sheet/bluespace_crystal
|
||||
category = list(
|
||||
RND_CATEGORY_INITIAL,
|
||||
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
|
||||
)
|
||||
|
||||
/datum/design/mythril
|
||||
name = "Mythril"
|
||||
id = "mythril"
|
||||
build_type = AUTOLATHE
|
||||
materials = list(/datum/material/mythril = SHEET_MATERIAL_AMOUNT)
|
||||
build_path = /obj/item/stack/sheet/mineral/mythril
|
||||
category = list(
|
||||
RND_CATEGORY_INITIAL,
|
||||
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
|
||||
)
|
||||
|
||||
/datum/design/alien_alloy
|
||||
name = "Alien Alloy"
|
||||
id = "allienalloy"
|
||||
build_type = AUTOLATHE
|
||||
materials = list(/datum/material/alloy/alien = SHEET_MATERIAL_AMOUNT)
|
||||
build_path = /obj/item/stack/sheet/mineral/abductor
|
||||
category = list(
|
||||
RND_CATEGORY_INITIAL,
|
||||
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
|
||||
)
|
||||
|
||||
@@ -1162,3 +1162,21 @@
|
||||
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
|
||||
)
|
||||
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
|
||||
|
||||
// Anomaly locked item
|
||||
|
||||
/datum/design/space_furnace
|
||||
name = "Space Furnace"
|
||||
desc = "A heavy furnace capable of forming a temporary bubble that holds in breathable air. Requires a pyroclastic anomaly core to function."
|
||||
id = "space_furnace"
|
||||
build_type = PROTOLATHE | AWAY_LATHE
|
||||
materials = list(
|
||||
/datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
|
||||
/datum/material/silver = SHEET_MATERIAL_AMOUNT*2.5,
|
||||
/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2.5,
|
||||
)
|
||||
build_path = /obj/item/flashlight/lamp/space_bubble
|
||||
category = list(
|
||||
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
|
||||
)
|
||||
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
|
||||
|
||||
@@ -80,6 +80,7 @@
|
||||
"anomaly_refinery",
|
||||
"anomaly_neutralizer",
|
||||
"reactive_armour",
|
||||
"space_furnace",
|
||||
)
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
|
||||
announce_channels = list(RADIO_CHANNEL_SCIENCE)
|
||||
|
||||
Reference in New Issue
Block a user