TGS Test Merge (#21883)

Author: Yogbot-13

code/__DEFINES/combat.dm

@@ -66,6 +66,16 @@
 #define EFFECT_DROWSY		"drowsy"
 #define EFFECT_JITTER		"jitter"
 
+/// Alternate attack defines. Return these at the end of procs like afterattack_secondary.
+/// Calls the normal attack proc. For example, if returned in afterattack_secondary, will call afterattack.
+
+/// Will continue the chain depending on the return value of the non-alternate proc, like with normal attacks.
+#define SECONDARY_ATTACK_CALL_NORMAL 1
+/// Cancels the attack chain entirely.
+#define SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN 2
+/// Proceed with the attack chain, but don't call the normal methods.
+#define SECONDARY_ATTACK_CONTINUE_CHAIN 3
+
 //Bitflags defining which status effects could be or are inflicted on a mob
 #define CANSTUN			(1<<0)
 #define CANKNOCKDOWN	(1<<1)
@@ -129,16 +139,6 @@
 #define ATTACK_EFFECT_MECHTOXIN	"mech_toxin"
 #define ATTACK_EFFECT_BOOP		"boop" //Honk
 
-//intent defines
-#define INTENT_HELP   "help"
-#define INTENT_GRAB   "grab"
-#define INTENT_DISARM "disarm"
-#define INTENT_HARM   "harm"
-//NOTE: INTENT_HOTKEY_* defines are not actual intents!
-//they are here to support hotkeys
-#define INTENT_HOTKEY_LEFT  "left"
-#define INTENT_HOTKEY_RIGHT "right"
-
 //the define for visible message range in combat
 #define COMBAT_MESSAGE_RANGE 3
 #define DEFAULT_MESSAGE_RANGE 7

code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm

@@ -43,6 +43,10 @@
 #define COMSIG_ATOM_DIR_CHANGE "atom_dir_change"
 ///from base of atom/setDir(): (old_dir, new_dir). Called after the direction changes.
 #define COMSIG_ATOM_POST_DIR_CHANGE "atom_dir_change"
+///from base of atom/movable/keybind_face_direction(): (dir). Called before turning with the movement lock key.
+#define COMSIG_MOVABLE_KEYBIND_FACE_DIR "keybind_face_dir"
+	///ignores the movement lock key, used for turning while strafing in a mech
+	#define COMSIG_IGNORE_MOVEMENT_LOCK (1<<0)
 ///from base of atom/setShift(): (dir). Called before the shift changes.
 #define COMSIG_ATOM_SHIFT_CHANGE "atom_shift_change"
 /// from /datum/component/singularity/proc/can_move(), as well as /obj/energy_ball/proc/can_move()

code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm

@@ -129,6 +129,9 @@
 #define COMSIG_MOB_SWAP_HANDS "mob_swap_hands"
 ///from base of /mob/verb/pointed: (atom/A)
 #define COMSIG_MOB_POINTED "mob_pointed"
+///from base of /mob/living/start_pulling: (atom/movable/AM, state, force)
+#define COMSIG_MOB_PULL "mob_pull"
+	#define COMPONENT_BLOCK_PULL (1<<0) // blocks pulling
 ///Mob is trying to open the wires of a target [/atom], from /datum/wires/interactable(): (atom/target)
 #define COMSIG_TRY_WIRES_INTERACT "try_wires_interact"
 	#define COMPONENT_CANT_INTERACT_WIRES (1<<0)

code/__DEFINES/hud.dm

@@ -97,6 +97,7 @@
 #define ui_above_intent "EAST-3:24, SOUTH+1:7"
 #define ui_movi "EAST-2:26,SOUTH:5"
 #define ui_acti "EAST-3:24,SOUTH:5"
+#define ui_combat_toggle "EAST-3:24,SOUTH:5"
 #define ui_zonesel "EAST-1:28,SOUTH:5"
 #define ui_acti_alt "EAST-1:28,SOUTH:5"	//alternative intent switcher for when the interface is hidden (F12)
 #define ui_crafting	"EAST-4:22,SOUTH:5"

code/__DEFINES/misc.dm

@@ -304,9 +304,6 @@ GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_C
 
 #define MAX_PROC_DEPTH 195 // 200 proc calls deep and shit breaks, this is a bit lower to give some safety room
 
-#define SYRINGE_DRAW 0
-#define SYRINGE_INJECT 1
-
 //gold slime core spawning
 #define NO_SPAWN 0
 #define HOSTILE_SPAWN 1

code/__DEFINES/monkeys.dm

@@ -24,8 +24,7 @@
 #define MONKEY_RECRUIT_PROB 				25		// recruit a monkey near it
 #define MONKEY_SWITCH_TARGET_PROB 			25		// switch targets if it sees another enemy
 
-#define MONKEY_RETALIATE_HARM_PROB 			95	// probability for the monkey to aggro when attacked with harm intent
-#define MONKEY_RETALIATE_DISARM_PROB 		20 	// probability for the monkey to aggro when attacked with disarm intent
+#define MONKEY_RETALIATE_PROB 		85 	// probability for the monkey to aggro when attacked
 
 #define MONKEY_HATRED_AMOUNT 				4	// amount of aggro to add to an enemy when they attack user
 #define MONKEY_HATRED_REDUCTION_PROB 		25	// probability of reducing aggro by one when the monkey attacks

code/__DEFINES/preferences.dm

@@ -11,7 +11,7 @@
 #define MIDROUND_ANTAG				(1<<6)
 #define SOUND_INSTRUMENTS			(1<<7)
 #define SOUND_SHIP_AMBIENCE			(1<<8)
-#define SOUND_PRAYER_N_FAX				(1<<9)
+#define SOUND_PRAYER_N_FAX			(1<<9)
 #define ANNOUNCE_LOGIN				(1<<10)
 #define SOUND_ANNOUNCEMENTS			(1<<11)
 #define DISABLE_DEATHRATTLE			(1<<12)

code/__DEFINES/traits/declarations.dm

@@ -73,6 +73,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_IGNOREDAMAGESLOWDOWN "ignoredamageslowdown"
 /// Makes it so the mob can use guns regardless of tool user status
 #define TRAIT_GUN_NATURAL "gunnatural"
+/// Can't hold people up with guns, for whatever reason
+#define TRAIT_NO_HOLDUP "no_holdup"
 /// Causes death-like unconsciousness
 #define TRAIT_DEATHCOMA "deathcoma"
 /// The mob has the stasis effect.

code/_onclick/ai.dm

@@ -77,20 +77,20 @@
 		set_waypoint(A)
 		return
 
-	A.attack_ai(src)
+	A.attack_ai(src, modifiers)
 
 /*
 	AI has no need for the UnarmedAttack() and RangedAttack() procs,
 	because the AI code is not generic;	attack_ai() is used instead.
 	The below is only really for safety, or you can alter the way
 	it functions and re-insert it above.
 */
-/mob/living/silicon/ai/UnarmedAttack(atom/A)
-	A.attack_ai(src)
-/mob/living/silicon/ai/RangedAttack(atom/A)
-	A.attack_ai(src)
+/mob/living/silicon/ai/UnarmedAttack(atom/A, proximity, modifiers)
+	A.attack_ai(src, modifiers)
+/mob/living/silicon/ai/RangedAttack(atom/A, proximity, modifiers)
+	A.attack_ai(src, modifiers)
 
-/atom/proc/attack_ai(mob/user)
+/atom/proc/attack_ai(mob/user, modifiers)
 	return
 
 /*

code/_onclick/click.dm

@@ -118,7 +118,7 @@
 
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		changeNext_move(CLICK_CD_HANDCUFFED)   //Doing shit in cuffs shall be vey slow
-		UnarmedAttack(A, FALSE)
+		UnarmedAttack(A, FALSE, modifiers)
 		return
 
 	if(in_throw_mode)
@@ -128,7 +128,8 @@
 	var/obj/item/W = get_active_held_item()
 
 	if(W == A)
-		W.attack_self(src)
+		if(!(LAZYACCESS(modifiers, RIGHT_CLICK) && W.attack_self_secondary(src, modifiers) != SECONDARY_ATTACK_CALL_NORMAL))
+			W.attack_self(src, modifiers)
 		update_inv_hands()
 		return
 
@@ -140,7 +141,7 @@
 		else
 			if(ismob(A))
 				changeNext_move(CLICK_CD_MELEE)
-			UnarmedAttack(A)
+			UnarmedAttack(A, FALSE, modifiers)
 		return
 
 	//Can't reach anything else in lockers or other weirdness
@@ -154,10 +155,11 @@
 		else
 			if(ismob(A))
 				changeNext_move(CLICK_CD_MELEE)
-			UnarmedAttack(A,1)
+			UnarmedAttack(A, TRUE, modifiers)
 	else
 		if(W)
-			W.afterattack(A,src,0,params)
+			if(!(LAZYACCESS(modifiers, RIGHT_CLICK) && W.afterattack_secondary(A, src, FALSE, params) != SECONDARY_ATTACK_CALL_NORMAL))
+				W.afterattack(A, src, FALSE, params)
 		else
 			RangedAttack(A,params)
 
@@ -261,7 +263,7 @@
 	proximity_flag is not currently passed to attack_hand, and is instead used
 	in human click code to allow glove touches only at melee range.
 */
-/mob/proc/UnarmedAttack(atom/A, proximity_flag)
+/mob/proc/UnarmedAttack(atom/A, proximity_flag, modifiers)
 	if(ismob(A))
 		changeNext_move(CLICK_CD_MELEE)
 	return