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

Improvised Weapon Pin Fix (#11405)

Browse Source
This commit is contained in:
Geeves
2021-03-10 21:06:28 +02:00
committed by GitHub
parent ec69761e33
commit 562d5a1fa5
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/projectiles/guns/projectile/rifle.dm
View File

@@ -62,6 +62,9 @@
max_shells = 4
can_sawoff = FALSE
needspin = FALSE
has_safety = FALSE
jam_chance = 0
/obj/item/gun/projectile/shotgun/pump/rifle/pipegun/examine(mob/user)

10
code/modules/projectiles/pins.dm
View File

@@ -38,16 +38,20 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh
if(proximity_flag)
if(istype(target, /obj/item/gun))
var/obj/item/gun/G = target
if(!G.needspin)
to_chat(user, SPAN_WARNING("\The [G] doesn't take pins."))
return
if(G.pin && (force_replace || G.pin.pin_replaceable))
G.pin.forceMove(get_turf(G))
G.pin.gun_remove(user)
to_chat(user, "<span class ='notice'>You remove [G]'s old pin.</span>")
to_chat(user, SPAN_NOTICE("You remove \the [G]'s old pin."))
if(!G.pin)
gun_insert(user, G)
to_chat(user, "<span class ='notice'>You insert [src] into [G].</span>")
to_chat(user, SPAN_NOTICE("You insert [src] into \the [G]."))
else
to_chat(user, "<span class ='notice'>This firearm already has a firing pin installed.</span>")
to_chat(user, SPAN_NOTICE("This firearm already has a firing pin installed."))
/obj/item/device/firing_pin/emag_act()
if(!emagged)