From 50e66c543c9131279915b11b107fe94960282e08 Mon Sep 17 00:00:00 2001 From: Gaxeer <44334376+Gaxeer@users.noreply.github.com> Date: Tue, 29 Jun 2021 17:51:59 +0300 Subject: [PATCH] Fix: Microlathe small problems. Pew materials fix. (#12) * fixed double half-pint glasses, sorted glasses and added teacup. All in microlathe * Fixed bench materials * Update code/modules/research/designs/designs_circuits.dm Co-authored-by: Aziz Chynaliev * Update designs_circuits.dm Co-authored-by: Aziz Chynaliev --- .../structures/stool_bed_chair_nest/chairs.dm | 4 +- .../designs/micro/designs_glasses.dm | 43 ++++++++++--------- .../research/designs/designs_circuits.dm | 1 - 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 0e6b6058b0..da3c63d1cc 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -424,8 +424,8 @@ icon_state = "pew_left" base_icon = "pew_left" -/obj/structure/bed/chair/pew/New(var/newloc) - ..(newloc, pew_material) +/obj/structure/bed/chair/pew/New(newloc, newmaterial = DEFAULT_FURNITURE_MATERIAL) + ..(newloc, newmaterial) /obj/structure/bed/chair/pew/mahogany color = WOOD_COLOR_RICH diff --git a/code/modules/fabrication/designs/micro/designs_glasses.dm b/code/modules/fabrication/designs/micro/designs_glasses.dm index 20a4f9fb06..78ca01dd22 100644 --- a/code/modules/fabrication/designs/micro/designs_glasses.dm +++ b/code/modules/fabrication/designs/micro/designs_glasses.dm @@ -3,41 +3,44 @@ category = "Drinking Glasses" fabricator_types = list(FABRICATOR_CLASS_MICRO) -/datum/fabricator_recipe/drinkingglass/rocks - path = /obj/item/reagent_containers/food/drinks/glass2/rocks - -/datum/fabricator_recipe/drinkingglass/shake - path = /obj/item/reagent_containers/food/drinks/glass2/shake +/datum/fabricator_recipe/drinkingglass/shot + path = /obj/item/reagent_containers/food/drinks/glass2/shot /datum/fabricator_recipe/drinkingglass/cocktail path = /obj/item/reagent_containers/food/drinks/glass2/cocktail -/datum/fabricator_recipe/drinkingglass/shot - path = /obj/item/reagent_containers/food/drinks/glass2/shot +/datum/fabricator_recipe/drinkingglass/rocks + path = /obj/item/reagent_containers/food/drinks/glass2/rocks -/datum/fabricator_recipe/drinkingglass/pint - path = /obj/item/reagent_containers/food/drinks/glass2/pint +/datum/fabricator_recipe/drinkingglass/cognac + path = /obj/item/reagent_containers/food/drinks/glass2/cognac -/datum/fabricator_recipe/drinkingglass/mug - path = /obj/item/reagent_containers/food/drinks/glass2/mug +/datum/fabricator_recipe/drinkingglass/goblet + path = /obj/item/reagent_containers/food/drinks/glass2/goblet /datum/fabricator_recipe/drinkingglass/wine path = /obj/item/reagent_containers/food/drinks/glass2/wine -/datum/fabricator_recipe/drinkingglass/carafe - path = /obj/item/reagent_containers/food/drinks/glass2/carafe - /datum/fabricator_recipe/drinkingglass/flute path = /obj/item/reagent_containers/food/drinks/glass2/flute +/datum/fabricator_recipe/drinkingglass/shake + path = /obj/item/reagent_containers/food/drinks/glass2/shake + /datum/fabricator_recipe/drinkingglass/coffecup path = /obj/item/reagent_containers/food/drinks/glass2/coffeecup -/datum/fabricator_recipe/drinkingglass/cognac - path = /obj/item/reagent_containers/food/drinks/glass2/cognac +/datum/fabricator_recipe/drinkingglass/glasscup + path = /obj/item/reagent_containers/food/drinks/glass2/coffeecup/glass -/datum/fabricator_recipe/drinkingglass/goblet - path = /obj/item/reagent_containers/food/drinks/glass2/goblet +/datum/fabricator_recipe/drinkingglass/teacup + path = /obj/item/reagent_containers/food/drinks/glass2/coffeecup/teacup + +/datum/fabricator_recipe/drinkingglass/mug + path = /obj/item/reagent_containers/food/drinks/glass2/mug -/datum/fabricator_recipe/drinkingglass/coffeecup/glass - path = /obj/item/reagent_containers/food/drinks/glass2/coffeecup/glass \ No newline at end of file +/datum/fabricator_recipe/drinkingglass/carafe + path = /obj/item/reagent_containers/food/drinks/glass2/carafe + +/datum/fabricator_recipe/drinkingglass/pint + path = /obj/item/reagent_containers/food/drinks/glass2/pint \ No newline at end of file diff --git a/code/modules/research/designs/designs_circuits.dm b/code/modules/research/designs/designs_circuits.dm index 1538274ad0..ea378533d9 100644 --- a/code/modules/research/designs/designs_circuits.dm +++ b/code/modules/research/designs/designs_circuits.dm @@ -27,7 +27,6 @@ build_path = /obj/item/stock_parts/circuitboard/arcade/battle sort_string = "MAAAA" category_items = "Misc. Machinery" - category_items = "Computer Boards" /datum/design/circuit/oriontrail name = "orion trail arcade machine"