mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 02:24:11 +01:00
Adds Stinger Grenades (#29178)
* ballin * sprite change * curse of balance * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> --------- Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
@@ -1691,6 +1691,10 @@
|
||||
pixel_x = 3;
|
||||
pixel_y = -3
|
||||
},
|
||||
/obj/item/storage/box/stingers{
|
||||
pixel_x = 3;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
|
||||
@@ -92015,6 +92015,7 @@
|
||||
pixel_y = -2
|
||||
},
|
||||
/obj/item/storage/box/handcuffs,
|
||||
/obj/item/storage/box/stingers,
|
||||
/obj/item/storage/box/teargas{
|
||||
pixel_x = -3;
|
||||
pixel_y = -3
|
||||
|
||||
@@ -15929,6 +15929,7 @@
|
||||
pixel_y = -3
|
||||
},
|
||||
/obj/item/storage/box/handcuffs,
|
||||
/obj/item/storage/box/stingers,
|
||||
/obj/item/storage/box/flashbangs{
|
||||
pixel_x = -2;
|
||||
pixel_y = -2
|
||||
|
||||
@@ -110878,6 +110878,7 @@
|
||||
/obj/item/storage/box/flashbangs{
|
||||
pixel_x = -3
|
||||
},
|
||||
/obj/item/storage/box/stingers,
|
||||
/obj/item/storage/box/teargas{
|
||||
pixel_x = -1;
|
||||
pixel_y = 2
|
||||
|
||||
@@ -65653,6 +65653,7 @@
|
||||
pixel_x = 1;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/storage/box/stingers,
|
||||
/obj/item/storage/box/teargas{
|
||||
pixel_x = -1;
|
||||
pixel_y = 2
|
||||
|
||||
@@ -17,6 +17,22 @@
|
||||
create_shrapnel(loc, shrapnel_contained, shrapnel_type = embedded_type)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/grenade/frag/stinger
|
||||
name = "stingball grenade"
|
||||
desc = "A specialized less-lethal hand grenade used for police action. Launches hard rubber balls in all directions upon detonation."
|
||||
icon_state = "stinger"
|
||||
item_state = "grenade"
|
||||
det_time = 5 SECONDS
|
||||
modifiable_timer = FALSE
|
||||
shrapnel_contained = 50
|
||||
embedded_type = /obj/item/projectile/bullet/pellet/rubber/stinger
|
||||
|
||||
/obj/item/grenade/frag/prime()
|
||||
update_mob()
|
||||
explosion(loc, 0, 0, 0, 0, DEFAULT_SHRAPNEL_RANGE + 2, cause = name, breach = FALSE)
|
||||
create_shrapnel(loc, shrapnel_contained, shrapnel_type = embedded_type)
|
||||
qdel(src)
|
||||
|
||||
/**
|
||||
* Shrapnel that flies through the air and hits you
|
||||
*/
|
||||
|
||||
@@ -311,6 +311,7 @@
|
||||
/obj/item/grenade/barrier,
|
||||
/obj/item/grenade/flashbang,
|
||||
/obj/item/grenade/chem_grenade/teargas,
|
||||
/obj/item/grenade/frag/stinger,
|
||||
/obj/item/reagent_containers/spray/pepper,
|
||||
/obj/item/restraints/handcuffs,
|
||||
/obj/item/flash,
|
||||
|
||||
@@ -569,6 +569,15 @@
|
||||
for(var/I in 1 to 7)
|
||||
new /obj/item/grenade/flashbang(src)
|
||||
|
||||
/obj/item/storage/box/stingers
|
||||
name = "box of stinger grenades (WARNING)"
|
||||
desc = "<b>WARNING: These devices are dangerous and can cause significant physical harm with repeated use.</b>"
|
||||
icon_state = "flashbang_box"
|
||||
|
||||
/obj/item/storage/box/stingers/populate_contents()
|
||||
for(var/I in 1 to 7)
|
||||
new /obj/item/grenade/frag/stinger(src)
|
||||
|
||||
/obj/item/storage/box/smoke_grenades
|
||||
name = "smoke grenades"
|
||||
desc = "A box with 7 smoke grenades."
|
||||
|
||||
@@ -99,6 +99,13 @@
|
||||
if(initial(range) - range <= 5 && H.getStaminaLoss() >= 60)
|
||||
H.KnockDown(8 SECONDS)
|
||||
|
||||
/obj/item/projectile/bullet/pellet/rubber/stinger
|
||||
name = "stingball"
|
||||
damage = 1
|
||||
stamina = 12.5
|
||||
icon_state = "bullet-r"
|
||||
armour_penetration_flat = -10
|
||||
|
||||
/obj/item/projectile/bullet/pellet/assassination
|
||||
damage = 12
|
||||
tile_dropoff = 1 // slightly less damage and greater damage falloff compared to normal buckshot
|
||||
|
||||
@@ -226,6 +226,13 @@
|
||||
containertype = /obj/structure/closet/crate/secure/plasma
|
||||
containername = "energy shotgun crate"
|
||||
|
||||
/datum/supply_packs/security/armory/stingers
|
||||
name = "Stinger Grenade Crate"
|
||||
contains = list(/obj/item/storage/box/stingers,
|
||||
/obj/item/storage/box/stingers)
|
||||
cost = 300
|
||||
containername = "stingball grenade crate"
|
||||
|
||||
/// costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person
|
||||
/datum/supply_packs/security/armory/epistol
|
||||
name = "Energy Pistol Crate"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 6.2 KiB |
Reference in New Issue
Block a user