Skip to content

Commit

Permalink
Revert "Atmos Grenades"
Browse files Browse the repository at this point in the history
  • Loading branch information
Supermichael777 authored Nov 14, 2016
1 parent 09c5876 commit 5d9bc48
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 60 deletions.
28 changes: 0 additions & 28 deletions code/game/objects/items/weapons/grenades/atmosgrenade.dm

This file was deleted.

15 changes: 0 additions & 15 deletions code/game/objects/items/weapons/grenades/clusterbuster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 1 addition & 10 deletions code/game/objects/items/weapons/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down
6 changes: 0 additions & 6 deletions code/modules/uplink/uplink_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down
1 change: 0 additions & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,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"
Expand Down

0 comments on commit 5d9bc48

Please sign in to comment.