From 77c7e680eb9e2879be72ec086a4e20c4a56a1768 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Fri, 17 Apr 2020 20:01:44 -0400 Subject: [PATCH] Remove fighter shield and make it magic --- code/game/mecha/combat/fighter.dm | 12 +----------- code/game/mecha/equipment/tools/shield_omni.dm | 8 ++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm index 171c96395ed..f4fb5f0f97d 100644 --- a/code/game/mecha/combat/fighter.dm +++ b/code/game/mecha/combat/fighter.dm @@ -208,16 +208,6 @@ else who << sound('sound/mecha/fighter_entered.ogg',volume=50) -////////////// Equipment ////////////// - -// For 64x64 fighters -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64 - shield_type = /obj/item/shield_projector/rectangle/mecha/fighter64 -/obj/item/shield_projector/rectangle/mecha/fighter64 - shift_x = 16 - shift_y = 16 - - ////////////// Gunpod ////////////// /obj/mecha/combat/fighter/gunpod @@ -316,7 +306,7 @@ . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64 + ME = new /obj/item/mecha_parts/mecha_equipment/omni_shield ME.attach(src) /obj/effect/decal/mecha_wreckage/baron diff --git a/code/game/mecha/equipment/tools/shield_omni.dm b/code/game/mecha/equipment/tools/shield_omni.dm index 8088cf296af..1d230c4deb6 100644 --- a/code/game/mecha/equipment/tools/shield_omni.dm +++ b/code/game/mecha/equipment/tools/shield_omni.dm @@ -75,6 +75,14 @@ . = ..() my_mech = loc GLOB.moved_event.register(my_mech, src, /obj/item/shield_projector/proc/update_shield_positions) + update_shift(my_mech) + +/obj/item/shield_projector/rectangle/mecha/proc/update_shift(atom/movable/mech) + var/icon/my_icon = icon(mech.icon) //holy heck + var/x_dif = (my_icon.Width() - world.icon_size) / 2 + shift_x = round(x_dif, 1) + var/y_dif = (my_icon.Height() - world.icon_size) / 2 + shift_y = round(y_dif, 1) /obj/item/shield_projector/rectangle/mecha/Destroy() GLOB.moved_event.unregister(my_mech, src, /obj/item/shield_projector/proc/update_shield_positions)