From 64e0ba695f2654a67f28fdda02a6e9e7241084a2 Mon Sep 17 00:00:00 2001 From: Rykka Date: Wed, 15 Jan 2020 17:21:58 -0700 Subject: [PATCH] Micro Mech Slot Fix This shows micro mech slots in the equipment area and allows for them to be properly disconnected. Credit goes to InsanityKitten for finding and making this fix. https://github.com/CHOMPStation2/CHOMPStation2/pull/158 --- code/game/mecha/equipment/mecha_equipment.dm | 4 ++-- code/game/mecha/mecha.dm | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 48a46fae56c..8f021871320 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -239,9 +239,9 @@ if(EQUIP_SPECIAL) chassis.special_equipment -= src //VOREStation Addition begin: MICROMECHS - if(EQUIP_UTILITY) + if(EQUIP_MICRO_UTILITY) chassis.micro_utility_equipment -= src - if(EQUIP_SPECIAL) + if(EQUIP_MICRO_WEAPON) chassis.micro_weapon_equipment -= src //VOREStation Addition end: MICROMECHS if(chassis.selected == src) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 74cdb2d368b..2a6f08df033 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1504,9 +1504,15 @@ output += "Universal Module: [W.name] Detach
" for(var/obj/item/mecha_parts/mecha_equipment/W in special_equipment) output += "Special Module: [W.name] Detach
" + for(var/obj/item/mecha_parts/mecha_equipment/W in micro_utility_equipment) // VOREstation Edit - Adds micro equipent to the menu + output += "Micro Utility Module: [W.name] Detach
" + for(var/obj/item/mecha_parts/mecha_equipment/W in micro_weapon_equipment) + output += "Micro Weapon Module: [W.name] Detach
" output += {"Available hull slots: [max_hull_equip-hull_equipment.len]
Available weapon slots: [max_weapon_equip-weapon_equipment.len]
+ Available micro weapon slots: [max_micro_weapon_equip-micro_weapon_equipment.len]
Available utility slots: [max_utility_equip-utility_equipment.len]
+ Available micro utility slots: [max_micro_utility_equip-micro_utility_equipment.len]
Available universal slots: [max_universal_equip-universal_equipment.len]
Available special slots: [max_special_equip-special_equipment.len]