From 0c4fbe09147e1e11ddbc072a88db705f80eecc91 Mon Sep 17 00:00:00 2001 From: LagardereMathis Date: Wed, 13 Sep 2023 22:06:44 +0200 Subject: [PATCH] Add diagonal bayonet and adds it to hunting rifle --- code/modules/projectiles/gun.dm | 8 ++++++++ .../modules/projectiles/guns/ballistic/shotgun.dm | 4 ++++ modular_splurt/icons/obj/guns/bayonets.dmi | Bin 0 -> 262 bytes 3 files changed, 12 insertions(+) create mode 100644 modular_splurt/icons/obj/guns/bayonets.dmi diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 8a0070c431..594ccf300e 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -74,6 +74,9 @@ var/obj/item/kitchen/knife/bayonet var/mutable_appearance/knife_overlay var/can_bayonet = FALSE + //SPLURT EDIT ADD + var/bayonet_diagonal = FALSE + //SPKURT EDIT ADD END var/datum/action/item_action/toggle_gunlight/alight var/mutable_appearance/flashlight_overlay @@ -701,6 +704,11 @@ if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state? state = bayonet.icon_state var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi' + //SPLURT EDIT ADD + if(bayonet_diagonal == TRUE ) + state = "bayonet_diagonal" + bayonet_icons = 'modular_splurt/icons/obj/guns/bayonets.dmi' + //SPLURT EDIT ADD END knife_overlay = mutable_appearance(bayonet_icons, state) knife_overlay.pixel_x = knife_x_offset knife_overlay.pixel_y = knife_y_offset diff --git a/modular_splurt/code/modules/projectiles/guns/ballistic/shotgun.dm b/modular_splurt/code/modules/projectiles/guns/ballistic/shotgun.dm index 6ba1903848..3e706432fc 100644 --- a/modular_splurt/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/modular_splurt/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -49,6 +49,10 @@ w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY sawn_desc = "A cheap hunting rifle that bubba got ahold of." + can_bayonet = TRUE + bayonet_diagonal = TRUE + knife_x_offset = 25 + knife_y_offset = 26 /obj/item/gun/ballistic/shotgun/huntingrifle/attackby(obj/item/A, mob/user, params) ..() diff --git a/modular_splurt/icons/obj/guns/bayonets.dmi b/modular_splurt/icons/obj/guns/bayonets.dmi new file mode 100644 index 0000000000000000000000000000000000000000..020713ff79dac3dddf1a70293456a871e3d48078 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*8>L*7#rG8pS!lIq0h}F z$iv-n8c>R{B*-tA!Qt7BG$5y>DkP%BCAB!YD6^m>Ge3`kp<+&OSV2+g_b>qo6gJ4-o1Ev6VQHDPZ!4! zjfu$#60FW_91DwPO3uB&;vy2jdO=iTfwqB5@PUSP3=BENjQ8?Y7OnwmVDNPHb6Mw< G&;$UN?OT8V literal 0 HcmV?d00001