Caltrop stab check & GUNFLIP trait removal (#1198)

* Removes the GUNFLIP trait

* Switches caltrop check

From checking if a user can feel pain to seeing if their leg is robotic. Feeling pain does not protect you from a sharp object.

---------

Co-authored-by: Sym <[email protected]>

Author: MisterGrimm

code/__DEFINES/traits.dm

@@ -352,7 +352,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// always detect storm weathers
 #define TRAIT_DETECT_STORM "detect_storm"
 #define TRAIT_PRIMITIVE "primitive"
-#define TRAIT_GUNFLIP "gunflip"
 /// Increases chance of getting special traumas, makes them harder to cure
 #define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost"
 #define TRAIT_SPACEWALK "spacewalk"

code/_globalvars/traits.dm

@@ -117,7 +117,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_XENO_IMMUNE" = TRAIT_XENO_IMMUNE,
 		"TRAIT_NAIVE" = TRAIT_NAIVE,
 		"TRAIT_PRIMITIVE" = TRAIT_PRIMITIVE, //unable to use mechs. Given to Ash Walkers
-		"TRAIT_GUNFLIP" = TRAIT_GUNFLIP,
 		"TRAIT_SPECIAL_TRAUMA_BOOST" = TRAIT_SPECIAL_TRAUMA_BOOST,
 		"TRAIT_SPACEWALK" = TRAIT_SPACEWALK,
 		"TRAIT_GAMERGOD" = TRAIT_GAMERGOD,

code/datums/components/caltrop.dm

@@ -91,7 +91,7 @@
 	if(!istype(O))
 		return
 
-	if(O.bodypart_flags & BP_NO_PAIN)
+	if(O.bodytype & BODYTYPE_ROBOTIC)
 		return
 
 	if (!(flags & CALTROP_BYPASS_SHOES))

code/game/objects/items/storage/holster_items.dm

@@ -3,15 +3,6 @@
 	w_class = WEIGHT_CLASS_BULKY
 	storage_type = /datum/storage/holster
 
-/obj/item/storage/belt/holster/equipped(mob/user, slot, initial)
-	. = ..()
-	if(slot == ITEM_SLOT_BELT || ITEM_SLOT_SUITSTORE)
-		ADD_TRAIT(user, TRAIT_GUNFLIP, CLOTHING_TRAIT)
-
-/obj/item/storage/belt/holster/unequipped(mob/user, silent)
-	. = ..()
-	REMOVE_TRAIT(user, TRAIT_GUNFLIP, CLOTHING_TRAIT)
-
 /// Detective's shoulder holster.
 /obj/item/storage/belt/holster/shoulder
 	name = "revolver shoulder holster"

code/modules/projectiles/guns/ballistic.dm

@@ -472,20 +472,6 @@
 	unload(user)
 
 /obj/item/gun/ballistic/attack_self(mob/living/user)
-	if(HAS_TRAIT(user, TRAIT_GUNFLIP))
-		SpinAnimation(4,2)
-		if(flip_cooldown <= world.time)
-			if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
-				to_chat(user, span_userdanger("While trying to flip [src] you pull the trigger and accidentally shoot yourself!"))
-				do_fire_gun(user, user, FALSE, user.get_random_valid_zone(even_weights = TRUE))
-				user.dropItemToGround(src, TRUE)
-				return
-
-			flip_cooldown = (world.time + 30)
-			user.visible_message(span_notice("[user] spins [src] around [user.p_their()] finger by the trigger. That’s pretty badass."))
-			playsound(src, 'sound/items/handling/ammobox_pickup.ogg', 20, FALSE)
-			return
-
 	// They need two hands on the gun, or a free hand in general.
 	if(!one_hand_rack && !(wielded || user.get_empty_held_index()))
 		to_chat(user, span_warning("You need a free hand to do that!"))