diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 571b0296497..ada08d96f79 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -7077,7 +7077,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/grenade/clusterbuster/smoke, /obj/structure/table/wood, /turf/simulated/floor/plasteel/dark, /area/admin) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 4f2d9fbbc78..f3e914f1592 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -209,7 +209,6 @@ /obj/item/stack/nanopaste = 50, /obj/item/clothing/under/costume/psyjump = 50, /obj/item/immortality_talisman = 50, - /obj/item/grenade/clusterbuster/smoke = 50 ) /obj/effect/spawner/lootdrop/trade_sol/minerals @@ -319,7 +318,6 @@ // Cluster grenades /obj/item/grenade/clusterbuster = 50, // cluster flashbang - /obj/item/grenade/clusterbuster/teargas = 50 ) /obj/effect/spawner/lootdrop/trade_sol/eng diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm index 895f5c71f39..6f262afa6ba 100644 --- a/code/game/objects/items/weapons/grenades/clusterbuster.dm +++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm @@ -84,10 +84,6 @@ name = "Electromagnetic Storm" payload = /obj/item/grenade/empgrenade -/obj/item/grenade/clusterbuster/smoke - name = "Ninja Vanish" - payload = /obj/item/grenade/smokebomb - /obj/item/grenade/clusterbuster/metalfoam name = "Instant Concrete" payload = /obj/item/grenade/chem_grenade/metalfoam @@ -96,18 +92,10 @@ name = "Inferno" payload = /obj/item/grenade/chem_grenade/incendiary -/obj/item/grenade/clusterbuster/antiweed - name = "RoundDown" - payload = /obj/item/grenade/chem_grenade/antiweed - /obj/item/grenade/clusterbuster/cleaner name = "Mr. Proper" payload = /obj/item/grenade/chem_grenade/cleaner -/obj/item/grenade/clusterbuster/teargas - name = "\improper Oignon Teargas Grenade" - payload = /obj/item/grenade/chem_grenade/teargas - /obj/item/grenade/clusterbuster/facid name = "Aciding Rain" payload = /obj/item/grenade/chem_grenade/facid @@ -132,10 +120,6 @@ name = "\improper Mega Meat Grenade" payload = /obj/item/grenade/chem_grenade/meat -/obj/item/grenade/clusterbuster/nervegas - name = "\improper Nerve Gas Clusterbomb" - payload = /obj/item/grenade/chem_grenade/saringas - /obj/item/grenade/clusterbuster/megadirt name = "\improper Megamaid's Revenge Grenade" payload = /obj/item/grenade/chem_grenade/dirt @@ -150,21 +134,11 @@ desc = "An object in motion remains in motion." payload = /obj/item/grenade/chem_grenade/lube -/obj/item/grenade/clusterbuster/hippie - name = "\improper Hippie Grenade" - desc = "Almost as good as the summer of '69." - payload = /obj/item/grenade/chem_grenade/drugs - /obj/item/grenade/clusterbuster/holy name = "\improper Purification Grenade" desc = "Blessed excessively." payload = /obj/item/grenade/chem_grenade/holywater -/obj/item/grenade/clusterbuster/hellwater - name = "Righteous Fury" - desc = "It's righteous, not badminnery." - payload = /obj/item/grenade/chem_grenade/hellwater - /obj/item/grenade/clusterbuster/booze name = "\improper Booze Grenade" payload = /obj/item/reagent_containers/food/drinks/bottle/random_drink diff --git a/code/game/objects/items/weapons/grenades/custom_grenades.dm b/code/game/objects/items/weapons/grenades/custom_grenades.dm index d48097665ee..7729b9f2fae 100644 --- a/code/game/objects/items/weapons/grenades/custom_grenades.dm +++ b/code/game/objects/items/weapons/grenades/custom_grenades.dm @@ -49,23 +49,6 @@ B.reagents.add_reagent("holywater",100) beakers += B -/obj/item/grenade/chem_grenade/hellwater - payload_name = "hell water" - desc = "And he struck them down with an unholy fury that burn like one-thousands badmins." - stage = 2 - det_time = 30 - -/obj/item/grenade/chem_grenade/hellwater/Initialize(mapload) - . = ..() - var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) - B1.reagents.add_reagent("hell_water",80) - B1.reagents.add_reagent("sugar",20) - B2.reagents.add_reagent("hell_water", 60) - B2.reagents.add_reagent("potassium", 20) - B2.reagents.add_reagent("phosphorus", 20) - - /obj/item/grenade/chem_grenade/drugs payload_name = "miracle" desc = "How does it work?"