From 403d163c59c2783b8ed64536fa8beaf7d6515067 Mon Sep 17 00:00:00 2001
From: TobyThorne <45202681+TobyThorne@users.noreply.github.com>
Date: Sun, 18 Aug 2024 21:14:34 +0500
Subject: [PATCH] GOOOOL
---
code/game/atoms.dm | 9 +++--
code/game/objects/items.dm | 77 +-------------------------------------
code/modules/mob/mob.dm | 4 +-
3 files changed, 8 insertions(+), 82 deletions(-)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 7d11cb09572..0e91ab81125 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -314,17 +314,18 @@ its easier to just keep the beam vertical.
else
f_name += "oil-stained [name][infix]."
- . = "\icon[src] That's [f_name][infix]"
- . += "\n[desc]"
+ . = list("\icon[src] That's [f_name][infix]")
+ . += desc
return
-/atom/proc/wrapped_examine(...)
+/atom/proc/baked_examine(...)
SHOULD_NOT_OVERRIDE(TRUE)
var/content = "
"
- content += examine(arglist(args))
+ var/list/strings_list = examine(arglist(args))
+ content += strings_list.Join("\n")
content += "
"
return content
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index ac8e71bbcbd..ff6eef83fed 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -108,12 +108,6 @@
beta_particle_resist = 6 MEGA ELECTRONVOLT
hawking_resist = 1 ELECTRONVOLT
-/obj/item/Topic(href, href_list, datum/topic_state/state)
- . = ..()
-
- if(href_list["examine_combat"])
- to_chat(usr, EXAMINE_BLOCK(SPAN_NOTICE(get_combat_stats().Join("\n"))))
-
/obj/item/New()
..()
if(randpixel && (!pixel_x && !pixel_y) && isturf(loc)) //hopefully this will prevent us from messing with mapper-set pixel_x/y
@@ -262,76 +256,7 @@
else
. += SPAN("danger", "No extractable materials detected.
")
- if(force || block_tier == BLOCK_TIER_ADVANCED || mod_shield == BLOCK_TIER_PROJECTILE)
- . += "Show combat information."
-
-/// Generates and returns a list of combat-related stats.
-/obj/item/proc/get_combat_stats()
- RETURN_TYPE(/list)
-
- . = list()
-
- if(force)
- switch(mod_weight)
- if(0 to 0.4)
- . += "It's very light."
- if(0.4 to 0.8)
- . += "It's light."
- if(0.8 to 1.25)
- . += "It has moderate weight."
- if(1.25 to 1.65)
- . += "It's heavy."
- else
- . += "It's very heavy"
-
- switch(mod_reach)
- if(0 to 0.4)
- . += "It's reach is very short."
- if(0.4 to 0.8)
- . += "It's reach is short."
- if(0.8 to 1.25)
- . += "It's reach is average."
- if(1.25 to 1.65)
- . += "It's reach is long."
- else
- . += "It's reach is very long."
-
- switch(mod_handy)
- if(0 to 0.4)
- . += "It's unhandy."
- if(0.4 to 0.8)
- . += "It's not that handy."
- if(0.8 to 1.25)
- . += "It's handy."
- if(1.25 to 1.65)
- . += "It's really handy."
- else
- . += "It's outstandingly handy."
-
- if(armor_penetration)
- switch(armor_penetration)
- if(1 to 19)
- . += "It's good for penetrating light armor."
- if(20 to 39)
- . += "It's good for penetrating medium armor."
- if(40 to 59)
- . += "It's good for penetrating above-average armor."
- if(60 to 79)
- . += "It's good for penetrating heavy armor."
- if(80 to 99)
- . += "It's exceptionally good for penetrating most armor."
- if(100 to INFINITY)
- . += "It goes through most armor as a hot knife through butter."
- else
- . += "It's not that good at penetrating armor."
-
- . += "It's attack cooldown is about [round((attack_cooldown + DEFAULT_WEAPON_COOLDOWN * (mod_weight / mod_handy)) * mod_speed * 0.1, 0.1)] seconds."
- . += "It has parry window of [round(mod_handy * 12 * 0.1, 0.1)] seconds."
-
- if(block_tier == BLOCK_TIER_ADVANCED)
- . += "It may block or reflect projectiles really well."
- else if(mod_shield == BLOCK_TIER_PROJECTILE)
- . += "It may block projectiles."
+ . += "*--------*"
/obj/item/attack_hand(mob/user)
if(!user)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index db54fbbbd9d..e11a614d7d4 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -301,10 +301,10 @@
var/mob/living/carbon/C = src
var/mob/fake = C.get_fake_appearance(A)
if(fake)
- examine_result = fake.wrapped_examine(src)
+ examine_result = fake.baked_examine(src)
if(isnull(examine_result))
- examine_result = A.wrapped_examine(src)
+ examine_result = A.baked_examine(src)
to_chat(usr, examine_result)