cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tracking Slugs (#10287)

Browse Source
This commit is contained in:
Geeves
2020-10-23 17:22:27 +02:00
committed by GitHub
parent 50d1332a6c
commit 6c55a954c3
12 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/modules/projectiles/ammunition/bullets.dm
View File

@@ -101,7 +101,7 @@
/obj/item/ammo_casing/shotgun
name = "shotgun slug"
desc = "A 12 gauge slug."
desc = "A 12-gauge slug."
icon_state = "slshell"
spent_icon = "slshell-spent"
caliber = "shotgun"
@@ -111,7 +111,7 @@
/obj/item/ammo_casing/shotgun/pellet
name = "shotgun shell"
desc = "A 12 gauge shell."
desc = "A 12-gauge shell."
icon_state = "gshell"
spent_icon = "gshell-spent"
projectile_type = /obj/item/projectile/bullet/pellet/shotgun
@@ -119,7 +119,7 @@
/obj/item/ammo_casing/shotgun/blank
name = "shotgun shell"
desc = "A blank shell."
desc = "A 12-gauge blank shell."
icon_state = "blshell"
spent_icon = "blshell-spent"
projectile_type = /obj/item/projectile/bullet/blank
@@ -127,7 +127,7 @@
/obj/item/ammo_casing/shotgun/practice
name = "shotgun shell"
desc = "A practice shell."
desc = "A 12-gauge practice shell."
icon_state = "pshell"
spent_icon = "pshell-spent"
projectile_type = /obj/item/projectile/bullet/shotgun/practice
@@ -135,7 +135,7 @@
/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag shell"
desc = "A beanbag shell."
desc = "A 12-gauge beanbag shell."
icon_state = "bshell"
spent_icon = "bshell-spent"
projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
@@ -145,7 +145,7 @@
//is blocked by clothing that stops tasers and is vulnerable to EMP
/obj/item/ammo_casing/shotgun/stunshell
name = "stun shell"
desc = "A 12 gauge taser cartridge."
desc = "A 12-gauge taser cartridge."
icon_state = "stunshell"
spent_icon = "stunshell-spent"
projectile_type = /obj/item/projectile/energy/electrode/stunshot
@@ -159,7 +159,7 @@
//Does not stun, only blinds, but has area of effect.
/obj/item/ammo_casing/shotgun/flash
name = "flash shell"
desc = "A chemical shell used to signal distress or provide illumination."
desc = "A 12-gauge chemical shell used to signal distress or provide illumination."
icon_state = "fshell"
spent_icon = "fshell-spent"
projectile_type = /obj/item/projectile/energy/flash/flare
@@ -168,7 +168,7 @@
/obj/item/ammo_casing/shotgun/incendiary
name = "incendiary shell"
desc = "A 12 gauge incendiary shell."
desc = "A 12-gauge incendiary shell."
icon_state = "ishell"
spent_icon = "ishell-spent"
projectile_type = /obj/item/projectile/bullet/shotgun/incendiary
@@ -179,10 +179,17 @@
desc = "A 12-gauge shotgun slug fitted with a single-use ion pulse generator."
icon_state = "empshell"
spent_icon = "empshell-spent"
projectile_type = /obj/item/projectile/ion
projectile_type = /obj/item/projectile/ion
matter = list(DEFAULT_WALL_MATERIAL = 260, MATERIAL_URANIUM = 200)
reload_sound = 'sound/weapons/reload_shell_emp.ogg'
/obj/item/ammo_casing/shotgun/tracking
name = "tracking slug"
desc = "A 12-gauge shotgun slug fitted with a tracking implant, set to activate upon embedding flesh."
icon_state = "trackingshell"
spent_icon = "trackingshell-spent"
projectile_type = /obj/item/projectile/bullet/tracking
/obj/item/ammo_casing/tranq
name = "PPS shell"
desc = "A .50 cal PPS bullet casing."