From dc3f02dbfb55b3634e99677a1664c22d80e86096 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 27 May 2020 00:08:00 -0700
Subject: [PATCH] let's make it pretty

---
 code/game/objects/items/shields.dm                       | 8 ++++----
 code/modules/mob/living/carbon/carbon_movement.dm        | 7 ++++++-
 code/modules/mob/living/living_movement.dm               | 8 ++++----
 modular_citadel/code/modules/mob/living/carbon/carbon.dm | 8 --------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 377b58c09d..9b3bc55fca 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -24,7 +24,7 @@
 	var/shieldbash_push_distance = 1
 
 /datum/block_parry_data/shield
-	block_stamina_efficiency = 1
+	block_stamina_efficiency = 1.5
 	block_stamina_cost_per_second = 3
 
 /obj/item/shield/examine(mob/user)
@@ -193,7 +193,7 @@
 	var/repair_material = /obj/item/stack/sheet/mineral/titanium
 	var/can_shatter = TRUE
 	shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_TRANSPARENT
-	max_integrity = 300
+	max_integrity = 450
 
 /obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/melee/baton))
@@ -246,13 +246,13 @@
 	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
 	shield_flags = SHIELD_FLAGS_DEFAULT
-	max_integrity = 200
+	max_integrity = 300
 
 obj/item/shield/riot/bullet_proof
 	name = "bullet resistant shield"
 	desc = "A far more frail shield made of resistant plastics and kevlar meant to block ballistics."
 	armor = list("melee" = 30, "bullet" = 80, "laser" = 0, "energy" = 0, "bomb" = -40, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
-	max_integrity = 200
+	max_integrity = 300
 
 /obj/item/shield/riot/roman
 	name = "\improper Roman shield"
diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm
index cc390b9329..b474f113d6 100644
--- a/code/modules/mob/living/carbon/carbon_movement.dm
+++ b/code/modules/mob/living/carbon/carbon_movement.dm
@@ -20,7 +20,12 @@
 	if(istype(J) && (movement_dir || J.stabilizers) && J.allow_thrust(0.01, src))
 		return 1
 
-/mob/living/carbon/Move(NewLoc, direct)
+/mob/living/carbon/Moved()
+	wrongdirmovedelay = FALSE
+	if((combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && client && lastmousedir)
+		if(lastmousedir != dir)
+			wrongdirmovedelay = TRUE
+			setDir(lastmousedir, ismousemovement = TRUE)
 	. = ..()
 	if(. && (movement_type & FLOATING)) //floating is easy
 		if(HAS_TRAIT(src, TRAIT_NOHUNGER))
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index d5f04ade7c..108dd789c9 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -3,12 +3,12 @@
 	update_turf_movespeed(loc)
 	//Hide typing indicator if we move.
 	clear_typing_indicator()
-	update_pixel_shifting()
+	update_pixel_shifting(TRUE)
 
-/mob/living/proc/update_pixel_shifting()
+/mob/living/proc/update_pixel_shifting(moved = FALSE)
 	if(active_blocking)
-		animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 1.5, easing = SINE_EASING | EASE_OUT , flags = ANIMATION_END_NOW)
-	else
+		animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 1.5, flags = ANIMATION_END_NOW)
+	else if(moved)
 		if(is_shifted)
 			is_shifted = FALSE
 			pixel_x = get_standard_pixel_x_offset(lying)
diff --git a/modular_citadel/code/modules/mob/living/carbon/carbon.dm b/modular_citadel/code/modules/mob/living/carbon/carbon.dm
index 0532f59afa..8efb41e127 100644
--- a/modular_citadel/code/modules/mob/living/carbon/carbon.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/carbon.dm
@@ -14,14 +14,6 @@
 	SEND_SIGNAL(src, COMSIG_VORE_TOGGLED, src, voremode)
 	return TRUE
 
-/mob/living/carbon/Move(atom/newloc, direct = 0)
-	. = ..()
-	wrongdirmovedelay = FALSE
-	if((combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && client && lastmousedir)
-		if(lastmousedir != dir)
-			wrongdirmovedelay = TRUE
-			setDir(lastmousedir, ismousemovement = TRUE)
-
 /mob/living/carbon/onMouseMove(object, location, control, params)
 	if(!(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 		return