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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-06-29 19:13:55 -04:00
committed by GitHub
parent 62c6cd361c
commit 7f856931e0
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/gun.dm
View File

@@ -810,13 +810,8 @@
user.hud_used.remove_ammo_hud(user, src)
return ..()
<<<<<<< HEAD
/obj/item/weapon/gun/dropped(mob/living/user) // Ditto as above, we remove the HUD. Pending porting TGMC code to clean up this fucking nightmare of spaghetti.
=======
/obj/item/weapon/gun/dropped(mob/living/user) // Ditto as above, we remove the HUD. Pending porting TGMC code to clean up this fucking nightmare of spaghetti.
>>>>>>> 4b43b02c06... Merge pull request #13193 from Heroman3003/traitening
user.hud_used.remove_ammo_hud(user, src)
..()