Skip to content

better modularity pretty sure #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jedi-Toothpaste merged 1 commit into from
Mar 19, 2025
Merged

better modularity pretty sure #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down Expand Up @@ -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)
Expand Down
Binary file modified icons/mob/clothing/back.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/belt_mirror.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/weapons/guns/projectiles.dmi
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions modular_nova/master_files/code/modules/mining/equipment/kinetic_crusher/trophies_misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
17 changes: 12 additions & 5 deletions modular_nova/modules/ahabs_spear/code/trophies_misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Binary file removed modular_nova/modules/ahabs_spear/icons/belt_mirror.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down