things

Author: SapphicOverload

code/_onclick/item_attack.dm

@@ -160,32 +160,32 @@
  * Called from [/mob/living/proc/attackby]
  *
  * Arguments:
- * * mob/living/M - The mob being hit by this item
+ * * mob/living/target - The mob being hit by this item
  * * mob/living/user - The mob hitting with this item
  * * params - Click params of this attack
  */
-/obj/item/proc/attack(mob/living/M, mob/living/user, params)
-	var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user, params)
+/obj/item/proc/attack(mob/living/target, mob/living/user, params)
+	var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, target, user, params)
 	if(signal_return & COMPONENT_CANCEL_ATTACK_CHAIN)
 		return TRUE
 	if(signal_return & COMPONENT_SKIP_ATTACK)
 		return
 
-	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user, params)
+	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, target, user, params)
 	if(item_flags & NOBLUDGEON)
 		return
 
 	if(tool_behaviour && !user.combat_mode) // checks for combat mode with surgery tool
 		var/list/modifiers = params2list(params)
-		if(attempt_initiate_surgery(src, M, user, modifiers))
+		if(attempt_initiate_surgery(src, target, user, modifiers))
 			return TRUE
-		if(iscarbon(M))
-			var/mob/living/carbon/C = M
+		if(iscarbon(target))
+			var/mob/living/carbon/C = target
 			for(var/i in C.all_wounds)
 				var/datum/wound/W = i
 				if(W.try_treating(src, user))
 					return TRUE
-		to_chat(user, span_warning("You can't perform any surgeries on [M]'s [parse_zone(user.zone_selected)]!")) //yells at you
+		to_chat(user, span_warning("You can't perform any surgeries on [target]'s [parse_zone(user.zone_selected)]!")) //yells at you
 		return TRUE
 
 	if(force && !synth_check(user, SYNTH_ORGANIC_HARM))
@@ -199,16 +199,17 @@
 	else if(hitsound)
 		playsound(loc, hitsound, get_clamped_volume(), 1, -1)
 
-	M.lastattacker = user.real_name
-	M.lastattackerckey = user.ckey
+	target.lastattacker = user.real_name
+	target.lastattackerckey = user.ckey
 
 	if(force)
-		M.last_damage = name
+		target.last_damage = name
 
-	user.do_attack_animation(M)
-	M.attacked_by(src, user)
+	user.do_attack_animation(target)
+	user.add_exp(SKILL_FITNESS, target.stat == CONSCIOUS ? force : force / 5) // attacking things that can't move isn't very good experience
+	target.attacked_by(src, user)
 
-	log_combat(user, M, "attacked", src.name, "(COMBAT MODE: [user.combat_mode ? "ON" : "OFF"]) (DAMTYPE: [uppertext(damtype)])")
+	log_combat(user, target, "attacked", src.name, "(COMBAT MODE: [user.combat_mode ? "ON" : "OFF"]) (DAMTYPE: [uppertext(damtype)])")
 	add_fingerprint(user)
 	var/force_multiplier = 1
 	if(ishuman(user))
@@ -233,6 +234,7 @@
 	user.changeNext_move(CLICK_CD_MELEE * weapon_stats[SWING_SPEED] * (range_cooldown_mod ? (dist > 0 ? min(dist, weapon_stats[REACH]) * range_cooldown_mod : range_cooldown_mod) : 1)) //range increases attack cooldown by swing speed
 	user.do_attack_animation(attacked_atom)
 	attacked_atom.attacked_by(src, user)
+	user.add_exp(SKILL_FITNESS, force / 5)
 	user.weapon_slow(src)
 	var/force_multiplier = 1
 	if(ishuman(user))

code/datums/components/blocking.dm

@@ -220,7 +220,7 @@
 		if(!blocking_component.can_block(defender, incoming, damage, attack_type))
 			return 0
 		force_returned = blocking_component.block_force
-	if(attack_type & MELEE_ATTACK) // being stronger provides a small increase to melee blocking
+	if(attack_type & (MELEE_ATTACK|UNARMED_ATTACK|THROWN_PROJECTILE_ATTACK|LEAP_ATTACK)) // being stronger provides a small increase to melee blocking
 		force_returned += defender.get_skill(SKILL_FITNESS)
 	if(HAS_TRAIT(weapon, TRAIT_PARRYING))
 		force_returned *= PARRY_BONUS

code/datums/mind.dm

@@ -855,7 +855,7 @@
 	mind.skills[skill] = clamp(mind.skills[skill] + amount, min_skill, max_skill)
 
 /// Checks if the mob's skill level meets a given threshold.
-/mob/proc/skill_check(skill, amount, inclusive = FALSE)
+/mob/proc/skill_check(skill, amount)
 	if(!mind)
 		return FALSE
 	return (mind.skills[skill] >= amount)

code/game/machinery/computer/dna_console.dm

@@ -423,7 +423,7 @@
 			if(!(scanner_occupant == connected_scanner.occupant))
 				return
 
-			check_discovery(params["alias"])
+			check_discovery(params["alias"], usr)
 			return
 
 		// Check all mutations of the occupant and check if any are discovered.
@@ -445,7 +445,7 @@
 			// Go over all standard mutations and check if they've been discovered.
 			for(var/mutation_type in scanner_occupant.dna.mutation_index)
 				var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation_type)
-				check_discovery(HM.alias)
+				check_discovery(HM.alias, usr)
 
 			return
 
@@ -521,7 +521,7 @@
 				return
 
 			// Check if we cracked a mutation
-			check_discovery(alias)
+			check_discovery(alias, usr)
 
 			return
 
@@ -1908,7 +1908,7 @@
 	* Arguments:
   * * alias - Alias of the mutation to check (ie "Mutation 51" or "Mutation 12")
   */
-/obj/machinery/computer/scan_consolenew/proc/check_discovery(alias)
+/obj/machinery/computer/scan_consolenew/proc/check_discovery(alias, mob/user)
 	// Note - All code paths that call this have already done checks on the
 	//  current occupant to prevent cheese and other abuses. If you call this
 	//  proc please also do the following checks first:
@@ -1933,6 +1933,7 @@
 		var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(path)
 		stored_research.discovered_mutations += path
 		say("Successfully discovered [HM.name].")
+		user.add_exp(SKILL_SCIENCE, EXPERIENCE_PER_LEVEL / 2)
 		return TRUE
 
 	return FALSE

code/game/objects/items/shooting_range.dm

@@ -25,6 +25,12 @@
 	if(pinnedLoc)
 		pinnedLoc.forceMove(loc)
 
+/obj/item/target/bullet_act(obj/projectile/P)
+	. = ..()
+	if(iscarbon(P.firer)) // gain a bit of experience from shooting targets, based on distance
+		var/mob/shooter = P.firer
+		shooter.add_exp(SKILL_FITNESS, max(initial(P.range) - P.range, 1) * 2)
+
 /obj/item/target/welder_act(mob/living/user, obj/item/I)
 	if(I.use_tool(src, user, 0, volume=40))
 		removeOverlays()

code/modules/jobs/job_types/detective.dm

@@ -31,7 +31,7 @@
 		SKILL_MECHANICAL = EXP_NONE,
 		SKILL_TECHNICAL = EXP_NONE,
 		SKILL_SCIENCE = EXP_MID,
-		SKILL_FITNESS = EXP_LOW,
+		SKILL_FITNESS = EXP_MID,
 	)
 	skill_points = 2
 

code/modules/mining/lavaland/ruins/gym.dm

@@ -52,6 +52,7 @@
 		user.pixel_y = 0
 		var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!")
 		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise)
+		user.add_exp(SKILL_FITNESS, 100)
 		icon_state = initial(icon_state)
 		to_chat(user, finishmessage)
 		user.apply_status_effect(STATUS_EFFECT_EXERCISED)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -27,7 +27,7 @@
 			protection += cover.armor.getRating(armor_flag) * 0.5
 	protection += physiology.armor.getRating(armor_flag)
 	if(armor_flag == MELEE)
-		protection = 100 - ((100 - protection) * (20 - get_skill(SKILL_FITNESS)) / 20) // 16% multiplicative armor at EXP_MASTER
+		protection = 100 - ((100 - protection) * (50 - get_skill(SKILL_FITNESS)) / 50) // 8% multiplicative armor at EXP_MASTER
 	return protection
 
 ///Get all the clothing on a specific body part
@@ -88,6 +88,10 @@
 		if(shield_check & SHIELD_BLOCK)
 			P.on_hit(src, 100, def_zone)
 			return BULLET_ACT_HIT
+		
+		if(iscarbon(P.firer) && stat == CONSCIOUS) // gain experience from shooting people, more if they were far away and less if it wasn't a real gun
+			var/mob/shooter = P.firer
+			shooter.add_exp(SKILL_FITNESS, max(initial(P.range) - P.range, 1) * ((P.nodamage || !P.damage) ? 2 : 5))
 
 	return ..(P, def_zone)
 

code/modules/research/rdconsole.dm

@@ -168,6 +168,7 @@ Nothing else in the console has ID requirements.
 			SSblackbox.record_feedback("associative", "science_techweb_unlock", 1, list("id" = "[id]", "name" = TN.display_name, "price" = "[json_encode(price)]", "time" = SQLtime()))
 		if(stored_research.research_node_id(id))
 			say("Successfully researched [TN.display_name].")
+			user.add_exp(SKILL_SCIENCE, price / 200)
 			var/logname = "Unknown"
 			if(isAI(user))
 				logname = "AI: [user.name]"