shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7024 from Citadel-Station-13/upstream-merge-38300

Browse Source 
[MIRROR] Fixes Pubby maint boozeomat
This commit is contained in:
deathride58
2018-06-07 04:34:46 +00:00
committed by GitHub
parent a4d1d3d89b 1f21f1edcd
commit 8d97bc79e5
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/PubbyStation/PubbyStation.dmm
+1 -4
View File
@@ -46986,10 +46986,7 @@
/turf/open/floor/plasteel/dark,
/area/library)
"cBk" = (
/obj/machinery/vending/boozeomat{
products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1, /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1, /obj/item/reagent_containers/food/drinks/bottle/cream = 1, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1, /obj/item/reagent_containers/food/drinks/drinkingglass = 10, /obj/item/reagent_containers/food/drinks/ice = 3, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6, /obj/item/reagent_containers/food/drinks/flask = 1);
req_access_txt = "0"
},
/obj/machinery/vending/boozeomat/maint,
/turf/closed/wall,
/area/maintenance/department/crew_quarters/dorms)
"cBl" = (
code/modules/vending/boozeomat.dm
+12
View File
@@ -38,6 +38,18 @@
req_access_txt = "25"
refill_canister = /obj/item/vending_refill/boozeomat
/obj/machinery/vending/boozeomat/maint
products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
/obj/item/reagent_containers/food/drinks/bottle/absinthe = 1,
/obj/item/reagent_containers/food/drinks/bottle/limejuice = 1,
/obj/item/reagent_containers/food/drinks/bottle/cream = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1,
/obj/item/reagent_containers/food/drinks/drinkingglass = 10,
/obj/item/reagent_containers/food/drinks/ice = 3,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6,
/obj/item/reagent_containers/food/drinks/flask = 1)
req_access_txt = "0"
/obj/item/vending_refill/boozeomat
machine_name = "Booze-O-Mat"
icon_state = "refill_booze"