Skip to content

Commit

Permalink
Fix: Microlathe small problems. Pew materials fix. (#12)
Browse files Browse the repository at this point in the history
* 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 <azizonkg@gmail.com>

* Update designs_circuits.dm

Co-authored-by: Aziz Chynaliev <azizonkg@gmail.com>
  • Loading branch information
Gaxeer and Bizzonium committed Jul 7, 2021
1 parent 997e198 commit fc2c314
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/structures/stool_bed_chair_nest/chairs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
43 changes: 23 additions & 20 deletions code/modules/fabrication/designs/micro/designs_glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
/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
1 change: 0 additions & 1 deletion code/modules/research/designs/designs_circuits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit fc2c314

Please sign in to comment.