pixel shifting

This commit is contained in:
kevinz000
2020-03-26 12:51:17 -07:00
parent 940cdd13b0
commit 4391fc3714
3 changed files with 33 additions and 14 deletions
@@ -76,20 +76,18 @@
return TRUE
/mob/living/carbon/alien/humanoid/get_standard_pixel_y_offset(lying = 0)
. = ..()
if(leaping)
return -32
else if(custom_pixel_y_offset)
return custom_pixel_y_offset
else
return initial(pixel_y)
. -= 32
if(custom_pixel_y_offset)
. += custom_pixel_y_offset
/mob/living/carbon/alien/humanoid/get_standard_pixel_x_offset(lying = 0)
. = ..()
if(leaping)
return -32
else if(custom_pixel_x_offset)
return custom_pixel_x_offset
else
return initial(pixel_x)
. -= 32
if(custom_pixel_x_offset)
. += custom_pixel_x_offset
/mob/living/carbon/alien/humanoid/get_permeability_protection(list/target_zones)
return 0.8
+2 -3
View File
@@ -431,10 +431,9 @@
return TRUE
/mob/living/carbon/get_standard_pixel_y_offset(lying = 0)
. = ..()
if(lying)
return -6
else
return initial(pixel_y)
. -= 6
/mob/living/carbon/proc/accident(obj/item/I)
if(!I || (I.item_flags & ABSTRACT) || HAS_TRAIT(I, TRAIT_NODROP))
+23 -1
View File
@@ -2,7 +2,7 @@
/mob/living
/// Whether or not the user is actively blocking.
var/active_blocking = FALSE
/// The item the user is actively blocking with.
/// The item the user is actively blocking with if any.
var/obj/item/active_block_item
/mob/living/on_item_dropped(obj/item/I)
@@ -36,6 +36,28 @@
active_block_effect_start()
return TRUE
/// Visual effect setup for starting a directional block
/mob/living/proc/active_block_effect_start()
/// Visual effect cleanup for starting a directional block
/mob/living/proc/active_block_effect_end()
/mob/living/get_standard_pixel_x_offset()
. = ..()
if(active_blocking)
if(dir & EAST)
. += 12
if(dir & WEST)
. -= 12
/mob/living/get_standard_pixel_y_offset()
. = ..()
if(active_blocking)
if(dir & NORTH)
. += 12
if(dir & SOUTH)
. -= 12
/// The amount of damage that is blocked.
/obj/item/proc/active_block_damage_mitigation(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
var/absorption = block_parry_data.block_damage_absorption_override[attack_type]