Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit c9788a7

Browse files
committed
No more confusion, I hope
1 parent f63e17f commit c9788a7

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

code/game/mecha/mecha.dm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,10 @@
342342
/obj/mecha/examine(mob/user)
343343
. = ..()
344344
var/hide_weapon = locate(/obj/item/mecha_parts/concealed_weapon_bay) in contents
345-
var/hidden_weapon = hide_weapon ? (locate(/obj/item/mecha_parts/mecha_equipment/weapon) in equipment) : null
345+
var/obj/item/mecha_parts/mecha_equipment/melee_weapon/hidden_melee_weapon = locate(/obj/item/mecha_parts/mecha_equipment/melee_weapon) in equipment
346+
if(hidden_melee_weapon && !(hidden_melee_weapon.mech_flags ~= EXOSUIT_MODULE_COMBAT))
347+
hidden_melee_weapon = null
348+
var/hidden_weapon = hide_weapon ? (locate(/obj/item/mecha_parts/mecha_equipment/weapon) in equipment)||hidden_melee_weapon : null
346349
var/list/visible_equipment = equipment - hidden_weapon
347350
if(visible_equipment.len)
348351
. += "It's equipped with:"

0 commit comments

Comments
 (0)