From 4b9f68814ee34a03efa0d762b3bfd08298284136 Mon Sep 17 00:00:00 2001 From: Sypsoti Date: Mon, 11 Apr 2022 16:09:30 -0500 Subject: [PATCH] sprite alignment and minor code cleanup --- code/game/objects/effects/overlays.dm | 2 ++ .../mob/living/simple_mob/subtypes/animal/space/alien.dm | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index a862b5baea..6811dc852b 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -118,6 +118,8 @@ icon = 'icons/effects/96x96.dmi' icon_state = "emfield_s3" alpha = 100 + pixel_x = -32 + pixel_y = -16 /// Line up with the big sprite that spawns it! plane = MOB_PLANE layer = BELOW_MOB_LAYER diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm index dbb55e7979..fc1f5a4024 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm @@ -28,7 +28,6 @@ attacktext = list("slashed") attack_sound = 'sound/weapons/bladeslice.ogg' ai_holder_type = /datum/ai_holder/simple_mob/xeno_alien /// Found in xeno_alien_ai.dm - special_attack_min_range = 1 special_attack_max_range = 7 var/teleport_distance = 1 /// How far away to be when we teleport. @@ -37,12 +36,12 @@ var/obj/effect/overlay/skathari_telegrab/displacement_warning = null /mob/living/simple_mob/animal/space/alien/do_special_attack(atom/A) - . = TRUE switch(a_intent) if(I_DISARM) xeno_teleport(A) if(I_GRAB) xeno_telegrab() + return TRUE /// Prevents shooting when using, mostly noticable for player-controlled. /mob/living/simple_mob/animal/space/alien/proc/xeno_teleport(atom/target) /// Copied MOSTLY from bluespace slime's do_special_attack @@ -198,7 +197,10 @@ projectiletype = /obj/item/projectile/energy/skathari ai_holder_type = /datum/ai_holder/simple_mob/xeno_alien/empress pixel_x = -32 + pixel_y = -16 old_x = -32 + default_pixel_x = -32 + default_pixel_y = -16 /// Help center it a bit more. icon_expected_width = 96 icon_expected_height = 96