From 5f3d9cfa7ecba82daf0480b2c7b3f6447ac865ac Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Dec 2018 18:24:46 -0500 Subject: [PATCH 1/3] syndicate bombs can now spawn in snack vests --- code/game/objects/items/storage/belt.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 249eb67c05..9fadbd3e38 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -369,7 +369,8 @@ /obj/item/reagent_containers/food/drinks/soda_cans/space_up, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola, + /obj/item/reagent_containers/food/drinks/drinkingglass/syndicatebomb )) new rig_snacks(src) From 964f2f75d30fecbbae4da5983d06535c1f3ea95d Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Dec 2018 18:39:01 -0500 Subject: [PATCH 2/3] triv rethink --- code/game/objects/items/storage/belt.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 9fadbd3e38..7414e0d5c2 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -370,7 +370,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola, - /obj/item/reagent_containers/food/drinks/drinkingglass/syndicatebomb + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb )) new rig_snacks(src) From 4ad2b4d070ecdd066c74c880efbf0603f1c49c44 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Dec 2018 19:26:37 -0500 Subject: [PATCH 3/3] Makes the glass --- code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index c24b22ce71..9d173a34a5 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -90,6 +90,10 @@ name = "Nuka Cola" list_reagents = list("nuka_cola" = 50) +/obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb + name = "Syndicat Bomb" + list_reagents = list("syndicatebomb" = 50) + /obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs var/obj/item/reagent_containers/food/snacks/egg/E = I