cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 09:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lets bayonets butcher, fixes bayoneting typo

Browse Source
This commit is contained in:
QualityVan
2017-05-26 16:25:35 -04:00
parent eea0dc085a
commit a86f2fc252
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+3 -3
View File
@@ -295,14 +295,14 @@
/obj/item/weapon/gun/attack(mob/M as mob, mob/user)
if(user.a_intent == INTENT_HARM) //Flogging
if(bayonet)
bayonet.attack(M, user)
M.attackby(bayonet, user)
return
return ..()
/obj/item/weapon/gun/attack_obj(obj/O, mob/user)
if(user.a_intent == INTENT_HARM)
if(bayonet)
bayonet.attack_obj(O, user)
O.attackby(bayonet, user)
return
return ..()
@@ -332,7 +332,7 @@
if(!bayonet)
if(!user.transferItemToLoc(I, src))
return
to_chat(user, "<span class='notice'>You attach \the [K] to the front of ]the [src].</span>")
to_chat(user, "<span class='notice'>You attach \the [K] to the front of \the [src].</span>")
bayonet = K
update_icon()
else if(istype(I, /obj/item/weapon/screwdriver))