mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
Adds emp shotgun shells, not yet obtainable.
This commit is contained in:
@@ -199,6 +199,17 @@
|
|||||||
for(var/i = 1 to 7)
|
for(var/i = 1 to 7)
|
||||||
new /obj/item/ammo_casing/shotgun/practice(src)
|
new /obj/item/ammo_casing/shotgun/practice(src)
|
||||||
|
|
||||||
|
/obj/item/weapon/storage/box/empshells
|
||||||
|
name = "box of emp shells"
|
||||||
|
desc = "It has a picture of a gun and several warning symbols on the front."
|
||||||
|
icon_state = "empshot_box"
|
||||||
|
item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
|
||||||
|
|
||||||
|
/obj/item/weapon/storage/box/empshells/New()
|
||||||
|
..()
|
||||||
|
for(var/i = 1 to 7)
|
||||||
|
new /obj/item/ammo_casing/shotgun/emp(src)
|
||||||
|
|
||||||
/obj/item/weapon/storage/box/sniperammo
|
/obj/item/weapon/storage/box/sniperammo
|
||||||
name = "box of 14.5mm shells"
|
name = "box of 14.5mm shells"
|
||||||
desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
|
desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
|
||||||
|
|||||||
@@ -144,6 +144,14 @@
|
|||||||
projectile_type = /obj/item/projectile/energy/flash/flare
|
projectile_type = /obj/item/projectile/energy/flash/flare
|
||||||
matter = list(DEFAULT_WALL_MATERIAL = 90, "glass" = 90)
|
matter = list(DEFAULT_WALL_MATERIAL = 90, "glass" = 90)
|
||||||
|
|
||||||
|
|
||||||
|
/obj/item/ammo_casing/shotgun/emp
|
||||||
|
name = "ion shell"
|
||||||
|
desc = "An advanced shotgun round that creates a small EMP when it strikes a target."
|
||||||
|
icon_state = "empshell"
|
||||||
|
projectile_type = /obj/item/projectile/bullet/shotgun/ion
|
||||||
|
matter = list(DEFAULT_WALL_MATERIAL = 360, "glass" = 720)
|
||||||
|
|
||||||
/obj/item/ammo_casing/a762
|
/obj/item/ammo_casing/a762
|
||||||
desc = "A 7.62mm bullet casing."
|
desc = "A 7.62mm bullet casing."
|
||||||
caliber = "a762"
|
caliber = "a762"
|
||||||
|
|||||||
@@ -168,6 +168,19 @@
|
|||||||
range_step = 1
|
range_step = 1
|
||||||
spread_step = 10
|
spread_step = 10
|
||||||
|
|
||||||
|
//EMP shotgun 'slug', it's basically a beanbag that pops a tiny emp when it hits.
|
||||||
|
/obj/item/projectile/bullet/shotgun/ion
|
||||||
|
name = "ion slug"
|
||||||
|
damage = 15
|
||||||
|
embed = 0
|
||||||
|
sharp = 0
|
||||||
|
check_armour = "melee"
|
||||||
|
|
||||||
|
/obj/item/projectile/bullet/shotgun/ion/on_hit(var/atom/target, var/blocked = 0)
|
||||||
|
..()
|
||||||
|
empulse(target, 0, 0) //Only affects what it hits
|
||||||
|
return 1
|
||||||
|
|
||||||
/* "Rifle" rounds */
|
/* "Rifle" rounds */
|
||||||
|
|
||||||
/obj/item/projectile/bullet/rifle
|
/obj/item/projectile/bullet/rifle
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
empulse(target, 1, 1)
|
empulse(target, 1, 1)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|
||||||
/obj/item/projectile/bullet/gyro
|
/obj/item/projectile/bullet/gyro
|
||||||
name ="explosive bolt"
|
name ="explosive bolt"
|
||||||
icon_state= "bolter"
|
icon_state= "bolter"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Reference in New Issue
Block a user