removing unatomic changes

code/__DEFINES/combat.dm

@@ -46,7 +46,7 @@
 #define CLICK_CD_CLICK_ABILITY 6
 #define CLICK_CD_BREAKOUT 100
 #define CLICK_CD_HANDCUFFED 10
-#define CLICK_CD_RESIST 1
+#define CLICK_CD_RESIST 20
 #define CLICK_CD_GRABBING 10
 #define CLICK_CD_LOOK_UP 5
 
@@ -74,12 +74,6 @@
 #define PROJECTILE_ATTACK 3
 #define THROWN_PROJECTILE_ATTACK 4
 #define LEAP_ATTACK 5
-#define ALL_ATTACK_TYPES list(MELEE_ATTACK, UNARMED_ATTACK, PROJECTILE_ATTACK, THROWN_PROJECTILE_ATTACK, LEAP_ATTACK)
-#define NON_PROJECTILE_ATTACKS list(MELEE_ATTACK, UNARMED_ATTACK, LEAP_ATTACK)
-
-// the standard parry time out time
-#define PARRY_DEFAULT_TIMEOUT 0.75 SECONDS
-#define PARRY_RIPOST 0.50 SECONDS
 
 //attack visual effects
 #define ATTACK_EFFECT_PUNCH "punch"

code/__DEFINES/is_helpers.dm

@@ -10,9 +10,6 @@
 
 #define isgenerator(A) (istype(A, /generator))
 
-#define isbadpath(A) (A == initial(A.bad_type))
-#define isbadtype(A) (A.type == A.bad_type)
-
 //Turfs
 //#define isturf(A) (istype(A, /turf)) This is actually a byond built-in. Added here for completeness sake.
 

code/game/atoms_movable.dm

@@ -75,9 +75,6 @@
 	/// Whether a user will face atoms on entering them with a mouse. Despite being a mob variable, it is here for performance
 	var/face_mouse = FALSE
 
-	/// Use path Ex:(bad_type = obj/item). Generally for abstract code objects, atoms with a set bad_type can never be selected by spawner and is ignored in some tests. Examples include parent objects which should only exist within the code.
-	var/bad_type
-
 /atom/movable/Initialize(mapload)
 	. = ..()
 	switch(blocks_emissive)

code/game/objects/items.dm

@@ -15,7 +15,6 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	name = "item"
 	icon = 'icons/obj/items.dmi'
 	blocks_emissive = EMISSIVE_BLOCK_GENERIC
-	bad_type = /obj/item
 	///icon state name for inhand overlays
 	var/item_state = null
 	///Icon file for left hand inhand overlays
@@ -508,21 +507,14 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 // afterattack() and attack() prototypes moved to _onclick/item_attack.dm for consistency
 
 /obj/item/proc/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	//Mostly shields
+	SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args)
 	if((prob(final_block_chance) && COOLDOWN_FINISHED(src, block_cooldown)) || (prob(final_block_chance) && istype(src, /obj/item/shield)))
 		owner.visible_message("<span class='danger'>[owner] blocks [attack_text] with [src]!</span>")
 		playsound(src, 'sound/weapons/effects/deflect.ogg', 100)
 		if(!istype(src, /obj/item/shield))
 			COOLDOWN_START(src, block_cooldown, block_cooldown_time)
 		return TRUE
-
-	//Mostly parrying
-	var/signal_result = (SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, owner, hitby, damage, attack_type)) + prob(final_block_chance)
-	if(!signal_result)
-		return FALSE
-	if(hit_reaction_chance >= 0)
-		owner.visible_message("<span class='danger'>[owner] blocks [attack_text] with [src]!</span>")
-	return signal_result
+	return FALSE
 
 /obj/item/proc/talk_into(mob/M, input, channel, spans, datum/language/language, list/message_mods)
 	return ITALICS | REDUCE_RANGE

code/game/objects/items/hot_potato.dm

@@ -96,9 +96,9 @@
 	. = ..()
 	if(!adjacent || !ismob(target))
 		return
-	active_forceto(target, user)
+	force_onto(target, user)
 
-/obj/item/hot_potato/proc/active_forceto(mob/living/victim, mob/user)
+/obj/item/hot_potato/proc/force_onto(mob/living/victim, mob/user)
 	if(!istype(victim) || user != loc || victim == user)
 		return FALSE
 	if(!victim.client)

code/modules/projectiles/gun.dm

@@ -21,8 +21,6 @@
 	//trigger guard on the weapon, hulks can't fire them with their big meaty fingers
 	trigger_guard = TRIGGER_GUARD_NORMAL
 
-	bad_type = /obj/item/gun
-
 	///The manufacturer of this weapon. For flavor mostly. If none, this will not show.
 	var/manufacturer = MANUFACTURER_NONE
 

code/modules/projectiles/guns/ballistic.dm

@@ -9,7 +9,6 @@
 	desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason."
 	name = "projectile gun"
 	w_class = WEIGHT_CLASS_NORMAL
-	bad_type = /obj/item/gun/ballistic
 	has_safety = TRUE
 	safety = TRUE
 

shiptest.dme

@@ -583,7 +583,6 @@
 #include "code\datums\components\food\edible.dm"
 #include "code\datums\components\food\food_storage.dm"
 #include "code\datums\components\melee\charged.dm"
-#include "code\datums\components\melee\parry.dm"
 #include "code\datums\components\melee\transforming.dm"
 #include "code\datums\components\melee\twohanded.dm"
 #include "code\datums\components\plumbing\_plumbing.dm"
@@ -1315,7 +1314,6 @@
 #include "code\game\objects\items\implants\implanter.dm"
 #include "code\game\objects\items\implants\implantpad.dm"
 #include "code\game\objects\items\implants\implantuplink.dm"
-#include "code\game\objects\items\melee\bladeatheon.dm"
 #include "code\game\objects\items\melee\chainsaw.dm"
 #include "code\game\objects\items\melee\dualsaber.dm"
 #include "code\game\objects\items\melee\energy.dm"