cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6544 from VOREStation/upstream-merge-6665

Browse Source 
[MIRROR] 2020 Civilian Wing Overhaul
This commit is contained in:
Novacat
2020-02-08 16:44:36 -05:00
committed by GitHub
parent d91c8ec074 a513230b57
commit 7a704616ea
14 changed files with 1069 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/drinkingglass/glass_boxes.dm
+8
View File
@@ -78,3 +78,11 @@
/obj/item/weapon/storage/box/glass_extras/sticks
name = "box of drink sticks"
extra_type = /obj/item/weapon/glass_extra/stick
/obj/item/weapon/storage/box/glasses/coffeecup
name = "box of coffee cups"
glass_type = /obj/item/weapon/reagent_containers/food/drinks/cup
/obj/item/weapon/storage/box/glasses/coffeemug
name = "box of coffee mugs"
glass_type = /obj/item/weapon/reagent_containers/food/drinks/britcup