cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved loose tiles and wallframes to crafting (#84210)

Browse Source 
## About The Pull Request

There were some tiles and wallframes in lathe designs, while most of
these are already in the crafting menu. Moved all of them into the
crafting menu to avoid confusion, when you can't find some wallframe in
the menu because it must be built in lathe.

Made the light tile craftable in menu, instead of slap-crafting, and
made the circuit tiles use similar recipe (since they both are emissive
tiles). And the circuit tiles can now be cycled in-hand:


![image](https://github.com/tgstation/tgstation/assets/3625094/c7caa5fb-54dd-44d7-8f71-cd02ad740eee)

## Why It's Good For The Game

Centralized place for tiles and wallframes.

## Changelog

🆑
qol: Made light tiles available in the crafting menu
qol: Circuit tile variants can be cycled in-hand
add: Moved loose tiles and wall frames from lathe designs to other tiles
and frames in the crafting menu
/🆑

---------

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
This commit is contained in:
Andrew
2024-06-30 17:39:38 +00:00
committed by GitHub
co-authored by Fikou
parent 77f29d381e
commit e421f8e7c4
7 changed files with 52 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe/engineering_designs.dm
-200
View File
@@ -10,18 +10,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/sparker
name = "Sparker WallFrame"
id = "sparker"
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
build_path = /obj/item/wallframe/sparker
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/tracker_electronics
name = "Solar Tracking Electronics"
id = "solar_tracker"
@@ -95,18 +83,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/turret_control_frame
name = "Turret Control Frame"
id = "turret_control"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6)
build_path = /obj/item/wallframe/turret_control
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/large_welding_tool
name = "Industrial Welding Tool"
id = "large_welding_tool"
@@ -119,55 +95,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/camera_assembly
name = "Camera Assembly"
id = "camera_assembly"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*4, /datum/material/glass = SMALL_MATERIAL_AMOUNT*2.5)
build_path = /obj/item/wallframe/camera
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/newscaster_frame
name = "Newscaster Frame"
id = "newscaster_frame"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
build_path = /obj/item/wallframe/newscaster
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/status_display_frame
name = "Status Display Frame"
id = "status_display_frame"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
build_path = /obj/item/wallframe/status_display
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/intercom_frame
name = "Intercom Frame"
id = "intercom_frame"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25)
build_path = /obj/item/wallframe/intercom
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/earmuffs
name = "Earmuffs"
id = "earmuffs"
@@ -323,130 +250,3 @@
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ATMOSPHERICS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/requests_console
name = "Requests Console Frame"
id = "requests_console"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
build_path = /obj/item/wallframe/requests_console
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/light_switch_frame
name = "Light Switch Frame"
id = "light_switch_frame"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25)
build_path = /obj/item/wallframe/light_switch
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/telescreen_turbine
name = "Turbine Telescreen"
id = "telescreen_turbine"
build_type = PROTOLATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
)
build_path = /obj/item/wallframe/telescreen/turbine
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/telescreen_engine
name = "Engine Telescreen"
id = "telescreen_engine"
build_type = PROTOLATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
)
build_path = /obj/item/wallframe/telescreen/engine
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/telescreen_auxbase
name = "Auxiliary Base Telescreen"
id = "telescreen_auxbase"
build_type = PROTOLATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
)
build_path = /obj/item/wallframe/telescreen/auxbase
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/tram_controller
name = "Tram Controller Cabinet"
id = "tram_controller"
build_type = PROTOLATHE
materials = list(
/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4,
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
/datum/material/gold = SHEET_MATERIAL_AMOUNT * 7,
/datum/material/silver = SHEET_MATERIAL_AMOUNT * 7,
/datum/material/diamond = SHEET_MATERIAL_AMOUNT * 4,
)
build_path = /obj/item/wallframe/tram/controller
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/tram_display
name = "Tram Indicator Display"
id = "tram_display"
build_type = PROTOLATHE
materials = list(
/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4,
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1,
/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2,
)
build_path = /obj/item/wallframe/indicator_display
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/tram_floor_dark
name = "Dark Tram Tile"
id = "tram_floor_dark"
build_type = PROTOLATHE
materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 0.25)
build_path = /obj/item/stack/thermoplastic
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/tram_floor_light
name = "Light Tram Tile"
id = "tram_floor_light"
build_type = PROTOLATHE
materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 0.25)
build_path = /obj/item/stack/thermoplastic/light
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
code/modules/research/designs/autolathe/multi-department_designs.dm
-37
View File
@@ -483,43 +483,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/datum/design/circuit
name = "Blue Circuit Tile"
id = "circuit"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
build_path = /obj/item/stack/tile/circuit
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/datum/design/circuitgreen
name = "Green Circuit Tile"
id = "circuitgreen"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
build_path = /obj/item/stack/tile/circuit/green
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/datum/design/circuitred
name = "Red Circuit Tile"
id = "circuitred"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
build_path = /obj/item/stack/tile/circuit/red
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/datum/design/conveyor_belt
name = "Conveyor Belt"
id = "conveyor_belt"
code/modules/research/techweb/nodes/engi_nodes.dm
-10
View File
@@ -142,16 +142,6 @@
"wirecutters",
"light_bulb",
"light_tube",
"intercom_frame",
"newscaster_frame",
"status_display_frame",
"circuit",
"circuitgreen",
"circuitred",
"tram_floor_dark",
"tram_floor_light",
"tram_controller",
"tram_display",
"crossing_signal",
"guideway_sensor",
)
code/modules/research/techweb/nodes/security_nodes.dm
-2
View File
@@ -21,7 +21,6 @@
description = "All the essentials to subdue a mime."
prereq_ids = list(TECHWEB_NODE_BASIC_ARMS)
design_ids = list(
"camera_assembly",
"secdata",
"mining",
"prisonmanage",
@@ -30,7 +29,6 @@
"security_photobooth",
"photobooth",
"scanner_gate",
"turret_control",
"pepperspray",
"dragnet_beacon",
"inspector",