From d7954ca077bd0f15ca5314347cc26b1d969a407d Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 3 Jun 2020 00:29:01 +0200
Subject: [PATCH] Yet another PR fixing some issues. (#12424)
---
code/game/mecha/mecha_construction_paths.dm | 36 ++++++++++-----------
code/game/objects/items/melee/energy.dm | 5 +++
code/modules/surgery/bodyparts/bodyparts.dm | 2 +-
3 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 19b6d0a9bd..5160282180 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -5,44 +5,42 @@
var/base_icon
var/looky_helpy = TRUE
-/datum/component/construction/mecha/examine(mob/user)
+/datum/component/construction/mecha/examine(datum/source, mob/user, list/examine_list)
. = ..()
if(looky_helpy)
switch(steps[index]["key"])
if(TOOL_WRENCH)
- . += "The mech could be wrenched into place."
+ examine_list += "The mech could be wrenched into place."
if(TOOL_SCREWDRIVER)
- . += "The mech could be screwed into place."
+ examine_list += "The mech could be screwed into place."
if(TOOL_WIRECUTTER)
- . += "The mech wires could be trimmed into place."
+ examine_list += "The mech wires could be trimmed into place."
if(/obj/item/stack/cable_coil)
- . += "The mech could use some wiring."
+ examine_list += "The mech could use some wiring."
if(/obj/item/circuitboard)
- . += "The mech could use a type ofcircuitboard."
+ examine_list += "The mech could use a type ofcircuitboard."
if(/obj/item/stock_parts/scanning_module)
- . += "The mech could use a scanning stock part."
+ examine_list += "The mech could use a scanning stock part."
if(/obj/item/stock_parts/capacitor)
- . += "The mech could use a power based stock part."
+ examine_list += "The mech could use a power based stock part."
if(/obj/item/stock_parts/cell)
- . += "The mech could use a power source."
+ examine_list += "The mech could use a power source."
if(/obj/item/stack/sheet/metal)
- . += "The mech could use some sheets of metal."
+ examine_list += "The mech could use some sheets of metal."
if(/obj/item/stack/sheet/plasteel)
- . += "The mech could use some sheets of strong steel."
+ examine_list += "The mech could use some sheets of strong steel."
if(/obj/item/bikehorn)
- . += "HONK IT!."
+ examine_list += "HONK IT!."
if(/obj/item/clothing/mask/gas/clown_hat)
- . += "GIVE IT CLOWN MAKEUP HONK!."
+ examine_list += "GIVE IT CLOWN MAKEUP HONK!."
if(/obj/item/clothing/shoes/clown_shoes)
- . += "GIVE IT GOOFY SHOES HONK HONK!."
+ examine_list += "GIVE IT GOOFY SHOES HONK HONK!."
if(/obj/item/mecha_parts/part)
- . += "The mech could use a mech part."
+ examine_list += "The mech could use a mech part."
if(/obj/item/stack/ore/bluespace_crystal)
- . += "The mech could use a crystal of sorts."
+ examine_list += "The mech could use a crystal of sorts."
if(/obj/item/assembly/signaler/anomaly)
- . += "The mech could use a anomaly of sorts."
- else
- return
+ examine_list += "The mech could use a anomaly of sorts."
/datum/component/construction/mecha/spawn_result()
if(!result)
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index e4cfeab20f..cbb72c5432 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -273,6 +273,10 @@
light_color = "#37FFF7"
actions_types = list()
+/obj/item/melee/transforming/energy/sword/cx/Initialize()
+ icon_state_on = icon_state
+ return ..()
+
/obj/item/melee/transforming/energy/sword/cx/ComponentInitialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
@@ -290,6 +294,7 @@
if(!supress_message_text)
to_chat(user, "[src] [active ? "is now active":"can now be concealed"].")
+
/obj/item/melee/transforming/energy/sword/cx/update_overlays()
. = ..()
var/mutable_appearance/blade_overlay = mutable_appearance(icon, "cxsword_blade")
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index dd31145491..09ac7a8cb2 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -285,7 +285,7 @@
if(status == BODYPART_ORGANIC)
icon = base_bp_icon || DEFAULT_BODYPART_ICON_ORGANIC
else if(status == BODYPART_ROBOTIC)
- icon = base_bp_icon || DEFAULT_BODYPART_ICON_ROBOTIC
+ icon = DEFAULT_BODYPART_ICON_ROBOTIC
if(owner)
owner.updatehealth()