From 0706161afeb4be1f4fe76c5b9d083063de24847e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 28 May 2017 17:10:46 -0500 Subject: [PATCH] Lets bayonets butcher, fixes bayoneting typo (#1242) --- code/modules/projectiles/gun.dm | 6 +++--- icons/obj/guns/projectile.dmi | Bin 31842 -> 31844 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 04761befdc..89baa173c1 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -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, "You attach \the [K] to the front of ]the [src].") + to_chat(user, "You attach \the [K] to the front of \the [src].") bayonet = K update_icon() else if(istype(I, /obj/item/weapon/screwdriver)) diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 7cb9f2a3ff850efb26d82416b0aa04f60c0a4163..dd6146d7fb813cb53568e2f79f99b2a6dfffa33e 100644 GIT binary patch delta 43 zcmV+`0M!5D_yOej0gxmCeX%8O0~ejSb;ozr*B?*S)A#4?Z?yt%24@_s*|Vqvx_IJ% B77_pe delta 41 zcmV+^0M`HH_yOYh0gxmCd$A>M0~IZB@2amqo~ozs&)eVA;BIvJt~P+Pssp-szZn)(