cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-05-29 18:53:42 -04:00
committed by GitHub
parent 8826718f1c
commit 809256323e
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/projectiles/guns/projectile.dm
View File

@@ -56,15 +56,9 @@
chambered = ammo_magazine.stored_ammo[ammo_magazine.stored_ammo.len] chambered = ammo_magazine.stored_ammo[ammo_magazine.stored_ammo.len]
if(handle_casings != HOLD_CASINGS) if(handle_casings != HOLD_CASINGS)
ammo_magazine.stored_ammo -= chambered ammo_magazine.stored_ammo -= chambered
<<<<<<< HEAD
var/mob/living/M = loc
if(istype(M))
=======
var/mob/living/M = loc // TGMC Ammo HUD var/mob/living/M = loc // TGMC Ammo HUD
if(istype(M)) // TGMC Ammo HUD if(istype(M)) // TGMC Ammo HUD
>>>>>>> 0cd26259eb... Merge pull request #14901 from KillianKirilenko/kk-guntweaks
M?.hud_used.update_ammo_hud(M, src) M?.hud_used.update_ammo_hud(M, src)
if (chambered) if (chambered)
@@ -110,15 +104,9 @@
if(handle_casings != HOLD_CASINGS) if(handle_casings != HOLD_CASINGS)
chambered = null chambered = null
<<<<<<< HEAD
var/mob/living/M = loc
if(istype(M))
=======
var/mob/living/M = loc // TGMC Ammo HUD var/mob/living/M = loc // TGMC Ammo HUD
if(istype(M)) // TGMC Ammo HUD if(istype(M)) // TGMC Ammo HUD
>>>>>>> 0cd26259eb... Merge pull request #14901 from KillianKirilenko/kk-guntweaks
M?.hud_used.update_ammo_hud(M, src) M?.hud_used.update_ammo_hud(M, src)