diff --git a/baystation12.dme b/baystation12.dme
index 3231664e02e..4a15cd3d301 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -523,9 +523,11 @@
#include "code\game\objects\items\weapons\twohanded.dm"
#include "code\game\objects\items\weapons\weaponry.dm"
#include "code\game\objects\items\weapons\wires.dm"
+#include "code\game\objects\items\weapons\grenades\bananade.dm"
#include "code\game\objects\items\weapons\grenades\chem_grenade.dm"
#include "code\game\objects\items\weapons\grenades\emgrenade.dm"
#include "code\game\objects\items\weapons\grenades\flashbang.dm"
+#include "code\game\objects\items\weapons\grenades\ghettobomb.dm"
#include "code\game\objects\items\weapons\grenades\grenade.dm"
#include "code\game\objects\items\weapons\grenades\smokebomb.dm"
#include "code\game\objects\items\weapons\grenades\spawnergrenade.dm"
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
new file mode 100644
index 00000000000..a2da025d0b7
--- /dev/null
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -0,0 +1,94 @@
+//improvised explosives//
+
+//iedcasing assembly crafting//
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/attackby(var/obj/item/I, mob/user as mob)
+ if(istype(I, /obj/item/device/assembly/igniter))
+ var/obj/item/device/assembly/igniter/G = I
+ var/obj/item/weapon/grenade/iedcasing/W = new /obj/item/weapon/grenade/iedcasing
+ user.before_take_item(G)
+ user.before_take_item(src)
+ user.put_in_hands(W)
+ user << "You stuff the [I] in the [src], emptying the contents beforehand."
+ W.underlays += image(src.icon, icon_state = src.icon_state)
+ del(I)
+ del(src)
+
+
+/obj/item/weapon/grenade/iedcasing
+ name = "improvised explosive assembly"
+ desc = "An igniter stuffed into an aluminum shell."
+ w_class = 2.0
+ icon = 'icons/obj/grenade.dmi'
+ icon_state = "improvised_grenade"
+ item_state = "flashbang"
+ throw_speed = 4
+ throw_range = 20
+ flags = FPRINT | TABLEPASS | CONDUCT
+ slot_flags = SLOT_BELT
+ var/assembled = 0
+ active = 1
+ det_time = 50
+
+
+
+/obj/item/weapon/grenade/iedcasing/afterattack(atom/target, mob/user , flag) //Filling up the can
+ if(assembled == 0)
+ if( istype(target, /obj/structure/reagent_dispensers/fueltank))
+ if(target.reagents.total_volume < 50)
+ user << "There's not enough fuel left to work with."
+ return
+ var/obj/structure/reagent_dispensers/fueltank/F = target
+ F.reagents.remove_reagent("fuel", 50, 1)//Deleting 50 fuel from the welding fuel tank,
+ assembled = 1
+ user << "You've filled the makeshift explosive with welding fuel."
+ playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
+ desc = "An improvised explosive assembly. Filled to the brim with 'Explosive flavor'"
+ overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled")
+ return
+
+
+/obj/item/weapon/grenade/iedcasing/attackby(var/obj/item/I, mob/user as mob) //Wiring the can for ignition
+ if(istype(I, /obj/item/weapon/cable_coil))
+ if(assembled == 1)
+ var/obj/item/weapon/cable_coil/C = I
+ C.use(1)
+ assembled = 2
+ user << "You wire the igniter to detonate the fuel."
+ desc = "A weak, improvised explosive."
+ overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired")
+ name = "improvised explosive"
+ active = 0
+ det_time = rand(30,80)
+
+/obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) //
+ if(!active)
+ if(clown_check(user))
+ user << "You light the [name]!"
+ active = 1
+ overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled")
+ icon_state = initial(icon_state) + "_active"
+ assembled = 3
+ add_fingerprint(user)
+ var/turf/bombturf = get_turf(src)
+ var/area/A = get_area(bombturf)
+ var/log_str = "[key_name(usr)]? has primed a [name] for detonation at [A.name] (JMP)."
+ message_admins(log_str)
+ log_game(log_str)
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.throw_mode_on()
+ spawn(det_time)
+ prime()
+
+/obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up
+// update_mob()
+// explosion(epicenter, 1, 2, 3, 3)
+ explosion(src.loc,0,0,2,2)
+ del(src)
+
+/obj/item/weapon/grenade/iedcasing/examine()
+ set src in usr
+ usr << desc
+ if(assembled == 3)
+ usr << "You can't tell when it will explode!" //Stops you from checking the time to detonation unlike regular grenades
+ return
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 66a1b3e343e..8fbac167ac3 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -241,15 +241,6 @@
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
-/obj/item/weapon/reagent_containers/food/drinks/cola
- name = "Space Cola"
- desc = "Cola. in space."
- icon_state = "cola"
- New()
- ..()
- reagents.add_reagent("cola", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/beer
name = "Space Beer"
@@ -272,68 +263,6 @@
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
-/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind
- name = "Space Mountain Wind"
- desc = "Blows right through you like a space wind."
- icon_state = "space_mountain_wind"
- New()
- ..()
- reagents.add_reagent("spacemountainwind", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/thirteenloko
- name = "Thirteen Loko"
- desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsably."
- icon_state = "thirteen_loko"
- New()
- ..()
- reagents.add_reagent("thirteenloko", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/dr_gibb
- name = "Dr. Gibb"
- desc = "A delicious mixture of 42 different flavors."
- icon_state = "dr_gibb"
- New()
- ..()
- reagents.add_reagent("dr_gibb", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/starkist
- name = "Star-kist"
- desc = "The taste of a star in liquid form. And, a bit of tuna...?"
- icon_state = "starkist"
- New()
- ..()
- reagents.add_reagent("cola", 15)
- reagents.add_reagent("orangejuice", 15)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/space_up
- name = "Space-Up"
- desc = "Tastes like a hull breach in your mouth."
- icon_state = "space-up"
- New()
- ..()
- reagents.add_reagent("space_up", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-/obj/item/weapon/reagent_containers/food/drinks/lemon_lime
- name = "Lemon-Lime"
- desc = "You wanted ORANGE. It gave you Lemon Lime."
- icon_state = "lemon-lime"
- New()
- ..()
- reagents.add_reagent("lemon_lime", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
-
-
/obj/item/weapon/reagent_containers/food/drinks/sillycup
name = "Paper Cup"
desc = "A paper water cup."
@@ -350,21 +279,6 @@
else
icon_state = "water_cup_e"
-/obj/item/weapon/reagent_containers/food/drinks/tonic
- name = "T-Borg's Tonic Water"
- desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
- icon_state = "tonic"
- New()
- ..()
- reagents.add_reagent("tonic", 50)
-
-/obj/item/weapon/reagent_containers/food/drinks/sodawater
- name = "Soda Water"
- desc = "A can of soda water. Why not make a scotch and soda?"
- icon_state = "sodawater"
- New()
- ..()
- reagents.add_reagent("sodawater", 50)
//////////////////////////drinkingglass and shaker//
//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink
// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass
@@ -399,4 +313,96 @@
name = "cup"
desc = "A cup with the british flag emblazoned on it."
icon_state = "britcup"
- volume = 30
\ No newline at end of file
+ volume = 30
+
+//////////////////////////soda_cans//
+//These are in their own group to be used as IED's in /obj/item/weapon/grenade/ghettobomb.dm
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola
+ name = "Space Cola"
+ desc = "Cola. in space."
+ icon_state = "cola"
+ New()
+ ..()
+ reagents.add_reagent("cola", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic
+ name = "T-Borg's Tonic Water"
+ desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
+ icon_state = "tonic"
+ New()
+ ..()
+ reagents.add_reagent("tonic", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater
+ name = "Soda Water"
+ desc = "A can of soda water. Why not make a scotch and soda?"
+ icon_state = "sodawater"
+ New()
+ ..()
+ reagents.add_reagent("sodawater", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_line
+ name = "Lemon-Lime"
+ desc = "You wanted ORANGE. It gave you Lemon Lime."
+ icon_state = "lemon-lime"
+ New()
+ ..()
+ reagents.add_reagent("lemon_lime", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up
+ name = "Space-Up"
+ desc = "Tastes like a hull breach in your mouth."
+ icon_state = "space-up"
+ New()
+ ..()
+ reagents.add_reagent("space_up", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist
+ name = "Star-kist"
+ desc = "The taste of a star in liquid form. And, a bit of tuna...?"
+ icon_state = "starkist"
+ New()
+ ..()
+ reagents.add_reagent("cola", 15)
+ reagents.add_reagent("orangejuice", 15)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind
+ name = "Space Mountain Wind"
+ desc = "Blows right through you like a space wind."
+ icon_state = "space_mountain_wind"
+ New()
+ ..()
+ reagents.add_reagent("spacemountainwind", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko
+ name = "Thirteen Loko"
+ desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsably."
+ icon_state = "thirteen_loko"
+ New()
+ ..()
+ reagents.add_reagent("thirteenloko", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb
+ name = "Dr. Gibb"
+ desc = "A delicious mixture of 42 different flavors."
+ icon_state = "dr_gibb"
+ New()
+ ..()
+ reagents.add_reagent("dr_gibb", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index 1735fd8b3f0..5fc3347d336 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ