From 37b9e24bc01cc7e6c40a50e0b215714b6a22f526 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Jul 2017 06:08:56 -0500 Subject: [PATCH] Removes the gulag sink and water bottles from the sustenance vendor. (#2094) --- _maps/map_files/Mining/Lavaland.dmm | 4 ++-- code/game/machinery/vending.dm | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index d5d795af3c..cc0873f03d 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /turf/closed/indestructible/riveted/boss, /area/lavaland/surface/outdoors) @@ -10012,7 +10012,7 @@ aE az az az -aV +az az aQ bk diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 824aa30326..248b25e91a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -769,8 +769,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "sustenance" products = list(/obj/item/weapon/reagent_containers/food/snacks/tofu = 24, /obj/item/weapon/reagent_containers/food/drinks/ice = 12, - /obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6, - /obj/item/weapon/reagent_containers/glass/beaker/waterbottle = 10) + /obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6) contraband = list(/obj/item/weapon/kitchen/knife = 6, /obj/item/weapon/reagent_containers/food/drinks/coffee = 12, /obj/item/weapon/tank/internals/emergency_oxygen = 6,