From f8af3281d7f32bd98d24c73e2b05ac0dc7dc57e6 Mon Sep 17 00:00:00 2001 From: someone543 <95106800+someone543@users.noreply.github.com> Date: Wed, 19 Feb 2025 17:25:01 +0800 Subject: [PATCH 1/2] Alt click to unload contents Alt-click it to unload its contents --- nsv13/code/modules/overmap/fighters/_fighters.dm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nsv13/code/modules/overmap/fighters/_fighters.dm b/nsv13/code/modules/overmap/fighters/_fighters.dm index f6592fd66fb..28b2a39e871 100644 --- a/nsv13/code/modules/overmap/fighters/_fighters.dm +++ b/nsv13/code/modules/overmap/fighters/_fighters.dm @@ -407,7 +407,7 @@ Been a mess since 2018, we'll fix it someday (probably) name = "Peregrine class attack fighter" desc = "A Peregrine class attack fighter, solgov's only premiere fighter, mounting minature capital grade phasers and a tiny shield generator." icon = 'nsv13/icons/overmap/new/solgov/playablefighter.dmi' - armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 30, "bomb" = 30, "bio" = 100, "rad" = 90, "fire" = 90, "acid" = 80, "overmap_light" = 5, "overmap_medium" = 0, "overmap_heavy" = 10) + armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 30, "bomb" = 30, "bio" = 100, "rad" = 90, "fire" = 90, "acid" = 80, "overmap_light" = 5, "overmap_medium" = 0, "overmap_heavy" = 10) sprite_size = 32 damage_states = FALSE //temp max_integrity = 25 //shields. @@ -941,6 +941,19 @@ due_to_damage: Was this called voluntarily (FALSE) or due to damage / external c /obj/item/fighter_component/proc/toggle() active = !active +/obj/item/fighter_component/AltClick(mob/user) + . = ..() + if(!Adjacent(user)) + return + if(!length(contents)) + to_chat(user, "There is nothing to unload from [name]!") + return + to_chat(user, "You start to unload [name]'s stored contents...") + if(!do_after(user, 5 SECONDS, target=src)) + return + to_chat(user, "") + dump_contents() + /obj/item/fighter_component/proc/dump_contents() if(!length(contents)) return FALSE From 16093e10c5f9d183756a82665b01a1a9dfa77bc6 Mon Sep 17 00:00:00 2001 From: someone543 <95106800+someone543@users.noreply.github.com> Date: Sat, 22 Feb 2025 04:59:27 +0800 Subject: [PATCH 2/2] isliving and src --- nsv13/code/modules/overmap/fighters/_fighters.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nsv13/code/modules/overmap/fighters/_fighters.dm b/nsv13/code/modules/overmap/fighters/_fighters.dm index 28b2a39e871..a1c5a4e0670 100644 --- a/nsv13/code/modules/overmap/fighters/_fighters.dm +++ b/nsv13/code/modules/overmap/fighters/_fighters.dm @@ -945,13 +945,15 @@ due_to_damage: Was this called voluntarily (FALSE) or due to damage / external c . = ..() if(!Adjacent(user)) return + if(!isliving(user)) + return if(!length(contents)) - to_chat(user, "There is nothing to unload from [name]!") + to_chat(user, "There is nothing to unload from [src]!") return - to_chat(user, "You start to unload [name]'s stored contents...") + to_chat(user, "You start to unload [src]'s stored contents...") if(!do_after(user, 5 SECONDS, target=src)) return - to_chat(user, "") + to_chat(user, "") dump_contents() /obj/item/fighter_component/proc/dump_contents()