diff --git a/code/game/objects/items/weapons/grenades/atmosgrenade.dm b/code/game/objects/items/weapons/grenades/atmosgrenade.dm deleted file mode 100644 index 3dbfc9bec68..00000000000 --- a/code/game/objects/items/weapons/grenades/atmosgrenade.dm +++ /dev/null @@ -1,28 +0,0 @@ - - - -/obj/item/weapon/grenade/gas - name = "Plasma Fire Grenade" - desc = "A compressed plasma grenade, used to start horrific plasma fires." - origin_tech = "materials=3;magnets=4;syndicate=4" - icon = 'icons/obj/grenade.dmi' - icon_state = "syndicate" - item_state = "flashbang" - var/spawn_contents = "plasma=100;TEMP=1000" - -/obj/item/weapon/grenade/gas/prime() - var/turf/target_turf = get_turf(src) - if(istype(target_turf)) - target_turf.atmos_spawn_air(spawn_contents) - target_turf.air_update_turf() - qdel(src) - -/obj/item/weapon/grenade/gas/knockout - name = "Knockout Grenade" - desc = "A grenade that floods the area with nitrous oxide, putting everyone to sleep." - spawn_contents = "n2o=100;TEMP=293.15" - -/obj/item/weapon/grenade/gas/freeze - name = "Freon Grenade" - desc = "A grenade which freezes over everything near its detonation area." - spawn_contents = "freon=100;TEMP=120" \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm index 4825f7d3884..b685a65bac2 100644 --- a/code/game/objects/items/weapons/grenades/clusterbuster.dm +++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm @@ -126,18 +126,3 @@ /obj/item/weapon/grenade/clusterbuster/clf3 name = "WELCOME TO HELL" payload = /obj/item/weapon/grenade/chem_grenade/clf3 - -/obj/item/weapon/grenade/clusterbuster/plasma - name = "Plasma Cluster Grenade" - desc = "For when everything needs to die in a fire." - payload = /obj/item/weapon/grenade/gas - -/obj/item/weapon/grenade/clusterbuster/n2o - name = "N2O Cluster Grenade" - desc = "For when you need to knock out EVERYONE." - payload = /obj/item/weapon/grenade/gas/knockout - -/obj/item/weapon/grenade/clusterbuster/freon - name = "Freon Cluster Grenade" - desc = "For when you need everyone to chill out." - payload = /obj/item/weapon/grenade/gas/freeze \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 0417028a608..2222df6ce95 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -131,7 +131,7 @@ new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc new /obj/item/weapon/card/emag(src) // 6 tc return - + if("ninja") // 33 tc worth new /obj/item/weapon/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc? new /obj/item/weapon/implanter/adrenalin(src) // 8 tc @@ -269,15 +269,6 @@ new /obj/item/weapon/reagent_containers/syringe(src) return -/obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades - name = "Atmos Grenades" - -/obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades/New() - ..() - new /obj/item/weapon/grenade/clusterbuster/plasma(src) - new /obj/item/weapon/grenade/clusterbuster/n2o(src) - new /obj/item/weapon/grenade/clusterbuster/freon(src) - /obj/item/weapon/storage/box/syndie_kit/nuke name = "box" diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 41def1cdae4..f9f3df11b5c 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -244,12 +244,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once. item = /obj/item/weapon/melee/powerfist cost = 8 -/datum/uplink_item/dangerous/atmosgrenades - name = "Atmos Grenades" - desc = "A box of three grenades that wreak havoc with the atmosphere of the target area. Capable of engulfing a large area in lit plasma, N2O or Freon. Deploy with extreme caution!" - item = /obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades - cost = 11 - /datum/uplink_item/dangerous/emp name = "EMP Grenades and Implanter Kit" desc = "A box that contains two EMP grenades and an EMP implant. Useful to disrupt communication, \ diff --git a/tgstation.dme b/tgstation.dme index 643a6f62fad..757e5415ee9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -745,7 +745,6 @@ #include "code\game\objects\items\weapons\twohanded.dm" #include "code\game\objects\items\weapons\vending_items.dm" #include "code\game\objects\items\weapons\weaponry.dm" -#include "code\game\objects\items\weapons\grenades\atmosgrenade.dm" #include "code\game\objects\items\weapons\grenades\chem_grenade.dm" #include "code\game\objects\items\weapons\grenades\clusterbuster.dm" #include "code\game\objects\items\weapons\grenades\emgrenade.dm"