Conflict resolution

code/__DEFINES/skills.dm

@@ -42,6 +42,8 @@
 #define SKILL_SPEC_DEFAULT 0
 /// Is trained to use specialist gear, but hasn't picked a kit.
 #define SKILL_SPEC_TRAINED 1
+/// Is trained to use specialist gear & HAS picked a kit. (Functionally same as SPEC_ROCKET)
+#define SKILL_SPEC_KITTED 2
 /// Can use RPG
 #define SKILL_SPEC_ROCKET 2
 /// Can use thermal cloaks and custom M4RA rifle

code/__DEFINES/vendors.dm

@@ -67,3 +67,10 @@
 //Whether or not to load ammo boxes depending on ammo loaded into the vendor
 //Only relevant in big vendors, like Requisitions or Squad Prep
 #define VEND_LOAD_AMMO_BOXES (1<<9)
+
+// Redemption Tokens
+#define VEND_TOKEN_ENGINEER "Engineer"
+#define VEND_TOKEN_SPEC "Specialist"
+#define VEND_TOKEN_SYNTH "Synthetic"
+/// Token invalid/unrecognised.
+#define VEND_TOKEN_VOID "Void"

code/controllers/configuration/entries/game_options.dm

@@ -127,3 +127,8 @@
 	min_val = 1
 	config_entry_value = 450
 	integer = TRUE
+
+/datum/config_entry/number/whiskey_required_players
+	min_val = 0
+	config_entry_value = 140
+	integer = TRUE

code/controllers/subsystem/vote.dm

@@ -276,7 +276,8 @@ SUBSYSTEM_DEF(vote)
 					var/datum/game_mode/M = mode_type
 					if(initial(M.config_tag))
 						var/vote_cycle_met = !initial(M.vote_cycle) || (text2num(SSperf_logging?.round?.id) % initial(M.vote_cycle) == 0)
-						if(initial(M.votable) && vote_cycle_met)
+						var/min_players_met = length(GLOB.clients) >= M.required_players
+						if(initial(M.votable) && vote_cycle_met && min_players_met)
 							choices += initial(M.config_tag)
 			if("groundmap")
 				question = "Ground map vote"

code/datums/ammo/misc.dm

@@ -191,7 +191,7 @@
 				for(var/obj/item/reagent_container/food/drinks/cans/souto/S in P.contents)
 					M.put_in_active_hand(S)
 					for(var/mob/O in viewers(GLOB.world_view_size, P)) //find all people in view.
-						O.show_message(SPAN_DANGER("[M] catches the [S]!"), SHOW_MESSAGE_VISIBLE) //Tell them the can was caught.
+						O.show_message(SPAN_DANGER("[M] catches [S]!"), SHOW_MESSAGE_VISIBLE) //Tell them the can was caught.
 					return //Can was caught.
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M

code/datums/components/healing_reduction.dm

@@ -21,33 +21,36 @@ Humans will take continuous damage instead.
 	src.healing_reduction_dissipation = healing_reduction_dissipation
 	src.max_buildup = max_buildup
 
-/datum/component/healing_reduction/InheritComponent(datum/component/healing_reduction/C, i_am_original, healing_reduction)
+/datum/component/healing_reduction/InheritComponent(datum/component/healing_reduction/inherit_component, i_am_original, healing_reduction)
 	. = ..()
-	if(!C)
+	if(!inherit_component)
 		src.healing_reduction += healing_reduction
 	else
-		src.healing_reduction += C.healing_reduction
+		src.healing_reduction += inherit_component.healing_reduction
 
 	src.healing_reduction = min(src.healing_reduction, max_buildup)
 
 /datum/component/healing_reduction/process(delta_time)
 	if(!parent)
 		qdel(src)
-	healing_reduction = max(healing_reduction - healing_reduction_dissipation * delta_time, 0)
+		return
 
-	if(ishuman(parent)) //deals brute to humans
-		var/mob/living/carbon/human/H = parent
-		H.apply_damage(healing_reduction_dissipation * delta_time, BRUTE)
+	healing_reduction = max(healing_reduction - healing_reduction_dissipation * delta_time, 0)
 
 	if(healing_reduction <= 0)
 		qdel(src)
+		return
+
+	if(ishuman(parent)) //deals brute to humans
+		var/mob/living/carbon/human/human_parent = parent
+		human_parent.apply_damage(healing_reduction_dissipation * delta_time, BRUTE)
 
 	var/color = GLOW_COLOR
 	var/intensity = healing_reduction/max_buildup
 	color += num2text(MAX_ALPHA*intensity, 2, 16)
 
-	var/atom/A = parent
-	A.add_filter("healing_reduction", 2, list("type" = "outline", "color" = color, "size" = 1))
+	var/atom/parent_atom = parent
+	parent_atom.add_filter("healing_reduction", 2, list("type" = "outline", "color" = color, "size" = 1))
 
 /datum/component/healing_reduction/RegisterWithParent()
 	START_PROCESSING(SSdcs, src)
@@ -64,14 +67,14 @@ Humans will take continuous damage instead.
 		COMSIG_XENO_ON_HEAL_WOUNDS,
 		COMSIG_XENO_APPEND_TO_STAT
 	))
-	var/atom/A = parent
-	A.remove_filter("healing_reduction")
+	var/atom/parent_atom = parent
+	parent_atom.remove_filter("healing_reduction")
 
-/datum/component/healing_reduction/proc/stat_append(mob/M, list/L)
+/datum/component/healing_reduction/proc/stat_append(mob/target_mob, list/stat_list)
 	SIGNAL_HANDLER
-	L += "Healing Reduction: [healing_reduction]/[max_buildup]"
+	stat_list += "Healing Reduction: [healing_reduction]/[max_buildup]"
 
-/datum/component/healing_reduction/proc/apply_healing_reduction(mob/living/carbon/xenomorph/X, list/healing)
+/datum/component/healing_reduction/proc/apply_healing_reduction(mob/living/carbon/xenomorph/xeno, list/healing)
 	SIGNAL_HANDLER
 	healing["healing"] -= healing_reduction
 

code/datums/emergency_calls/cryo_marines.dm

@@ -50,35 +50,35 @@
 		human.client?.prefs.copy_all_to(human, JOB_SQUAD_LEADER, TRUE, TRUE)
 		arm_equipment(human, /datum/equipment_preset/uscm/leader/cryo, mind == null, TRUE)
 		to_chat(human, role_header("You are a Squad Leader in the USCM"))
-		to_chat(human, role_body("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
-		to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
+		to_chat(human, role_body("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+		to_chat(human, role_header("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 	else if (heavies < max_heavies && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(human.client, JOB_SQUAD_SPECIALIST, time_required_for_job))))
 		heavies++
 		human.client?.prefs.copy_all_to(human, JOB_SQUAD_SPECIALIST, TRUE, TRUE)
 		arm_equipment(human, /datum/equipment_preset/uscm/spec/cryo,  mind == null, TRUE)
 		to_chat(human, role_header("You are a Weapons Specialist in the USCM"))
-		to_chat(human, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
-		to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
+		to_chat(human, role_body("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+		to_chat(human, role_header("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 	else if (medics < max_medics && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(human.client, JOB_SQUAD_MEDIC, time_required_for_job))))
 		medics++
 		human.client?.prefs.copy_all_to(human, JOB_SQUAD_MEDIC, TRUE, TRUE)
 		arm_equipment(human, /datum/equipment_preset/uscm/medic/cryo,  mind == null, TRUE)
 		to_chat(human, role_header("You are a Hospital Corpsman in the USCM"))
-		to_chat(human, role_body("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
-		to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
+		to_chat(human, role_body("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+		to_chat(human, role_header("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 	else if (engineers < max_engineers && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(human.client, JOB_SQUAD_ENGI, time_required_for_job))))
 		engineers++
 		human.client?.prefs.copy_all_to(human, JOB_SQUAD_ENGI, TRUE, TRUE)
 		arm_equipment(human, /datum/equipment_preset/uscm/engineer/cryo,  mind == null, TRUE)
 		to_chat(human, role_header("You are an Engineer in the USCM"))
-		to_chat(human, role_body("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
-		to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
+		to_chat(human, role_body("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+		to_chat(human, role_header("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 	else
 		human.client?.prefs.copy_all_to(human, JOB_SQUAD_MARINE, TRUE, TRUE)
 		arm_equipment(human, /datum/equipment_preset/uscm/pfc/cryo,  mind == null, TRUE)
 		to_chat(human, role_header("You are a Rifleman in the USCM"))
-		to_chat(human, role_body("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
-		to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
+		to_chat(human, role_body("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+		to_chat(human, role_header("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 
 	sleep(10)
 	if(!mind)

code/datums/emergency_calls/cryo_marines_heavy.dm

@@ -41,32 +41,31 @@
 		leaders++
 		arm_equipment(H, /datum/equipment_preset/uscm/leader_equipped/cryo, TRUE, TRUE)
 		to_chat(H, role_header("You are a Squad Leader in the USCM"))
-		to_chat(H, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(H, role_body("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else if (heavies < max_heavies && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(H.client, JOB_SQUAD_SPECIALIST, time_required_for_job))
 		heavies++
 		arm_equipment(H, /datum/equipment_preset/uscm/specialist_equipped/cryo, TRUE, TRUE)
 		to_chat(H, role_header("You are a Weapons Specialist in the USCM"))
-		to_chat(H, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(H, role_body("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else if(smartgunners < max_smartgunners && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
 		smartgunners++
 		arm_equipment(H, /datum/equipment_preset/uscm/smartgunner_equipped/cryo, TRUE, TRUE)
 		to_chat(H, role_header("You are a Smartgunner in the USCM"))
-		to_chat(H, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(H, role_body("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else if(engineers < max_engineers && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(H.client, JOB_SQUAD_ENGI, time_required_for_job))
 		engineers++
 		arm_equipment(H, /datum/equipment_preset/uscm/engineer_equipped/cryo, TRUE, TRUE)
 		to_chat(H, role_header("You are an Engineer in the USCM"))
-		to_chat(H, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(H, role_body("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else if (medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job))
 		medics++
 		arm_equipment(H, /datum/equipment_preset/uscm/medic_equipped/cryo, TRUE, TRUE)
 		to_chat(H, role_header("You are a Hospital Corpsman in the USCM"))
-		to_chat(H, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(H, role_body("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else
 		arm_equipment(H, /datum/equipment_preset/uscm/private_equipped/cryo, TRUE, TRUE)
 		to_chat(H, role_header("You are a Rifleman in the USCM"))
-		to_chat(H, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
-
+		to_chat(H, role_body("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	sleep(1 SECONDS)
 	to_chat(H, role_header("Your objectives are:"))
 	to_chat(H, role_body("[objectives]"))

code/datums/emergency_calls/cryo_spec.dm

@@ -34,8 +34,8 @@
 	human.client?.prefs.copy_all_to(human, JOB_SQUAD_SPECIALIST, TRUE, TRUE)
 	arm_equipment(human, /datum/equipment_preset/uscm/spec/cryo,  mind == null, TRUE)
 	to_chat(human, role_header("You are a Weapons Specialist in the USCM"))
-	to_chat(human, role_body("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
-	to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
+	to_chat(human, role_body("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+	to_chat(human, role_header("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 
 	sleep(10)
 	if(!mind)

code/datums/emergency_calls/tank_crew.dm

@@ -24,12 +24,11 @@
 	sleep(5)
 	arm_equipment(H, /datum/equipment_preset/uscm/tank/full, TRUE, TRUE)
 	to_chat(H, role_header("You are a Vehicle Crewman in the USCM"))
-	to_chat(H, role_body("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
-	to_chat(H, role_header("<big>If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced.</big>"))
+	to_chat(H, role_body("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+	to_chat(H, role_header("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 
 	sleep(1 SECONDS)
 	to_chat(H, role_header("Your objectives are:"))
 	to_chat(H, role_body("[objectives]"))
 
 	GLOB.data_core.manifest_inject(H) //Put people in crew manifest
-

code/datums/emergency_calls/whiskey_outpost.dm

@@ -28,23 +28,23 @@
 	if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))
 		leader = mob
 		arm_equipment(mob, /datum/equipment_preset/dust_raider/leader, TRUE, TRUE)
-		to_chat(mob, SPAN_BOLDNOTICE("You are a Squad Leader in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(mob, SPAN_BOLDNOTICE("You are a Squad Leader in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else if (heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST, time_required_for_job))
 		heavies++
 		arm_equipment(mob, /datum/equipment_preset/dust_raider/specialist, TRUE, TRUE)
-		to_chat(mob, SPAN_BOLDNOTICE("You are a Specialist in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(mob, SPAN_BOLDNOTICE("You are a Specialist in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else if(smartgunners < max_smartgunners && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(mob.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
 		smartgunners++
 		arm_equipment(mob, /datum/equipment_preset/dust_raider/smartgunner, TRUE, TRUE)
-		to_chat(mob, SPAN_BOLDNOTICE("You are a Smartgunner in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(mob, SPAN_BOLDNOTICE("You are a Smartgunner in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else if(engineers < max_engineers && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(mob.client, JOB_SQUAD_ENGI, time_required_for_job))
 		engineers++
 		arm_equipment(mob, /datum/equipment_preset/dust_raider/engineer, TRUE, TRUE)
-		to_chat(mob, SPAN_BOLDNOTICE("You are an Engineer in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(mob, SPAN_BOLDNOTICE("You are an Engineer in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else if (medics < max_medics && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(mob.client, JOB_SQUAD_MEDIC, time_required_for_job))
 		medics++
 		arm_equipment(mob, /datum/equipment_preset/dust_raider/medic, TRUE, TRUE)
-		to_chat(mob, SPAN_BOLDNOTICE("You are a Hospital Corpsman in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+		to_chat(mob, SPAN_BOLDNOTICE("You are a Hospital Corpsman in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
 	else
 		arm_equipment(mob, /datum/equipment_preset/dust_raider/private, TRUE, TRUE)
 		to_chat(mob, SPAN_BOLDNOTICE("You are a Rifleman in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))

code/datums/helper_datums/teleport.dm

@@ -166,15 +166,15 @@
 
 /datum/teleport/instant/science/teleportChecks()
 	if(istype(teleatom, /obj/item/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
-		teleatom.visible_message(SPAN_DANGER("<B>The [teleatom] bounces off of the portal!</B>"))
+		teleatom.visible_message(SPAN_DANGER("<B>[teleatom] bounces off of the portal!</B>"))
 		return 0
 
 	if(length(teleatom.search_contents_for(/obj/item/disk/nuclear)))
 		if(istype(teleatom, /mob/living))
 			var/mob/living/MM = teleatom
-			MM.visible_message(SPAN_DANGER("<B>The [MM] bounces off of the portal!</B>"),SPAN_DANGER("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
+			MM.visible_message(SPAN_DANGER("<B>[MM] bounces off of the portal!</B>"),SPAN_DANGER("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
 		else
-			teleatom.visible_message(SPAN_DANGER("<B>The [teleatom] bounces off of the portal!</B>"))
+			teleatom.visible_message(SPAN_DANGER("<B>[teleatom] bounces off of the portal!</B>"))
 		return 0
 
 	if(is_admin_level(destination.z))

code/datums/supply_packs/operations.dm

@@ -112,10 +112,10 @@
 /datum/supply_packs/spec_kits
 	name = "Weapons Specialist Kits"
 	contains = list(
-		/obj/item/spec_kit/asrs,
-		/obj/item/spec_kit/asrs,
-		/obj/item/spec_kit/asrs,
-		/obj/item/spec_kit/asrs,
+		/obj/item/spec_kit/rifleman,
+		/obj/item/spec_kit/rifleman,
+		/obj/item/spec_kit/rifleman,
+		/obj/item/spec_kit/rifleman,
 	)
 	cost = 0
 	containertype = /obj/structure/closet/crate/supply

code/game/gamemodes/colonialmarines/whiskey_outpost.dm

@@ -9,7 +9,7 @@
 /datum/game_mode/whiskey_outpost
 	name = GAMEMODE_WHISKEY_OUTPOST
 	config_tag = GAMEMODE_WHISKEY_OUTPOST
-	required_players = 0
+	required_players = 140
 	xeno_bypass_timer = 1
 	flags_round_type = MODE_NEW_SPAWN
 	role_mappings = list(
@@ -76,10 +76,14 @@
 	hardcore = TRUE
 
 	votable = TRUE
-	vote_cycle = 25 // approx. once every 5 days, if it wins the vote
+	vote_cycle = 75 // approx. once every 5 days, if it wins the vote
 
 	taskbar_icon = 'icons/taskbar/gml_wo.png'
 
+/datum/game_mode/whiskey_outpost/New()
+	. = ..()
+	required_players = CONFIG_GET(number/whiskey_required_players)
+
 /datum/game_mode/whiskey_outpost/get_roles_list()
 	return GLOB.ROLES_WO
 

code/game/machinery/atmoalter/canister.dm

@@ -98,7 +98,7 @@ update_flag
 
 /obj/structure/machinery/portable_atmospherics/canister/attackby(obj/item/W as obj, mob/user as mob)
 	if(!HAS_TRAIT(W, TRAIT_TOOL_WRENCH) && !istype(W, /obj/item/tank) && !istype(W, /obj/item/device/analyzer))
-		visible_message(SPAN_DANGER("[user] hits the [src] with a [W]!"))
+		visible_message(SPAN_DANGER("[user] hits [src] with [W]!"))
 		update_health(W.force)
 		src.add_fingerprint(user)
 	..()