From d7b3f73d8f1655a1c1ddb607dad42ba7808bfbca Mon Sep 17 00:00:00 2001 From: MLGTASTICa Date: Wed, 15 Nov 2023 22:30:04 +0200 Subject: [PATCH 1/3] aaa --- code/_onclick/item_attack.dm | 2 +- code/game/objects/items/weapons/mine.dm | 14 +++++++++++--- code/game/objects/items/weapons/tools/_tools.dm | 3 ++- code/modules/mechs/equipment/combat.dm | 4 ++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 2b2b5428f59..3e2ad8b6a71 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -237,7 +237,7 @@ avoid code duplication. This includes items that may sometimes act as a standard return (modifier - swing_degradation) // We hit a static object, prevents hitting anything underneath var/successful_hit = FALSE for(var/obj/S in targetarea) - if (S.density && !istype(S, /obj/structure/table) && !istype(S, /obj/machinery/disposal) && !istype(S, /obj/structure/closet)) + if ((S.density || istype(S, /obj/effect/plant)) && !istype(S, /obj/structure/table) && !istype(S, /obj/machinery/disposal) && !istype(S, /obj/structure/closet)) if(attack_with_multiplier(user, S, modifier)) successful_hit = TRUE // Livings or targeted mobs can still be hit if(successful_hit) diff --git a/code/game/objects/items/weapons/mine.dm b/code/game/objects/items/weapons/mine.dm index 6c11fb1cd3c..2ba8d0c322c 100644 --- a/code/game/objects/items/weapons/mine.dm +++ b/code/game/objects/items/weapons/mine.dm @@ -199,10 +199,18 @@ visible_message(SPAN_DANGER("\The [src]'s triggering mechanism is disrupted by the slope and does not go off.")) return ..() if(isliving(AM)) + if(excelsior) - for(var/datum/antagonist/A in AM.mind.antagonist) - if(A.id == ROLE_EXCELSIOR_REV) - return + if(ismech(AM)) + /// if atleast one of the people inside if an excel. + for(var/mob/living/carbon/human/agent in AM) + for(var/datum/antagonist/A in agent.mind.antagonist) + if(A.id == ROLE_EXCELSIOR_REV) + return + else + for(var/datum/antagonist/A in AM.mind.antagonist) + if(A.id == ROLE_EXCELSIOR_REV) + return var/true_prob_explode = prob_explode - AM.skill_to_evade_traps() if(prob(true_prob_explode)) explode() diff --git a/code/game/objects/items/weapons/tools/_tools.dm b/code/game/objects/items/weapons/tools/_tools.dm index ba69a7cf237..fe21243e2c3 100644 --- a/code/game/objects/items/weapons/tools/_tools.dm +++ b/code/game/objects/items/weapons/tools/_tools.dm @@ -528,7 +528,8 @@ if(T && T.degradation) failtypes["damage"] = 2.5 - if(user) + // You can only fail with tools you are holding + if(user && T.loc == user) failtypes["slip"] = 2 failtypes["swing"] = 1 if(ishuman(user)) diff --git a/code/modules/mechs/equipment/combat.dm b/code/modules/mechs/equipment/combat.dm index a3399f493e6..760f1c5c02b 100644 --- a/code/modules/mechs/equipment/combat.dm +++ b/code/modules/mechs/equipment/combat.dm @@ -17,6 +17,7 @@ w_class = ITEM_SIZE_BULKY worksound = WORKSOUND_HARD_SLASH wielded = TRUE + canremove = FALSE // Its Big armor_divisor = ARMOR_PEN_DEEP tool_qualities = list(QUALITY_CUTTING = 30, QUALITY_HAMMERING = 20, QUALITY_PRYING = 15) @@ -198,6 +199,9 @@ // so it swings gloriously var/obj/item/tool/sword/mech/holdin = holding holdin.wielded = TRUE + // i want the desc from the blade itself >:( + setName(initial(name)) + desc = initial(desc) /obj/item/mech_equipment/mounted_system/sword/Destroy() if(ismech(loc)) From ecf8e72f6b6fec28f5594d5f787076dc389c230d Mon Sep 17 00:00:00 2001 From: MLGTASTICa Date: Wed, 15 Nov 2023 22:34:46 +0200 Subject: [PATCH 2/3] Update combat.dm --- code/modules/mechs/equipment/combat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mechs/equipment/combat.dm b/code/modules/mechs/equipment/combat.dm index 760f1c5c02b..130ce360d7d 100644 --- a/code/modules/mechs/equipment/combat.dm +++ b/code/modules/mechs/equipment/combat.dm @@ -200,7 +200,7 @@ var/obj/item/tool/sword/mech/holdin = holding holdin.wielded = TRUE // i want the desc from the blade itself >:( - setName(initial(name)) + SetName(initial(name)) desc = initial(desc) /obj/item/mech_equipment/mounted_system/sword/Destroy() From d380b689afdfe3956041210b5e0466fce5787cd1 Mon Sep 17 00:00:00 2001 From: hyperioo <64754494+hyperioo@users.noreply.github.com> Date: Fri, 17 Nov 2023 18:34:14 +0100 Subject: [PATCH 3/3] Update code/game/objects/items/weapons/mine.dm --- code/game/objects/items/weapons/mine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/mine.dm b/code/game/objects/items/weapons/mine.dm index 2ba8d0c322c..ed37782607b 100644 --- a/code/game/objects/items/weapons/mine.dm +++ b/code/game/objects/items/weapons/mine.dm @@ -202,7 +202,7 @@ if(excelsior) if(ismech(AM)) - /// if atleast one of the people inside if an excel. + /// if at least one of the people inside is an excel. for(var/mob/living/carbon/human/agent in AM) for(var/datum/antagonist/A in agent.mind.antagonist) if(A.id == ROLE_EXCELSIOR_REV)