From d6775ae8c631d3e44e9773ea86cc2a8fb9fddb4a Mon Sep 17 00:00:00 2001 From: Hawk_v3 Date: Thu, 9 May 2019 21:11:34 +0100 Subject: [PATCH 1/3] Readds Glucose Syringes Commit 727ecd39a809b683fb474fbdf665b44520f13deb did not just change syringes, and therefore cannot be undone. --- code/game/machinery/vending.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 6801ba303e..afb47f9d0b 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -797,7 +797,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 8, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8, /obj/item/weapon/reagent_containers/pill/diet = 8, - ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition /obj/item/weapon/towel/random = 8) prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3, @@ -807,7 +807,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5, /obj/item/weapon/reagent_containers/pill/diet = 25, - ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition /obj/item/weapon/towel/random = 40) contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4) From 37c4ec873dbbb6104b07381468b32ec27894d6ff Mon Sep 17 00:00:00 2001 From: Hawk_v3 Date: Thu, 9 May 2019 21:29:17 +0100 Subject: [PATCH 2/3] Tab Fixing for Travis Hopefully --- code/game/machinery/vending.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index afb47f9d0b..98536e19f2 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -797,9 +797,8 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 8, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8, /obj/item/weapon/reagent_containers/pill/diet = 8, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition /obj/item/weapon/towel/random = 8) - prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 40, //VOREStation Edit, @@ -807,9 +806,8 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5, /obj/item/weapon/reagent_containers/pill/diet = 25, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition /obj/item/weapon/towel/random = 40) - contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4) /obj/machinery/vending/cart From 44ed4494b4b67bca4e0b29327c29bfa232513a31 Mon Sep 17 00:00:00 2001 From: Hawk_v3 Date: Thu, 9 May 2019 21:29:17 +0100 Subject: [PATCH 3/3] Tab Fixing for Travis Hopefully --- code/game/machinery/vending.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index afb47f9d0b..432677071a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -797,9 +797,8 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 8, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8, /obj/item/weapon/reagent_containers/pill/diet = 8, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition, /obj/item/weapon/towel/random = 8) - prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 40, //VOREStation Edit, @@ -807,9 +806,8 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5, /obj/item/weapon/reagent_containers/pill/diet = 25, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, YW Readdition, /obj/item/weapon/towel/random = 40) - contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4) /obj/machinery/vending/cart