Skip to content

Commit

Permalink
Merge pull request tgstation#16260 from Bawhoppen/grenadesholyshithelp
Browse files Browse the repository at this point in the history
Grenade belt for nukeops
  • Loading branch information
AnturK committed Mar 22, 2016
2 parents 6a00718 + 07ca0c9 commit b6b8a3e
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 2 deletions.
5 changes: 3 additions & 2 deletions code/game/objects/items/weapons/grenades/smokebomb.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/obj/item/weapon/grenade/smokebomb
name = "smoke bomb"
name = "smoke grenade"
desc = "The word 'Dank' is scribbled on it in crayon."
icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
icon_state = "smokewhite"
det_time = 20
item_state = "flashbang"
slot_flags = SLOT_BELT
Expand Down
28 changes: 28 additions & 0 deletions code/game/objects/items/weapons/grenades/syndieminibomb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,31 @@
update_mob()
explosion(src.loc,0,2,3,flame_range = 3)
qdel(src)

/obj/item/weapon/grenade/syndieminibomb/concussion/frag
name = "frag grenade"
desc = "Fire in the hole."
icon_state = "frag"

/obj/item/weapon/grenade/gluon
desc = "An advanced grenade that releases a harmful stream of gluons inducing radiation in those nearby."
name = "gluon grenade"
icon = 'icons/obj/grenade.dmi'
icon_state = "bluefrag"
item_state = "flashbang"
var/freeze_range = 4
var/rad_damage = 35
var/stamina_damage = 30

/obj/item/weapon/grenade/gluon/prime()
update_mob()
playsound(loc, 'sound/effects/EMPulse.ogg', 50, 1)
radiation_pulse(loc,freeze_range,freeze_range+1,rad_damage)
for(var/turf/T in view(freeze_range,loc))
if(istype(T,/turf/simulated/floor))
var/turf/simulated/floor/F = T
F.wet = TURF_WET_ICE
for(var/mob/living/carbon/L in T)
L.adjustStaminaLoss(stamina_damage)
L.bodytemperature -= 230
qdel(src)
44 changes: 44 additions & 0 deletions code/game/objects/items/weapons/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,50 @@
item_state = "security"
storage_slots = 6

/obj/item/weapon/storage/belt/grenade
name = "grenadier belt"
desc = "A belt for holding grenades."
icon_state = "grenadebelt"
item_state = "security"
max_w_class = 0
storage_slots = 30
can_hold = list(
/obj/item/weapon/grenade,
/obj/item/weapon/screwdriver,
/obj/item/weapon/lighter,
/obj/item/device/multitool,
/obj/item/weapon/reagent_containers/food/drinks/bottle/molotov,
)
/obj/item/weapon/storage/belt/grenade/full/New()
..()
new /obj/item/weapon/grenade/flashbang(src)
new /obj/item/weapon/grenade/smokebomb(src)
new /obj/item/weapon/grenade/smokebomb(src)
new /obj/item/weapon/grenade/smokebomb(src)
new /obj/item/weapon/grenade/smokebomb(src)
new /obj/item/weapon/grenade/empgrenade(src)
new /obj/item/weapon/grenade/empgrenade(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/weapon/grenade/gluon(src)
new /obj/item/weapon/grenade/gluon(src)
new /obj/item/weapon/grenade/gluon(src)
new /obj/item/weapon/grenade/gluon(src)
new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
new /obj/item/weapon/grenade/chem_grenade/facid(src)
new /obj/item/weapon/grenade/syndieminibomb(src)
new /obj/item/weapon/grenade/syndieminibomb(src)
new /obj/item/weapon/screwdriver(src)
new /obj/item/device/multitool(src)

/obj/item/weapon/storage/belt/wands
name = "wand belt"
Expand Down
8 changes: 8 additions & 0 deletions code/modules/uplink/uplink_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,14 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
surplus = 0
include_modes = list(/datum/game_mode/nuclear)

/datum/uplink_item/dangerous/grenadier
name = "Grenadier's belt"
desc = "A belt of a large variety of lethally dangerous and destructive grenades."
item = /obj/item/weapon/storage/belt/grenade/full
include_modes = list(/datum/game_mode/nuclear)
cost = 22
surplus = 0

/datum/uplink_item/dangerous/sniper
name = "Sniper Rifle"
desc = "Ranged fury, Syndicate style. guaranteed to cause shock and awe or your TC back!"
Expand Down
Binary file modified icons/obj/grenade.dmi
Binary file not shown.

0 comments on commit b6b8a3e

Please sign in to comment.