diff --git a/code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm index ff93d9f26ccf9..eda5f9a719dfb 100644 --- a/code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm @@ -53,6 +53,9 @@ /// Used by retool kits when changing the crusher's projectile sprite var/projectile_icon = "pulse1" + /// nova edit: used by retool kits when changing the crusher's projectile sprite + var/projectile_icon_file = 'icons/obj/weapons/guns/projectiles.dmi' + /obj/item/kinetic_crusher/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, \ @@ -221,6 +224,7 @@ if(!isturf(proj_turf)) return var/obj/projectile/destabilizer/destabilizer = new(proj_turf) + destabilizer.icon = projectile_icon_file // nova edit for extended crusher retool support destabilizer.icon_state = "[projectile_icon]" for(var/obj/item/crusher_trophy/attached_trophy as anything in trophies) attached_trophy.on_projectile_fire(destabilizer, user) diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 9151eee97ea6b..921ff659d6129 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index b078c9e83fa5b..d99a3fd0fed80 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi index 47953e278e5f8..6de67f9e1d49d 100644 Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ diff --git a/modular_nova/master_files/code/modules/mining/equipment/kinetic_crusher/trophies_misc.dm b/modular_nova/master_files/code/modules/mining/equipment/kinetic_crusher/trophies_misc.dm new file mode 100644 index 0000000000000..0d4b4449d15b1 --- /dev/null +++ b/modular_nova/master_files/code/modules/mining/equipment/kinetic_crusher/trophies_misc.dm @@ -0,0 +1,11 @@ +/obj/item/crusher_trophy/retool_kit + /// icon file where this retool kit's projectile is stored + var/retool_projectile_icon_file = 'icons/obj/weapons/guns/projectiles.dmi' + +/obj/item/crusher_trophy/retool_kit/add_to(obj/item/kinetic_crusher/pkc, mob/user) + . = ..() + pkc.projectile_icon_file = retool_projectile_icon_file + +/obj/item/crusher_trophy/retool_kit/remove_from(obj/item/kinetic_crusher/pkc) + . = ..() + pkc.projectile_icon_file = initial(pkc.projectile_icon_file) diff --git a/modular_nova/modules/ahabs_spear/code/trophies_misc.dm b/modular_nova/modules/ahabs_spear/code/trophies_misc.dm index 80689ec6327d8..f389fbb9629db 100644 --- a/modular_nova/modules/ahabs_spear/code/trophies_misc.dm +++ b/modular_nova/modules/ahabs_spear/code/trophies_misc.dm @@ -1,17 +1,24 @@ /obj/item/crusher_trophy/retool_kit/ahab - name = "crusher ahabs harpoon retool kit" - desc = "A toolkit for changing the crusher's appearance without affecting the device's function. This one will make it look like ahab's harpoon, the weapon of legends." + name = "crusher Ahab's harpoon retool kit" + desc = "A toolkit for changing the crusher's appearance without affecting the device's function. This one will make it look like Ahab's harpoon, the weapon of legends." denied_type = /obj/item/crusher_trophy/retool_kit icon = 'modular_nova/modules/ahabs_spear/icons/ahabs_spear.dmi' icon_state = "ahab_retool" retool_icon = 'modular_nova/modules/ahabs_spear/icons/ahabs_spear.dmi' retool_icon_state = "crusher_ahab" retool_inhand_icon = "crusher_ahab" - retool_projectile_icon = "ahabprojectile" // stored in icons/obj/weapons/guns/projectiles.dmi + retool_projectile_icon = "ahabprojectile" + retool_projectile_icon_file = 'modular_nova/modules/ahabs_spear/icons/projectiles.dmi' retool_lefthand_file = 'modular_nova/modules/ahabs_spear/icons/l_hand_ahab.dmi' retool_righthand_file = 'modular_nova/modules/ahabs_spear/icons/r_hand_ahab.dmi' - retool_inhand_x = 32 - retool_inhand_y = 32 /obj/item/crusher_trophy/retool_kit/ahab/effect_desc() return "the crusher to have the appearance of the weapon of legends, Ahab's Harpoon" + +/obj/item/crusher_trophy/retool_kit/ahab/add_to(obj/item/kinetic_crusher/pkc, mob/user) + . = ..() + pkc.worn_icon = 'modular_nova/modules/ahabs_spear/icons/back.dmi' + +/obj/item/crusher_trophy/retool_kit/ahab/remove_from(obj/item/kinetic_crusher/pkc) + . = ..() + pkc.worn_icon = initial(pkc.worn_icon) diff --git a/modular_nova/modules/ahabs_spear/icons/belt_mirror.dmi b/modular_nova/modules/ahabs_spear/icons/belt_mirror.dmi deleted file mode 100644 index b88dec68de7b1..0000000000000 Binary files a/modular_nova/modules/ahabs_spear/icons/belt_mirror.dmi and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index ce2e93cceaea4..1f8ed80dfd8a4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7000,6 +7000,7 @@ #include "modular_nova\master_files\code\modules\mining\ash_flora\mushroom_leaf.dm" #include "modular_nova\master_files\code\modules\mining\boulder_processing\boulder_types.dm" #include "modular_nova\master_files\code\modules\mining\equipment\explorer_gear.dm" +#include "modular_nova\master_files\code\modules\mining\equipment\kinetic_crusher\trophies_misc.dm" #include "modular_nova\master_files\code\modules\mining\equipment\monster_organs\monster_organ.dm" #include "modular_nova\master_files\code\modules\mob\login.dm" #include "modular_nova\master_files\code\modules\mob\basic\alien\_alien.dm"