From 9915d8cb72af61153c8c443c9206a24c86b4d37e Mon Sep 17 00:00:00 2001 From: =vero Date: Sun, 24 Mar 2024 11:18:10 -0700 Subject: [PATCH 01/18] carlac's forbidden chocolate --- code/game/objects/items/reagent_containers/food/snacks.dm | 8 ++++---- code/game/objects/items/tools/surgery_tools.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 112a8e40e85b..58ccef4aee26 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -3289,8 +3289,8 @@ name = "CHUNK box" desc = "A bar of \"The CHUNK\" brand chocolate. \"The densest chocolate permitted to exist according to federal law. We are legally required to ask you not to use this blunt object for anything other than nutrition.\"" icon_state = "chunk" - force = 15 //LEGAL LIMIT OF CHOCOLATE - throwforce = 10 + force = 2 + throwforce = 1 bitesize = 2 wrapper = /obj/item/trash/chunk @@ -3305,8 +3305,8 @@ icon_state = "hunk" w_class = SIZE_MEDIUM hitsound = "swing_hit" - force = 35 //ILLEGAL LIMIT OF CHOCOLATE - throwforce = 50 + force = 2 + throwforce = 1 bitesize = 20 wrapper = /obj/item/trash/chunk/hunk diff --git a/code/game/objects/items/tools/surgery_tools.dm b/code/game/objects/items/tools/surgery_tools.dm index 7d354d8d8c1c..10482c5ee2ad 100644 --- a/code/game/objects/items/tools/surgery_tools.dm +++ b/code/game/objects/items/tools/surgery_tools.dm @@ -93,11 +93,11 @@ desc = "Cut, cut, and once more cut." icon_state = "scalpel" flags_atom = FPRINT|CONDUCT - force = 10 + force = 2 sharp = IS_SHARP_ITEM_ACCURATE edge = 1 w_class = SIZE_TINY - throwforce = 5 + throwforce = 1 flags_item = CAN_DIG_SHRAPNEL throw_speed = SPEED_VERY_FAST throw_range = 5 From 380da18c2def72f4ac1a7f6e693bb6d8f59b25e1 Mon Sep 17 00:00:00 2001 From: =vero Date: Sun, 24 Mar 2024 22:19:54 -0700 Subject: [PATCH 02/18] increased the force of the chocolate box --- code/game/objects/items/reagent_containers/food/snacks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 58ccef4aee26..a953a8d15f8f 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -3305,8 +3305,8 @@ icon_state = "hunk" w_class = SIZE_MEDIUM hitsound = "swing_hit" - force = 2 - throwforce = 1 + force = 4 + throwforce = 2 bitesize = 20 wrapper = /obj/item/trash/chunk/hunk From e4339f6d7e4b115ac6dba3a2f93866933ac5e1b9 Mon Sep 17 00:00:00 2001 From: =vero Date: Mon, 25 Mar 2024 14:07:32 -0700 Subject: [PATCH 03/18] reset hunk force --- code/game/objects/items/reagent_containers/food/snacks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index a953a8d15f8f..77eaaa89241f 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -3305,8 +3305,8 @@ icon_state = "hunk" w_class = SIZE_MEDIUM hitsound = "swing_hit" - force = 4 - throwforce = 2 + force = 35 + throwforce = 50 bitesize = 20 wrapper = /obj/item/trash/chunk/hunk From 9ebea8ab51730456aacd78762fa21c1ebdfc982b Mon Sep 17 00:00:00 2001 From: =vero Date: Mon, 25 Mar 2024 23:17:03 -0700 Subject: [PATCH 04/18] adds structure demolition multiplier --- code/game/machinery/bots/bots.dm | 4 ++-- code/game/machinery/deployable.dm | 4 ++-- code/game/objects/items.dm | 2 ++ code/game/objects/items/reagent_containers/food/snacks.dm | 5 +++-- code/game/objects/items/tools/surgery_tools.dm | 3 ++- code/game/objects/structures/barricade/barricade.dm | 2 +- code/game/objects/structures/barricade/misc.dm | 8 ++++---- code/game/objects/structures/fence.dm | 4 ++-- code/game/objects/structures/lamarr_cage.dm | 2 +- code/game/objects/structures/mirror.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/modules/cm_aliens/XenoStructures.dm | 2 +- code/modules/cm_aliens/weeds.dm | 2 +- code/modules/power/lighting.dm | 2 +- code/modules/vehicles/vehicle.dm | 4 ++-- 15 files changed, 26 insertions(+), 22 deletions(-) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 46050d2705b3..be5e17d584c9 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -84,9 +84,9 @@ if(hasvar(W,"force") && hasvar(W,"damtype")) switch(W.damtype) if("fire") - src.health -= W.force * fire_dam_coeff + src.health -= W.force * W.demolition_mod * fire_dam_coeff if("brute") - src.health -= W.force * brute_dam_coeff + src.health -= W.force * W.demolition_mod * brute_dam_coeff ..() healthcheck() else diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 687882d9d7ae..8559eea9773d 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -51,9 +51,9 @@ else switch(W.damtype) if("fire") - src.health -= W.force * 0.75 + src.health -= W.force * W.demolition_mod * 0.75 if("brute") - src.health -= W.force * 0.5 + src.health -= W.force * W.demolition_mod * 0.5 if (src.health <= 0) src.explode() ..() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index fcd431c33d26..f6aa2600f838 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -22,6 +22,8 @@ var/attack_speed = 11 //+3, Adds up to 10. Added an extra 4 removed from /mob/proc/do_click() ///Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" var/list/attack_verb + /// A multiplier to an object's force when used against a stucture. + var/demolition_mod = 1 health = null diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 77eaaa89241f..37d661b43c95 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -3289,8 +3289,9 @@ name = "CHUNK box" desc = "A bar of \"The CHUNK\" brand chocolate. \"The densest chocolate permitted to exist according to federal law. We are legally required to ask you not to use this blunt object for anything other than nutrition.\"" icon_state = "chunk" - force = 2 - throwforce = 1 + force = 15 + throwforce = 10 + demolition_mod = 0.3 bitesize = 2 wrapper = /obj/item/trash/chunk diff --git a/code/game/objects/items/tools/surgery_tools.dm b/code/game/objects/items/tools/surgery_tools.dm index 10482c5ee2ad..ac55f0b9694e 100644 --- a/code/game/objects/items/tools/surgery_tools.dm +++ b/code/game/objects/items/tools/surgery_tools.dm @@ -93,9 +93,10 @@ desc = "Cut, cut, and once more cut." icon_state = "scalpel" flags_atom = FPRINT|CONDUCT - force = 2 + force = 10 sharp = IS_SHARP_ITEM_ACCURATE edge = 1 + demolition_mod = 0.1 w_class = SIZE_TINY throwforce = 1 flags_item = CAN_DIG_SHRAPNEL diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm index 313067ca6a56..edb13ac16e5a 100644 --- a/code/game/objects/structures/barricade/barricade.dm +++ b/code/game/objects/structures/barricade/barricade.dm @@ -333,7 +333,7 @@ take_damage(dam * burn_flame_multiplier) /obj/structure/barricade/proc/hit_barricade(obj/item/item) - take_damage(item.force * 0.5 * brute_multiplier) + take_damage(item.force * item.demolition_mod * 0.5 * brute_multiplier) /obj/structure/barricade/proc/take_damage(damage) for(var/obj/structure/barricade/barricade in get_step(src,dir)) //discourage double-stacking barricades by removing health from opposing barricade diff --git a/code/game/objects/structures/barricade/misc.dm b/code/game/objects/structures/barricade/misc.dm index a0465de8f070..2069efa45ac8 100644 --- a/code/game/objects/structures/barricade/misc.dm +++ b/code/game/objects/structures/barricade/misc.dm @@ -50,9 +50,9 @@ /obj/structure/barricade/snow/hit_barricade(obj/item/I) switch(I.damtype) if("fire") - take_damage( I.force * 0.6 ) + take_damage( I.force * I.demolition_mod * 0.6 ) if("brute") - take_damage( I.force * 0.3 ) + take_damage( I.force * I.demolition_mod * 0.3 ) return @@ -106,6 +106,6 @@ /obj/structure/barricade/wooden/hit_barricade(obj/item/I) switch(I.damtype) if("fire") - take_damage( I.force * 1.5 ) + take_damage( I.force * I.demolition_mod * 1.5 ) if("brute") - take_damage( I.force * 0.75 ) + take_damage( I.force * I.demolition_mod * 0.75 ) diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index db24dfdfebdd..a08908a37a6c 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -170,9 +170,9 @@ else switch(W.damtype) if("fire") - health -= W.force + health -= W.force * W.demolition_mod if("brute") - health -= W.force * 0.1 + health -= (W.force * W.demolition_mod) * 0.1 healthcheck(1, 1, user, W) ..() diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index fbae7a387a63..c64f592b37fe 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -53,7 +53,7 @@ /obj/structure/lamarr/attackby(obj/item/W as obj, mob/user as mob) - src.health -= W.force + src.health -= W.force * W.demolition_mod src.healthcheck() ..() return diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index a8d76843313a..e6f798dfa6c9 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -124,7 +124,7 @@ playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 25, 1) user.visible_message(SPAN_WARNING("[user] hits [src] with [I], but it's already broken!"), SPAN_WARNING("You hit [src] with [I], but it's already broken!")) return - if(prob(I.force * 2)) + if(prob((I.force * I.demolition_mod ) * 2)) user.visible_message(SPAN_WARNING("[user] smashes [src] with [I]!"), SPAN_WARNING("You smash [src] with [I]!")) shatter() else diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 226045caaea6..81d7f24f054e 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -286,7 +286,7 @@ to_chat(user, (state ? SPAN_NOTICE("You have pried the window into the frame.") : SPAN_NOTICE("You have pried the window out of the frame."))) else if(!not_damageable) //Impossible to destroy - health -= W.force + health -= W.force * W.demolition_mod if(health <= 7 && !reinf && !static_frame && !not_deconstructable) anchored = FALSE update_nearby_icons() diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index c014fbf9c211..631d43b5a4f7 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -118,7 +118,7 @@ /obj/effect/alien/resin/attackby(obj/item/W, mob/user) if(!(W.flags_item & NOBLUDGEON)) - var/damage = W.force * RESIN_MELEE_DAMAGE_MULTIPLIER + var/damage = W.force * W.demolition_mod * RESIN_MELEE_DAMAGE_MULTIPLIER health -= damage if(istype(src, /obj/effect/alien/resin/sticky)) playsound(loc, "alien_resin_move", 25) diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index d614d87bf9b9..2206bc528e82 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -377,7 +377,7 @@ else to_chat(user, SPAN_WARNING("You cut \the [src] away with \the [attacking_item].")) - var/damage = attacking_item.force / 3 + var/damage = (attacking_item.force * attacking_item.demolition_mod) / 3 playsound(loc, "alien_resin_break", 25) if(iswelder(attacking_item)) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 309fa583589c..c95fa6af5045 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -390,7 +390,7 @@ else if(status != LIGHT_BROKEN && status != LIGHT_EMPTY) - if(prob(1+W.force * 5)) + if(prob(1+W.force * W.demolition_mod * 5)) to_chat(user, "You hit the light, and it smashes!") for(var/mob/M as anything in viewers(src)) diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 014452426a3c..7d94fcc7719d 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -84,9 +84,9 @@ else if(W.force) switch(W.damtype) if("fire") - health -= W.force * fire_dam_coeff + health -= W.force * W.demolition_mod * fire_dam_coeff if("brute") - health -= W.force * brute_dam_coeff + health -= W.force * W.demolition_mod * brute_dam_coeff playsound(src.loc, "smash.ogg", 25, 1) user.visible_message(SPAN_DANGER("[user] hits [src] with [W]."),SPAN_DANGER("You hit [src] with [W].")) healthcheck() From 5061450b7080ea59b390e2c0ebca03531add6acc Mon Sep 17 00:00:00 2001 From: =vero Date: Tue, 26 Mar 2024 07:50:49 -0700 Subject: [PATCH 05/18] chunk box is now a weapon --- .../objects/items/reagent_containers/food/snacks.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 37d661b43c95..e0cf343fca6d 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -54,8 +54,14 @@ qdel(src) return FALSE - if(package) - to_chat(M, SPAN_WARNING("How do you expect to eat this with the package still on?")) + if(package && user.a_intent == INTENT_HARM) + return ..() // chunk box gaming + + if(package && user.a_intent != INTENT_HARM) + if(user == M) + to_chat(M, SPAN_WARNING("How do you expect to eat this with the package still on?")) + else + to_chat(M, SPAN_WARNING("[M] tried to feed you a [src] with the package still on, what a silly goose!")) return FALSE if(istype(M, /mob/living/carbon)) @@ -3289,6 +3295,7 @@ name = "CHUNK box" desc = "A bar of \"The CHUNK\" brand chocolate. \"The densest chocolate permitted to exist according to federal law. We are legally required to ask you not to use this blunt object for anything other than nutrition.\"" icon_state = "chunk" + hitsound = "swing_hit" force = 15 throwforce = 10 demolition_mod = 0.3 @@ -3305,7 +3312,6 @@ desc = "A 'crate', as the marketing called it, of \"The HUNK\" brand chocolate. An early version of the CHUNK box, the HUNK bar was hit by a class action lawsuit and forced to go into bankruptcy and get bought out by the Company when hundreds of customers had their teeth crack from simply attempting to eat the bar." icon_state = "hunk" w_class = SIZE_MEDIUM - hitsound = "swing_hit" force = 35 throwforce = 50 bitesize = 20 From bdc39a09ce88707718e982c5de558af71d91054f Mon Sep 17 00:00:00 2001 From: =vero Date: Tue, 26 Mar 2024 08:16:55 -0700 Subject: [PATCH 06/18] reasonable chunk box attack speed. --- code/game/objects/items/reagent_containers/food/snacks.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index e0cf343fca6d..754ec78ceb6e 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -3298,6 +3298,7 @@ hitsound = "swing_hit" force = 15 throwforce = 10 + attack_speed = 10 demolition_mod = 0.3 bitesize = 2 wrapper = /obj/item/trash/chunk From 6240d017bbad7749367a7fd8cb0cf592db63e02d Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:35:14 -0400 Subject: [PATCH 07/18] Update code/modules/vehicles/vehicle.dm Co-authored-by: Vicacrov <49321394+Vicacrov@users.noreply.github.com> --- code/modules/vehicles/vehicle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 7d94fcc7719d..8632159b4f6d 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -87,7 +87,7 @@ health -= W.force * W.demolition_mod * fire_dam_coeff if("brute") health -= W.force * W.demolition_mod * brute_dam_coeff - playsound(src.loc, "smash.ogg", 25, 1) + playsound(loc, "smash.ogg", 25, 1) user.visible_message(SPAN_DANGER("[user] hits [src] with [W]."),SPAN_DANGER("You hit [src] with [W].")) healthcheck() else From f284684ab79a1a5ad6fb0971b2d0f2c027b4bb12 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:36:49 -0400 Subject: [PATCH 08/18] Update code/game/objects/structures/lamarr_cage.dm Co-authored-by: Vicacrov <49321394+Vicacrov@users.noreply.github.com> --- code/game/objects/structures/lamarr_cage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index c64f592b37fe..94167a87cdf7 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -54,7 +54,7 @@ /obj/structure/lamarr/attackby(obj/item/W as obj, mob/user as mob) src.health -= W.force * W.demolition_mod - src.healthcheck() + healthcheck() ..() return From 7e397879b48e4bea95b58cf954e9b07548513030 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:39:40 -0400 Subject: [PATCH 09/18] Apply suggestions from code review Co-authored-by: Vicacrov <49321394+Vicacrov@users.noreply.github.com> --- code/game/machinery/bots/bots.dm | 4 ++-- code/game/machinery/deployable.dm | 8 ++++---- code/game/objects/structures/lamarr_cage.dm | 2 +- code/game/objects/structures/mirror.dm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index be5e17d584c9..1f82d28dbbf8 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -84,9 +84,9 @@ if(hasvar(W,"force") && hasvar(W,"damtype")) switch(W.damtype) if("fire") - src.health -= W.force * W.demolition_mod * fire_dam_coeff + health -= W.force * W.demolition_mod * fire_dam_coeff if("brute") - src.health -= W.force * W.demolition_mod * brute_dam_coeff + health -= W.force * W.demolition_mod * brute_dam_coeff ..() healthcheck() else diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 8559eea9773d..7907c9f28985 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -51,11 +51,11 @@ else switch(W.damtype) if("fire") - src.health -= W.force * W.demolition_mod * 0.75 + health -= W.force * W.demolition_mod * 0.75 if("brute") - src.health -= W.force * W.demolition_mod * 0.5 - if (src.health <= 0) - src.explode() + health -= W.force * W.demolition_mod * 0.5 + if (health <= 0) + explode() ..() /obj/structure/machinery/deployable/barrier/ex_act(severity) diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 94167a87cdf7..3708b15b25e6 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -53,7 +53,7 @@ /obj/structure/lamarr/attackby(obj/item/W as obj, mob/user as mob) - src.health -= W.force * W.demolition_mod + health -= W.force * W.demolition_mod healthcheck() ..() return diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index e6f798dfa6c9..b8ae1d48085e 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -121,7 +121,7 @@ playsound(loc, 'sound/effects/Glasshit.ogg', 25, 1) return if(shattered) - playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 25, 1) + playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 25, 1) user.visible_message(SPAN_WARNING("[user] hits [src] with [I], but it's already broken!"), SPAN_WARNING("You hit [src] with [I], but it's already broken!")) return if(prob((I.force * I.demolition_mod ) * 2)) From 0eff1db9d116a3f4659bcc01293f44054e6b3c3a Mon Sep 17 00:00:00 2001 From: =vero Date: Wed, 27 Mar 2024 10:11:23 -0700 Subject: [PATCH 10/18] fixed the force feeding message. --- code/game/objects/items/reagent_containers/food/snacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 754ec78ceb6e..a9199fa47e2b 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -61,7 +61,7 @@ if(user == M) to_chat(M, SPAN_WARNING("How do you expect to eat this with the package still on?")) else - to_chat(M, SPAN_WARNING("[M] tried to feed you a [src] with the package still on, what a silly goose!")) + to_chat(M, SPAN_WARNING("[M] made an endearing attempt to force feed you a snack, albeit with the charming mishap of leaving the packaging intact.")) return FALSE if(istype(M, /mob/living/carbon)) From 724f0abb74e91c2902a9bd652a3b2cc00a1b1a23 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Mon, 1 Apr 2024 12:55:24 -0400 Subject: [PATCH 11/18] Update surgery_tools.dm --- code/game/objects/items/tools/surgery_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/tools/surgery_tools.dm b/code/game/objects/items/tools/surgery_tools.dm index ac55f0b9694e..a1792b574eec 100644 --- a/code/game/objects/items/tools/surgery_tools.dm +++ b/code/game/objects/items/tools/surgery_tools.dm @@ -98,7 +98,7 @@ edge = 1 demolition_mod = 0.1 w_class = SIZE_TINY - throwforce = 1 + throwforce = 5 flags_item = CAN_DIG_SHRAPNEL throw_speed = SPEED_VERY_FAST throw_range = 5 From e984f48a8b5dbc4cde288aa77bc6296a1c5b0fda Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Mon, 1 Apr 2024 12:56:29 -0400 Subject: [PATCH 12/18] Apply suggestions from code review Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/objects/items/reagent_containers/food/snacks.dm | 6 +++--- code/game/objects/structures/fence.dm | 2 +- code/game/objects/structures/mirror.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index a9199fa47e2b..bdc71987766b 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -54,10 +54,10 @@ qdel(src) return FALSE - if(package && user.a_intent == INTENT_HARM) - return ..() // chunk box gaming + if(package) + if(user.a_intent == INTENT_HARM) + return ..() // chunk box gaming - if(package && user.a_intent != INTENT_HARM) if(user == M) to_chat(M, SPAN_WARNING("How do you expect to eat this with the package still on?")) else diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index a08908a37a6c..60a8682a4930 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -172,7 +172,7 @@ if("fire") health -= W.force * W.demolition_mod if("brute") - health -= (W.force * W.demolition_mod) * 0.1 + health -= W.force * W.demolition_mod * 0.1 healthcheck(1, 1, user, W) ..() diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index b8ae1d48085e..0ee7453782d9 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -124,7 +124,7 @@ playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 25, 1) user.visible_message(SPAN_WARNING("[user] hits [src] with [I], but it's already broken!"), SPAN_WARNING("You hit [src] with [I], but it's already broken!")) return - if(prob((I.force * I.demolition_mod ) * 2)) + if(prob(I.force * I.demolition_mod * 2)) user.visible_message(SPAN_WARNING("[user] smashes [src] with [I]!"), SPAN_WARNING("You smash [src] with [I]!")) shatter() else From 0f373e93ac784fc05a608c2523b7c8c44c246a1b Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Mon, 1 Apr 2024 12:57:52 -0400 Subject: [PATCH 13/18] Update snacks.dm --- code/game/objects/items/reagent_containers/food/snacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index bdc71987766b..aa89ce851b3a 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -61,7 +61,7 @@ if(user == M) to_chat(M, SPAN_WARNING("How do you expect to eat this with the package still on?")) else - to_chat(M, SPAN_WARNING("[M] made an endearing attempt to force feed you a snack, albeit with the charming mishap of leaving the packaging intact.")) + to_chat(M, SPAN_WARNING("[M] made an endearing attempt to force feed you a snack with the packaging still on.")) return FALSE if(istype(M, /mob/living/carbon)) From fda16f3f7b5bf0e51b6974aa9b7a62fe0d803a7a Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:50:30 -0400 Subject: [PATCH 14/18] Update code/game/objects/items/reagent_containers/food/snacks.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/objects/items/reagent_containers/food/snacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index aa89ce851b3a..79a108d24bf1 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -61,7 +61,7 @@ if(user == M) to_chat(M, SPAN_WARNING("How do you expect to eat this with the package still on?")) else - to_chat(M, SPAN_WARNING("[M] made an endearing attempt to force feed you a snack with the packaging still on.")) + to_chat(M, SPAN_WARNING("[user] made an endearing attempt to force feed you a snack with the packaging still on.")) return FALSE if(istype(M, /mob/living/carbon)) From da26ecffe95df4e2f9b7c55e1581112dffd680db Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:50:38 -0400 Subject: [PATCH 15/18] Update code/game/objects/structures/barricade/misc.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/objects/structures/barricade/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/barricade/misc.dm b/code/game/objects/structures/barricade/misc.dm index 2069efa45ac8..0caa556e07a5 100644 --- a/code/game/objects/structures/barricade/misc.dm +++ b/code/game/objects/structures/barricade/misc.dm @@ -50,7 +50,7 @@ /obj/structure/barricade/snow/hit_barricade(obj/item/I) switch(I.damtype) if("fire") - take_damage( I.force * I.demolition_mod * 0.6 ) + take_damage( I.force * I.demolition_mod * 0.6 ) if("brute") take_damage( I.force * I.demolition_mod * 0.3 ) From 6cb2ef610e8509264da636f74dc65a73a99f61ce Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:50:43 -0400 Subject: [PATCH 16/18] Update code/game/objects/structures/barricade/misc.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/objects/structures/barricade/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/barricade/misc.dm b/code/game/objects/structures/barricade/misc.dm index 0caa556e07a5..8fcf7cec41ad 100644 --- a/code/game/objects/structures/barricade/misc.dm +++ b/code/game/objects/structures/barricade/misc.dm @@ -106,6 +106,6 @@ /obj/structure/barricade/wooden/hit_barricade(obj/item/I) switch(I.damtype) if("fire") - take_damage( I.force * I.demolition_mod * 1.5 ) + take_damage( I.force * I.demolition_mod * 1.5 ) if("brute") take_damage( I.force * I.demolition_mod * 0.75 ) From 74167b0545be6f9d60fc9426661f123766ccc5ac Mon Sep 17 00:00:00 2001 From: DOOM Date: Mon, 1 Apr 2024 13:04:50 -0700 Subject: [PATCH 17/18] suggested changes --- code/game/objects/structures/displaycase.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/turfs/walls/wall_types.dm | 4 ++-- code/modules/cm_aliens/XenoStructures.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 8439a887e57f..0a81042f22f0 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -57,7 +57,7 @@ /obj/structure/displaycase/attackby(obj/item/W as obj, mob/user as mob) - src.health -= W.force + src.health -= W.force * w.demolition_mod src.healthcheck() ..() return diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 25dc0040e2ac..0fd22361c67b 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -102,7 +102,7 @@ Dismantle() else if(!(W.flags_item & NOBLUDGEON) && W.force) user.animation_attack_on(src) - hardness -= W.force/100 + hardness -= W.force/100 * W.demolition_mod to_chat(user, "You hit the [name] with your [W.name]!") CheckHardness() else diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 259e386825ff..7b26854737cc 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -1044,7 +1044,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) /obj/structure/alien/movable_wall/attackby(obj/item/W, mob/living/user) if(!(W.flags_item & NOBLUDGEON)) user.animation_attack_on(src) - take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER, user) + take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER*W.demolition_mod, user) playsound(src, "alien_resin_break", 25) else return attack_hand(user) @@ -1280,7 +1280,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) if(!(W.flags_item & NOBLUDGEON)) user.animation_attack_on(src) - take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER, user) + take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER*W.demolition_mod, user) playsound(src, "alien_resin_break", 25) else return attack_hand(user) diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index 631d43b5a4f7..635bca03241f 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -391,7 +391,7 @@ return // defer to item afterattack if(!(W.flags_item & NOBLUDGEON) && W.force) user.animation_attack_on(src) - health -= W.force*RESIN_MELEE_DAMAGE_MULTIPLIER + health -= W.force * RESIN_MELEE_DAMAGE_MULTIPLIER * W.demolition_mod to_chat(user, "You hit the [name] with your [W.name]!") playsound(loc, "alien_resin_move", 25) healthcheck() From c6dc3ad1c767c335d186ce5bc37abbe72f925167 Mon Sep 17 00:00:00 2001 From: DOOM Date: Mon, 1 Apr 2024 13:09:15 -0700 Subject: [PATCH 18/18] piss --- code/game/objects/structures/displaycase.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 0a81042f22f0..bfc9bfa7833e 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -57,7 +57,7 @@ /obj/structure/displaycase/attackby(obj/item/W as obj, mob/user as mob) - src.health -= W.force * w.demolition_mod + src.health -= W.force * W.demolition_mod src.healthcheck() ..() return