cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hardsuit and Pickaxe Bugfixes (#9594)

Browse Source
This commit is contained in:
Geeves
2020-08-11 12:17:33 +02:00
committed by GitHub
parent d5df1f998e
commit 08964ec3f3
18 changed files with 597 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/animations.dm
+10 -7
View File
@@ -176,18 +176,21 @@ note dizziness decrements automatically in the mob's Life() proc.
animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
animate(pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, time = 2)
/mob/do_attack_animation(atom/A)
/mob/do_attack_animation(atom/A, var/atom/attack_item)
..()
is_floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement.
// What icon do we use for the attack?
var/image/I
if(hand && l_hand) // Attacked with item in left hand.
I = image(l_hand.icon, A, l_hand.icon_state, A.layer + 1)
else if (!hand && r_hand) // Attacked with item in right hand.
I = image(r_hand.icon, A, r_hand.icon_state, A.layer + 1)
else // Attacked with a fist?
return
if(attack_item)
I = image(attack_item.icon, A, attack_item.icon_state, A.layer + 1)
else
if(hand && l_hand) // Attacked with item in left hand.
I = image(l_hand.icon, A, l_hand.icon_state, A.layer + 1)
else if (!hand && r_hand) // Attacked with item in right hand.
I = image(r_hand.icon, A, r_hand.icon_state, A.layer + 1)
else // Attacked with a fist?
return
// Who can see the attack?
var/list/viewing = list()
code/modules/mob/living/carbon/carbon.dm
+1 -2
View File
@@ -107,7 +107,7 @@
if(M.a_intent != I_HELP)
var/action
switch(a_intent)
switch(M.a_intent)
if(I_GRAB)
action = "grabbed"
if(I_DISARM)
@@ -133,7 +133,6 @@
visible_message(SPAN_NOTICE("[M] [action] [src] waking [t_him] up!"))
sleeping = 0
willfully_sleeping = FALSE
return
/mob/living/carbon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null, var/tesla_shock = 0, var/ground_zero)
if(status_flags & GODMODE)