From 4327d8eb878e3bd0bc93a37301c84d44392c11a9 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 5 May 2020 04:32:35 -0700
Subject: [PATCH] why did i design this way why why why

---
 code/modules/mob/living/living_active_block.dm |  6 ------
 .../mob/living/living_blocking_parrying.dm     | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm
index f544f2eda9..0771181a70 100644
--- a/code/modules/mob/living/living_active_block.dm
+++ b/code/modules/mob/living/living_active_block.dm
@@ -119,12 +119,6 @@
 	stop_active_blocking(FALSE)
 	return TRUE
 
-/**
-  * Gets our datum/block_parry_data
-  */
-/obj/item/proc/get_block_parry_data()
-	return get_block_parry_data(block_parry_data)
-
 /**
   * Returns if we can actively block.
   */
diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm
index a96179812a..32a9734232 100644
--- a/code/modules/mob/living/living_blocking_parrying.dm
+++ b/code/modules/mob/living/living_blocking_parrying.dm
@@ -18,7 +18,7 @@
 
 GLOBAL_LIST_EMPTY(block_parry_data)
 
-/proc/get_block_parry_data(datum/block_parry_data/type_id_datum)
+/proc/return_block_parry_datum(datum/block_parry_data/type_id_datum)
 	if(istype(type_id_datum))
 		return type_id_datum
 	if(ispath(type_id_datum))
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	else		//text id
 		return GLOB.block_parry_data["[type_id_datum]"]
 
-/proc/set_block_parry_data(id, datum/block_parry_data/data)
+/proc/set_block_parry_datum(id, datum/block_parry_data/data)
 	if(ispath(id))
 		CRASH("Path-fetching of block parry data is only to grab static data, do not attempt to modify global caches of paths. Use string IDs.")
 	GLOB.block_parry_data["[id]"] = data
@@ -144,9 +144,15 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 		return
 	return total/div	//groan
 
+/**
+  * Gets this item's datum/block_parry_data
+  */
+/obj/item/proc/get_block_parry_data()
+	return return_block_parry_datum(block_parry_data)
+
 /mob/living/proc/handle_block_parry(seconds = 1)
 	if(active_blocking)
-		var/datum/block_parry_data/data = get_block_parry_data(active_block_item.block_parry_data)
+		var/datum/block_parry_data/data = return_block_parry_datum(active_block_item.block_parry_data)
 		adjustStaminaLossBuffered(data.block_stamina_cost_per_second * seconds)
 
 //Stubs.
@@ -213,7 +219,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	var/stage = get_parry_stage()
 	if(stage == NOT_PARRYING)
 		return BLOCK_NONE
-	var/datum/block_parry_data/data = get_block_parry_data()
+	var/datum/block_parry_data/data = get_parry_data()
 	var/efficiency = get_parry_efficiency(attack_type)
 	switch(parrying)
 		if(ITEM_PARRY)
@@ -282,9 +288,9 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	if(parrying == ITEM_PARRY)
 		return active_parry_item.get_block_parry_data()
 	else if(parrying == UNARMED_PARRY)
-		return get_block_parry_data(block_parry_data)
+		return return_block_parry_datum(block_parry_data)
 	else if(parrying == MARTIAL_PARRY)
-		return get_block_parry_data(mind.martial_art.block_parry_data)
+		return return_block_parry_datum(mind.martial_art.block_parry_data)
 
 /// Effects
 /obj/effect/abstract/parry