cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes autolathe "tinfoil hat" bug by renaming Misc section (#10945)

Browse Source 
* Update autolathe_designs.dm

* Update misc_designs.dm

* Update autolathe.dm

* Update autolathe_designs.dm
This commit is contained in:
ChesterTheCheesy
2021-01-30 19:35:02 +01:00
committed by GitHub
parent 0b5a654613
commit e0e3075f52
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/autolathe.dm
View File

@@ -38,7 +38,7 @@
var/processing_line var/processing_line
var/printdirection = 0 var/printdirection = 0
var/queuelength = 0 var/queuelength = 0
var/list/categories = list("Tools","Electronics","Construction","T-Comm","Security","Machinery","Medical","Misc","Dinnerware","Imported", "Search") var/list/categories = list("Tools","Electronics","Construction","T-Comm","Security","Machinery","Medical","Miscellaneous","Dinnerware","Imported", "Search")
/obj/machinery/autolathe/Initialize() /obj/machinery/autolathe/Initialize()
AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert)) AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert))

87
code/modules/research/designs/autolathe_designs.dm
View File

@@ -167,15 +167,6 @@
build_path = /obj/item/storage/toolbox build_path = /obj/item/storage/toolbox
category = list("initial","Tools") category = list("initial","Tools")
/datum/design/rsf
name = "Rapid Service Fabricator (RSF)"
id = "rsf"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/glass = 7500)
build_path = /obj/item/rsf
category = list("initial","Tools", "Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/apc_board /datum/design/apc_board
name = "APC Module" name = "APC Module"
id = "power control" id = "power control"
@@ -236,7 +227,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 50, /datum/material/glass = 100) materials = list(/datum/material/iron = 50, /datum/material/glass = 100)
build_path = /obj/item/camera build_path = /obj/item/camera
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/camera_film /datum/design/camera_film
name = "Camera Film Cartridge" name = "Camera Film Cartridge"
@@ -244,7 +235,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 10, /datum/material/glass = 10) materials = list(/datum/material/iron = 10, /datum/material/glass = 10)
build_path = /obj/item/camera_film build_path = /obj/item/camera_film
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/earmuffs /datum/design/earmuffs
name = "Earmuffs" name = "Earmuffs"
@@ -252,7 +243,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 500, /datum/material/glass = 500) materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/clothing/ears/earmuffs build_path = /obj/item/clothing/ears/earmuffs
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/pipe_painter /datum/design/pipe_painter
name = "Pipe Painter" name = "Pipe Painter"
@@ -278,7 +269,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 500) materials = list(/datum/material/iron = 500)
build_path = /obj/item/tank/internals/emergency_oxygen/empty build_path = /obj/item/tank/internals/emergency_oxygen/empty
category = list("initial","Misc","Equipment") category = list("initial","Miscellaneous","Equipment")
/datum/design/emergency_oxygen_engi /datum/design/emergency_oxygen_engi
name = "Extended-Capacity Emergency Oxygen Tank" name = "Extended-Capacity Emergency Oxygen Tank"
@@ -286,7 +277,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 750) materials = list(/datum/material/iron = 750)
build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty
category = list("hacked","Misc","Equipment") category = list("hacked","Miscellaneous","Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
/datum/design/plasmaman_tank_belt /datum/design/plasmaman_tank_belt
@@ -295,7 +286,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 800) materials = list(/datum/material/iron = 800)
build_path = /obj/item/tank/internals/plasmaman/belt/empty build_path = /obj/item/tank/internals/plasmaman/belt/empty
category = list("hacked","Misc","Equipment") category = list("hacked","Miscellaneous","Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
/datum/design/metal /datum/design/metal
@@ -419,7 +410,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron=50) materials = list(/datum/material/iron=50)
build_path = /obj/item/cultivator build_path = /obj/item/cultivator
category = list("initial","Misc", "Tool Designs") category = list("initial","Miscellaneous", "Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/plant_analyzer /datum/design/plant_analyzer
@@ -428,7 +419,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 30, /datum/material/glass = 20) materials = list(/datum/material/iron = 30, /datum/material/glass = 20)
build_path = /obj/item/plant_analyzer build_path = /obj/item/plant_analyzer
category = list("initial","Misc", "Tool Designs") category = list("initial","Miscellaneous", "Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/shovel /datum/design/shovel
@@ -437,7 +428,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 50) materials = list(/datum/material/iron = 50)
build_path = /obj/item/shovel build_path = /obj/item/shovel
category = list("initial","Misc", "Tool Designs") category = list("initial","Miscellaneous", "Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/spade /datum/design/spade
@@ -446,7 +437,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 50) materials = list(/datum/material/iron = 50)
build_path = /obj/item/shovel/spade build_path = /obj/item/shovel/spade
category = list("initial","Misc", "Tool Designs") category = list("initial","Miscellaneous", "Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/hatchet /datum/design/hatchet
@@ -455,7 +446,16 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000) materials = list(/datum/material/iron = 15000)
build_path = /obj/item/hatchet build_path = /obj/item/hatchet
category = list("initial","Misc", "Tool Designs") category = list("initial","Miscellaneous", "Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/rsf
name = "Rapid Service Fabricator (RSF)"
id = "rsf"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/glass = 7500)
build_path = /obj/item/rsf
category = list("initial","Miscellaneous", "Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/foilhat /datum/design/foilhat
@@ -464,7 +464,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 5500) materials = list(/datum/material/iron = 5500)
build_path = /obj/item/clothing/head/foilhat build_path = /obj/item/clothing/head/foilhat
category = list("hacked", "Misc") category = list("hacked", "Miscellaneous")
/datum/design/scalpel /datum/design/scalpel
name = "Scalpel" name = "Scalpel"
@@ -586,7 +586,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 60, /datum/material/glass = 30) materials = list(/datum/material/iron = 60, /datum/material/glass = 30)
build_path = /obj/item/taperecorder/empty build_path = /obj/item/taperecorder/empty
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/tape /datum/design/tape
name = "Tape" name = "Tape"
@@ -594,7 +594,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 20, /datum/material/glass = 5) materials = list(/datum/material/iron = 20, /datum/material/glass = 5)
build_path = /obj/item/tape/random build_path = /obj/item/tape/random
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/igniter /datum/design/igniter
name = "Igniter" name = "Igniter"
@@ -602,7 +602,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 500, /datum/material/glass = 50) materials = list(/datum/material/iron = 500, /datum/material/glass = 50)
build_path = /obj/item/assembly/igniter build_path = /obj/item/assembly/igniter
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/signaler /datum/design/signaler
name = "Remote Signaling Device" name = "Remote Signaling Device"
@@ -618,7 +618,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 100) materials = list(/datum/material/iron = 100)
build_path = /obj/item/assembly/mousetrap build_path = /obj/item/assembly/mousetrap
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/radio_headset /datum/design/radio_headset
@@ -651,7 +651,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 1000, /datum/material/glass = 500) materials = list(/datum/material/iron = 1000, /datum/material/glass = 500)
build_path = /obj/item/assembly/infra build_path = /obj/item/assembly/infra
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/health_sensor /datum/design/health_sensor
name = "Health Sensor" name = "Health Sensor"
@@ -667,7 +667,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 500, /datum/material/glass = 50) materials = list(/datum/material/iron = 500, /datum/material/glass = 50)
build_path = /obj/item/assembly/timer build_path = /obj/item/assembly/timer
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/voice_analyser /datum/design/voice_analyser
name = "Voice Analyser" name = "Voice Analyser"
@@ -675,7 +675,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 500, /datum/material/glass = 50) materials = list(/datum/material/iron = 500, /datum/material/glass = 50)
build_path = /obj/item/assembly/voice build_path = /obj/item/assembly/voice
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/light_tube /datum/design/light_tube
name = "Light Tube" name = "Light Tube"
@@ -741,7 +741,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 800, /datum/material/glass = 200) materials = list(/datum/material/iron = 800, /datum/material/glass = 200)
build_path = /obj/item/assembly/prox_sensor build_path = /obj/item/assembly/prox_sensor
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/foam_dart /datum/design/foam_dart
name = "Box of Foam Darts" name = "Box of Foam Darts"
@@ -749,7 +749,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 500) materials = list(/datum/material/iron = 500)
build_path = /obj/item/ammo_box/foambox build_path = /obj/item/ammo_box/foambox
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
//hacked autolathe recipes //hacked autolathe recipes
@@ -953,7 +953,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 10000, /datum/material/glass = 1000) materials = list(/datum/material/iron = 10000, /datum/material/glass = 1000)
build_path = /obj/item/modular_computer/laptop/buildable build_path = /obj/item/modular_computer/laptop/buildable
category = list("initial","Misc") category = list("initial","Miscellaneous")
/datum/design/tablet /datum/design/tablet
name = "Tablet Frame" name = "Tablet Frame"
@@ -961,7 +961,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000)
build_path = /obj/item/modular_computer/tablet build_path = /obj/item/modular_computer/tablet
category = list("initial","Misc") category = list("initial","Miscellaneous")
/datum/design/slime_scanner /datum/design/slime_scanner
name = "Slime Scanner" name = "Slime Scanner"
@@ -969,7 +969,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 300, /datum/material/glass = 200) materials = list(/datum/material/iron = 300, /datum/material/glass = 200)
build_path = /obj/item/slime_scanner build_path = /obj/item/slime_scanner
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/pet_carrier /datum/design/pet_carrier
name = "Pet Carrier" name = "Pet Carrier"
@@ -977,7 +977,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 7500, /datum/material/glass = 100) materials = list(/datum/material/iron = 7500, /datum/material/glass = 100)
build_path = /obj/item/pet_carrier build_path = /obj/item/pet_carrier
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/miniature_power_cell /datum/design/miniature_power_cell
name = "Light Fixture Battery" name = "Light Fixture Battery"
@@ -993,7 +993,7 @@
build_type = AUTOLATHE | PROTOLATHE build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 200, /datum/material/glass = 200) materials = list(/datum/material/iron = 200, /datum/material/glass = 200)
build_path = /obj/item/stack/packageWrap build_path = /obj/item/stack/packageWrap
category = list("initial", "Misc", "Equipment") category = list("initial", "Miscellaneous", "Equipment")
maxstack = 30 maxstack = 30
/datum/design/holodisk /datum/design/holodisk
@@ -1002,7 +1002,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/glass = 100) materials = list(/datum/material/iron = 100, /datum/material/glass = 100)
build_path = /obj/item/disk/holodisk build_path = /obj/item/disk/holodisk
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
/datum/design/circuit /datum/design/circuit
name = "Blue Circuit Tile" name = "Blue Circuit Tile"
@@ -1010,7 +1010,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 500, /datum/material/glass = 500) materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/stack/tile/circuit build_path = /obj/item/stack/tile/circuit
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
maxstack = 50 maxstack = 50
/datum/design/circuitgreen /datum/design/circuitgreen
@@ -1019,7 +1019,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 500, /datum/material/glass = 500) materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/stack/tile/circuit/green build_path = /obj/item/stack/tile/circuit/green
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
maxstack = 50 maxstack = 50
/datum/design/circuitred /datum/design/circuitred
@@ -1028,7 +1028,7 @@
build_type = AUTOLATHE build_type = AUTOLATHE
materials = list(/datum/material/iron = 500, /datum/material/glass = 500) materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/stack/tile/circuit/red build_path = /obj/item/stack/tile/circuit/red
category = list("initial", "Misc") category = list("initial", "Miscellaneous")
maxstack = 50 maxstack = 50
/datum/design/penlight /datum/design/penlight
@@ -1048,12 +1048,3 @@
build_path = /obj/item/clothing/neck/stethoscope build_path = /obj/item/clothing/neck/stethoscope
category = list("initial", "Medical", "Medical Designs") category = list("initial", "Medical", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/wallframe/flasher
name = "Mounted Flash Frame"
id = "wallframe/flasher"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 10000, /datum/material/glass = 4000)
build_path = /obj/item/wallframe/flasher
category = list("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

9
code/modules/research/designs/misc_designs.dm
View File

@@ -286,6 +286,15 @@
category = list ("Electronics") category = list ("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_MEDICAL departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_MEDICAL
/datum/design/wallframe/flasher
name = "Mounted Flash Frame"
id = "wallframe/flasher"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 10000, /datum/material/glass = 4000)
build_path = /obj/item/wallframe/flasher
category = list("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
///////////////////////////////////////// /////////////////////////////////////////
////////////Janitor Designs////////////// ////////////Janitor Designs//////////////
///////////////////////////////////////// /////////////////////////////////////////