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

Sniper Ammo Count Fix (#11339)

Browse Source
This commit is contained in:
Geeves
2021-03-01 17:40:02 +02:00
committed by GitHub
parent a4de5aad8f
commit eb01c2e747
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/projectiles/guns/projectile/sniper.dm
View File

@@ -31,6 +31,14 @@
recoil_wielded = 2 recoil_wielded = 2
accuracy_wielded = -1 accuracy_wielded = -1
/obj/item/gun/projectile/heavysniper/get_ammo()
var/ammo_count = 0
for(var/thing in loaded)
var/obj/item/ammo_casing/AC = thing
if(AC.BB) // my favourite band - geeves
ammo_count++
return ammo_count
/obj/item/gun/projectile/heavysniper/update_icon() /obj/item/gun/projectile/heavysniper/update_icon()
..() ..()
if(bolt_open) if(bolt_open)
@@ -131,11 +139,6 @@
else else
RH.take_damage(30) RH.take_damage(30)
/obj/item/gun/projectile/heavysniper/unathi/get_ammo()
if(chambered)
return TRUE
return FALSE
/obj/item/gun/projectile/heavysniper/tranq /obj/item/gun/projectile/heavysniper/tranq
name = "tranquilizer rifle" name = "tranquilizer rifle"
desc = "A nonlethal modification to the PTR-7 anti-materiel rifle meant for sedation and capture of the most dangerous of game. Fires .50 cal PPS shells that deploy a torpor inducing drug payload." desc = "A nonlethal modification to the PTR-7 anti-materiel rifle meant for sedation and capture of the most dangerous of game. Fires .50 cal PPS shells that deploy a torpor inducing drug payload."

6
html/changelogs/geeves-sniper_get_ammo_fix.yml Normal file
View File

@@ -0,0 +1,6 @@
author: Geeves
delete-after: True
changes:
- bugfix: "AMRs, tranq rifles, and Hegemony Sluggers will now report their ammo counts correctly."