cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8784 from VOREStation/upstream-merge-7521

Browse Source 
[MIRROR] Adds metamorphic pint glasses to RSF, autolathe, supply packs
This commit is contained in:
Novacat
2020-08-21 01:42:13 -04:00
committed by GitHub
parent 10bcf007c5 1774102ec6
commit 4dc293b831
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/datums/autolathe/general.dm
View File

@@ -6,38 +6,49 @@
name = "water-cooler bottle" name = "water-cooler bottle"
path =/obj/item/weapon/reagent_containers/glass/cooler_bottle path =/obj/item/weapon/reagent_containers/glass/cooler_bottle
/datum/category_item/autolathe/general/drinkingglass_square /datum/category_item/autolathe/general/drinkingglass
is_stack = TRUE
/datum/category_item/autolathe/general/drinkingglass/square
name = "half-pint glass" name = "half-pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/square path =/obj/item/weapon/reagent_containers/food/drinks/glass2/square
/datum/category_item/autolathe/general/drinkingglass_rocks /datum/category_item/autolathe/general/drinkingglass/rocks
name = "rocks glass" name = "rocks glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks path =/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks
/datum/category_item/autolathe/general/drinkingglass_shake /datum/category_item/autolathe/general/drinkingglass/shake
name = "milkshake glass" name = "milkshake glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shake path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shake
/datum/category_item/autolathe/general/drinkingglass_cocktail /datum/category_item/autolathe/general/drinkingglass/cocktail
name = "cocktail glass" name = "cocktail glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail path =/obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail
/datum/category_item/autolathe/general/drinkingglass_shot /datum/category_item/autolathe/general/drinkingglass/shot
name = "shot glass" name = "shot glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shot path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shot
/datum/category_item/autolathe/general/drinkingglass_pint /datum/category_item/autolathe/general/drinkingglass/pint
name = "pint glass" name = "pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pint path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pint
/datum/category_item/autolathe/general/drinkingglass_mug /datum/category_item/autolathe/general/drinkingglass/mug
name = "glass mug" name = "glass mug"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/mug path =/obj/item/weapon/reagent_containers/food/drinks/glass2/mug
/datum/category_item/autolathe/general/drinkingglass_wine /datum/category_item/autolathe/general/drinkingglass/wine
name = "wine glass" name = "wine glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/wine path =/obj/item/weapon/reagent_containers/food/drinks/glass2/wine
/datum/category_item/autolathe/general/drinkingglass/metaglass
name = "metamorphic glass"
path =/obj/item/weapon/reagent_containers/food/drinks/metaglass
/datum/category_item/autolathe/general/drinkingglass/metaglass/metapint
name = "metamorphic pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
/datum/category_item/autolathe/general/flashlight /datum/category_item/autolathe/general/flashlight
name = "flashlight" name = "flashlight"
path =/obj/item/device/flashlight path =/obj/item/device/flashlight

1
code/datums/supplypacks/hospitality.dm
View File

@@ -38,6 +38,7 @@
/obj/item/weapon/storage/box/glasses/shot, /obj/item/weapon/storage/box/glasses/shot,
/obj/item/weapon/storage/box/glasses/mug, /obj/item/weapon/storage/box/glasses/mug,
/obj/item/weapon/storage/box/glasses/meta, /obj/item/weapon/storage/box/glasses/meta,
/obj/item/weapon/storage/box/glasses/meta/metapint,
/obj/item/weapon/reagent_containers/food/drinks/shaker, /obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/storage/box/glass_extras/straws, /obj/item/weapon/storage/box/glass_extras/straws,
/obj/item/weapon/storage/box/glass_extras/sticks /obj/item/weapon/storage/box/glass_extras/sticks

1
code/game/objects/items/weapons/RSF.dm
View File

@@ -19,6 +19,7 @@ RSF
var/list/container_types = list( var/list/container_types = list(
"metamorphic glass" = /obj/item/weapon/reagent_containers/food/drinks/metaglass, "metamorphic glass" = /obj/item/weapon/reagent_containers/food/drinks/metaglass,
"metamorphic pint glass" = /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint,
"half-pint glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/square, "half-pint glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/square,
"rocks glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/rocks, "rocks glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/rocks,
"milkshake glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/shake, "milkshake glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/shake,

5
code/modules/food/drinkingglass/glass_boxes.dm
View File

@@ -13,6 +13,7 @@
new /obj/item/weapon/reagent_containers/food/drinks/glass2/mug(src) new /obj/item/weapon/reagent_containers/food/drinks/glass2/mug(src)
new /obj/item/weapon/reagent_containers/food/drinks/glass2/wine(src) new /obj/item/weapon/reagent_containers/food/drinks/glass2/wine(src)
new /obj/item/weapon/reagent_containers/food/drinks/metaglass(src) new /obj/item/weapon/reagent_containers/food/drinks/metaglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint(src)
/obj/item/weapon/storage/box/glasses /obj/item/weapon/storage/box/glasses
name = "box of glasses" name = "box of glasses"
@@ -60,6 +61,10 @@
name = "box of half-pint metamorphic glasses" name = "box of half-pint metamorphic glasses"
glass_type = /obj/item/weapon/reagent_containers/food/drinks/metaglass glass_type = /obj/item/weapon/reagent_containers/food/drinks/metaglass
/obj/item/weapon/storage/box/glasses/meta/metapint
name = "box of metamorphic pint glasses"
glass_type = /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
/obj/item/weapon/storage/box/glass_extras /obj/item/weapon/storage/box/glass_extras
name = "box of cocktail garnishings" name = "box of cocktail garnishings"
var/extra_type = /obj/item/weapon/glass_extra var/extra_type = /obj/item/weapon/glass_extra

7
html/changelogs/meghan rossi - metapint.yml Normal file
View File

@@ -0,0 +1,7 @@
author: Meghan Rossi
delete-after: True
changes:
- rscadd: "The rapid service fabricator (found on service borgs) can now produce metamorphic pint glasses."
- rscadd: "The party supplies and bar supplies crates orderable from cargo now contain metamorphic pint glasses."
- rscadd: "The autolathe can now produce metamorphic pint and half-pint glasses."
- rscadd: "The autolathe can now produce all drinking glasses in batches of 5 or 10."