From ad658736809c97a229316afb2cc7afd1a0625d6f Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 25 Aug 2024 11:56:26 +0200 Subject: [PATCH 01/10] makes containers more destructible --- .../objects/structures/cargo_container.dm | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 66d0cc8c18e0..7dd82c319bed 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -8,6 +8,34 @@ health = 200 opacity = TRUE anchored = TRUE + var/bullet_multiplier = 0.2 + var/explosion_multiplier = 2 + +/obj/structure/cargo_container/bullet_act(obj/projectile/P) + . = ..() + update_health(P.damage * bullet_multiplier) + +/obj/structure/cargo_container/attack_alien(mob/living/carbon/xenomorph/X) + . = ..() + var/damage = ((floor((X.melee_damage_lower+X.melee_damage_upper)/2)) ) + + //Frenzy bonus + if(X.frenzy_aura > 0) + damage += (X.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) + + X.animation_attack_on(src) + + X.visible_message(SPAN_DANGER("\The [X] slashes [src]!"), \ + SPAN_DANGER("You slash [src]!")) + + update_health(damage) + + return XENO_ATTACK_ACTION + +/obj/structure/cargo_container/ex_act(severity, direction) + . = ..() + update_health(severity*explosion_multiplier) + //Note, for Watatsumi, Grant, and Arious, "left" and "leftmid" are both the left end of the container, but "left" is generic and "leftmid" has the Sat Mover mark on it /obj/structure/cargo_container/watatsumi name = "Watatsumi Cargo Container" From 356187c238066496d4ed22aa9716b7d84fba0a44 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 25 Aug 2024 19:28:28 +0200 Subject: [PATCH 02/10] em --- code/game/objects/structures/cargo_container.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 7dd82c319bed..7172657769d6 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -11,9 +11,9 @@ var/bullet_multiplier = 0.2 var/explosion_multiplier = 2 -/obj/structure/cargo_container/bullet_act(obj/projectile/P) +/obj/structure/cargo_container/bullet_act(obj/projectile/projectile) . = ..() - update_health(P.damage * bullet_multiplier) + update_health(projectile.damage * bullet_multiplier) /obj/structure/cargo_container/attack_alien(mob/living/carbon/xenomorph/X) . = ..() From b937a73902b799d908ef8f49b343a3a3fc223793 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 25 Aug 2024 19:29:37 +0200 Subject: [PATCH 03/10] em --- code/game/objects/structures/cargo_container.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 7172657769d6..2117b06af955 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -15,17 +15,17 @@ . = ..() update_health(projectile.damage * bullet_multiplier) -/obj/structure/cargo_container/attack_alien(mob/living/carbon/xenomorph/X) +/obj/structure/cargo_container/attack_alien(mob/living/carbon/xenomorph/xenomorph) . = ..() - var/damage = ((floor((X.melee_damage_lower+X.melee_damage_upper)/2)) ) + var/damage = ((floor((xenomorph.melee_damage_lower+xenomorph.melee_damage_upper)/2)) ) //Frenzy bonus - if(X.frenzy_aura > 0) - damage += (X.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) + if(xenomorph.frenzy_aura > 0) + damage += (xenomorph.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) - X.animation_attack_on(src) + xenomorph.animation_attack_on(src) - X.visible_message(SPAN_DANGER("\The [X] slashes [src]!"), \ + xenomorph.visible_message(SPAN_DANGER("\The [xenomorph] slashes [src]!"), \ SPAN_DANGER("You slash [src]!")) update_health(damage) From a67ffb5f16e5e44e304a4285c751d9f06f6343c4 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 25 Aug 2024 19:30:07 +0200 Subject: [PATCH 04/10] em --- code/game/objects/structures/cargo_container.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 2117b06af955..06b392b2b3f8 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -8,8 +8,8 @@ health = 200 opacity = TRUE anchored = TRUE - var/bullet_multiplier = 0.2 - var/explosion_multiplier = 2 + var/bullet_damage_multiplier = 0.2 + var/explosion_damage_multiplier = 2 /obj/structure/cargo_container/bullet_act(obj/projectile/projectile) . = ..() From 2f26b865a274a4d8e7e676b51d5e5aa94352a5fa Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 25 Aug 2024 19:32:01 +0200 Subject: [PATCH 05/10] em --- code/game/objects/structures/cargo_container.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 06b392b2b3f8..9ce47f3751b4 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -13,7 +13,7 @@ /obj/structure/cargo_container/bullet_act(obj/projectile/projectile) . = ..() - update_health(projectile.damage * bullet_multiplier) + update_health(projectile.damage * bullet_damage_multiplier) /obj/structure/cargo_container/attack_alien(mob/living/carbon/xenomorph/xenomorph) . = ..() @@ -34,7 +34,7 @@ /obj/structure/cargo_container/ex_act(severity, direction) . = ..() - update_health(severity*explosion_multiplier) + update_health(severity*explosion_damage_multiplier) //Note, for Watatsumi, Grant, and Arious, "left" and "leftmid" are both the left end of the container, but "left" is generic and "leftmid" has the Sat Mover mark on it /obj/structure/cargo_container/watatsumi From ca416564d25dc901b29ee7977fb29eccc5855755 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 25 Aug 2024 20:28:22 +0200 Subject: [PATCH 06/10] adds code doc --- code/game/objects/structures/cargo_container.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 9ce47f3751b4..16d5a2f4e9c6 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -8,8 +8,8 @@ health = 200 opacity = TRUE anchored = TRUE - var/bullet_damage_multiplier = 0.2 - var/explosion_damage_multiplier = 2 + var/bullet_damage_multiplier = 0.2 ///multiples any demage taken from bullets + var/explosion_damage_multiplier = 2 ///multiples any demage taken from explosion /obj/structure/cargo_container/bullet_act(obj/projectile/projectile) . = ..() From f673ff267c0f5bd817acb7b57851759ffbe6d386 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Mon, 26 Aug 2024 00:35:46 +0200 Subject: [PATCH 07/10] Update code/game/objects/structures/cargo_container.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/objects/structures/cargo_container.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 16d5a2f4e9c6..b19aecf007dc 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -25,7 +25,7 @@ xenomorph.animation_attack_on(src) - xenomorph.visible_message(SPAN_DANGER("\The [xenomorph] slashes [src]!"), \ + xenomorph.visible_message(SPAN_DANGER("[xenomorph] slashes [src]!"), \ SPAN_DANGER("You slash [src]!")) update_health(damage) From dbe25b840efb4c40371f5ab75e9c809f981f67ba Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Mon, 26 Aug 2024 00:35:53 +0200 Subject: [PATCH 08/10] Update code/game/objects/structures/cargo_container.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/objects/structures/cargo_container.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index b19aecf007dc..72756bfc4745 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -34,7 +34,7 @@ /obj/structure/cargo_container/ex_act(severity, direction) . = ..() - update_health(severity*explosion_damage_multiplier) + update_health(severity * explosion_damage_multiplier) //Note, for Watatsumi, Grant, and Arious, "left" and "leftmid" are both the left end of the container, but "left" is generic and "leftmid" has the Sat Mover mark on it /obj/structure/cargo_container/watatsumi From 7fb4eafad469487ced852be679793eb62aca5fa3 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Mon, 26 Aug 2024 00:36:00 +0200 Subject: [PATCH 09/10] Update code/game/objects/structures/cargo_container.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/objects/structures/cargo_container.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 72756bfc4745..3fd0cd27cb42 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -17,7 +17,7 @@ /obj/structure/cargo_container/attack_alien(mob/living/carbon/xenomorph/xenomorph) . = ..() - var/damage = ((floor((xenomorph.melee_damage_lower+xenomorph.melee_damage_upper)/2)) ) + var/damage = ((floor((xenomorph.melee_damage_lower + xenomorph.melee_damage_upper)/2)) ) //Frenzy bonus if(xenomorph.frenzy_aura > 0) From cdf8397560988c2974d34f9f9165a2a342818f1c Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 27 Aug 2024 08:22:49 +0200 Subject: [PATCH 10/10] moves comments --- code/game/objects/structures/cargo_container.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 16d5a2f4e9c6..1068cf7b2ad4 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -8,8 +8,10 @@ health = 200 opacity = TRUE anchored = TRUE - var/bullet_damage_multiplier = 0.2 ///multiples any demage taken from bullets - var/explosion_damage_multiplier = 2 ///multiples any demage taken from explosion + ///multiples any demage taken from bullets + var/bullet_damage_multiplier = 0.2 + ///multiples any demage taken from explosion + var/explosion_damage_multiplier = 2 /obj/structure/cargo_container/bullet_act(obj/projectile/projectile) . = ..()