more stuff

Author: SapphicOverload

code/__DEFINES/tools.dm

@@ -3,6 +3,7 @@
 #define TOOL_MULTITOOL 		"multitool"
 #define TOOL_SCREWDRIVER 	"screwdriver"
 #define TOOL_WIRECUTTER 	"wirecutter"
+#define TOOL_WIRING			"wiring"
 #define TOOL_WRENCH 		"wrench"
 #define TOOL_WELDER 		"welder"
 #define TOOL_ANALYZER		"analyzer"

code/datums/wires/_wires.dm

@@ -4,7 +4,7 @@
 	if(!I)
 		return
 
-	if(I.tool_behaviour == TOOL_WIRECUTTER || I.tool_behaviour == TOOL_MULTITOOL)
+	if(I.tool_behaviour == TOOL_WIRECUTTER || I.tool_behaviour == TOOL_MULTITOOL || I.tool_behaviour == TOOL_WIRING)
 		return TRUE
 	if(istype(I, /obj/item/assembly))
 		var/obj/item/assembly/A = I
@@ -308,7 +308,7 @@
 	var/obj/item/I
 	switch(action)
 		if("cut")
-			I = L.is_holding_tool_quality(TOOL_WIRECUTTER)
+			I = (L.is_holding_tool_quality(TOOL_WIRECUTTER) || (L.is_holding_tool_quality(TOOL_WIRING) && is_cut(target_wire)))
 			if(I || IsAdminGhost(usr))
 				if(I && holder)
 					I.play_tool_sound(holder, 20)

code/game/objects/structures/ghost_role_spawners.dm

@@ -190,6 +190,14 @@
 	var/has_owner = FALSE
 	var/can_transfer = TRUE //if golems can switch bodies to this new shell
 	var/mob/living/owner = null //golem's owner if it has one
+	base_skills = list(
+		SKILL_PHYSIOLOGY = EXP_NONE,
+		SKILL_MECHANICAL = EXP_NONE,
+		SKILL_TECHNICAL = EXP_NONE,
+		SKILL_SCIENCE = EXP_LOW,
+		SKILL_FITNESS = EXP_NONE,
+	)
+	skill_points = EXP_GENIUS
 	short_desc = "You are a Free Golem. Your family worships The Liberator."
 	flavour_text = "In his infinite and divine wisdom, he set your clan free to \
 	travel the stars with a single declaration: \"Yeah go do whatever.\" Though you are bound to the one who created you, it is customary in your society to repeat those same words to newborn \
@@ -298,6 +306,14 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
 	icon = 'icons/obj/lavaland/spawners.dmi'
 	icon_state = "cryostasis_sleeper"
 	outfit = /datum/outfit/hermit
+	base_skills = list(
+		SKILL_PHYSIOLOGY = EXP_NONE,
+		SKILL_MECHANICAL = EXP_NONE,
+		SKILL_TECHNICAL = EXP_NONE,
+		SKILL_SCIENCE = EXP_NONE,
+		SKILL_FITNESS = EXP_NONE,
+	)
+	skill_points = EXP_MASTER
 	roundstart = FALSE
 	death = FALSE
 	random = TRUE
@@ -317,22 +333,26 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
 			only one pod left when you got to the escape bay. You took it and launched it alone, and the crowd of terrified faces crowding at the airlock door as your pod's engines burst to \
 			life and sent you to this hell are forever branded into your memory."
 			outfit.uniform = /obj/item/clothing/under/rank/civilian/assistantformal
+			base_skills[SKILL_MECHANICAL] = EXP_MID
 		if(2)
 			flavour_text += "you're an exile from the Tiger Cooperative. Their technological fanaticism drove you to question the power and beliefs of the Exolitics, and they saw you as a \
 			heretic and subjected you to hours of horrible torture. You were hours away from execution when a high-ranking friend of yours in the Cooperative managed to secure you a pod, \
 			scrambled its destination's coordinates, and launched it. You awoke from stasis when you landed and have been surviving - barely - ever since."
 			outfit.uniform = /obj/item/clothing/under/rank/prisoner
 			outfit.shoes = /obj/item/clothing/shoes/sneakers/orange
+			base_skills[SKILL_TECHNICAL] = EXP_MID
 		if(3)
 			flavour_text += "you were a doctor on one of Nanotrasen's space stations, but you left behind that damn corporation's tyranny and everything it stood for. From a metaphorical hell \
 			to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there."
 			outfit.uniform = /obj/item/clothing/under/rank/medical
 			outfit.suit = /obj/item/clothing/suit/toggle/labcoat
 			outfit.back = /obj/item/storage/backpack/medic
+			base_skills[SKILL_PHYSIOLOGY] = EXP_MID
 		if(4)
 			flavour_text += "you were always joked about by your friends for \"not playing with a full deck\", as they so kindly put it. It seems that they were right when you, on a tour \
 			at one of Nanotrasen's state-of-the-art research facilities, were in one of the escape pods alone and saw the red button. It was big and shiny, and it caught your eye. You pressed \
 			it, and after a terrifying and fast ride for days, you landed here. You've had time to wisen up since then, and you think that your old friends wouldn't be laughing now."
+			base_skills[SKILL_FITNESS] = EXP_MID
 
 /obj/effect/mob_spawn/human/hermit/Destroy()
 	new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
@@ -356,6 +376,14 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
 	everyone's gone. One of the cats scratched you just a few minutes ago. That's why you were in the pod - to heal the scratch. The scabs are still fresh; you see them right now. So where is \
 	everyone? Where did they go? What happened to the hospital? And is that smoke you smell? You need to find someone else. Maybe they can tell you what happened."
 	assignedrole = "Translocated Vet"
+	base_skills = list(
+		SKILL_PHYSIOLOGY = EXP_MID,
+		SKILL_MECHANICAL = EXP_NONE,
+		SKILL_TECHNICAL = EXP_NONE,
+		SKILL_SCIENCE = EXP_NONE,
+		SKILL_FITNESS = EXP_NONE,
+	)
+	skill_points = EXP_MASTER
 
 /obj/effect/mob_spawn/human/doctor/alive/lavaland/Destroy()
 	var/obj/structure/fluff/empty_sleeper/S = new(drop_location())

code/modules/awaymissions/corpse.dm

@@ -345,6 +345,14 @@
 	icon_state = "sleeper"
 	short_desc = "You are a space doctor!"
 	assignedrole = "Space Doctor"
+	base_skills = list(
+		SKILL_PHYSIOLOGY = EXP_MID,
+		SKILL_MECHANICAL = EXP_NONE,
+		SKILL_TECHNICAL = EXP_NONE,
+		SKILL_SCIENCE = EXP_NONE,
+		SKILL_FITNESS = EXP_NONE,
+	)
+	skill_points = EXP_HIGH
 
 /obj/effect/mob_spawn/human/doctor/alive/equip(mob/living/carbon/human/H)
 	..()

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

@@ -1501,7 +1501,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
 	// nutrition decrease and satiety
 	if (H.nutrition > 0 && H.stat != DEAD && !HAS_TRAIT(H, TRAIT_NOHUNGER))
 		// THEY HUNGER
-		var/hunger_rate = HUNGER_FACTOR
+		var/hunger_rate = HUNGER_FACTOR * (EXP_MASTER + H.get_skill(SKILL_FITNESS)) / EXP_MASTER
 		var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
 		if(mood && mood.sanity > SANITY_DISTURBED)
 			hunger_rate *= max(0.5, 1 - 0.002 * mood.sanity) //0.85 to 0.75

code/modules/power/cable.dm

@@ -469,6 +469,7 @@ By design, d1 is the smallest direction and d2 is the highest
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	max_amount = MAXCOIL
 	amount = MAXCOIL
+	tool_behaviour = TOOL_WIRING
 	merge_type = /obj/item/stack/cable_coil // This is here to let its children merge between themselves
 	color = CABLE_HEX_COLOR_YELLOW
 	desc = "A coil of insulated power cable."

code/modules/projectiles/gun.dm

@@ -368,10 +368,10 @@
 		return
 
 	var/sprd = 0
-	var/randomized_gun_spread = EXP_GENIUS - user.get_skill(SKILL_FITNESS)
+	var/randomized_gun_spread = 0
 	var/rand_spr = rand()
 	if(spread > 0)
-		randomized_gun_spread += rand(0,spread)
+		randomized_gun_spread += rand(0,spread) * (8 - user.get_skill(SKILL_FITNESS)) / 5
 	if(ishuman(user)) //nice shootin' tex
 		var/mob/living/carbon/human/H = user
 		bonus_spread += H.dna.species.aiminginaccuracy

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -242,7 +242,7 @@
 			var/chemname = temp.name
 			if(is_hallucinating && prob(5))
 				chemname = "[pick_list_replacements("hallucination.json", "chemicals")]"
-			chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name), "locked" = (dispensable_reagents.Find(temp.type) ? FALSE : TRUE), "tier" = get_tier_for_chemical(temp))))
+			chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name), "locked" = !can_display_reagent(user, temp.type), "tier" = get_tier_for_chemical(temp))))
 	for(var/recipe in saved_recipes)
 		recipes.Add(list(recipe))
 	data["chemicals"] = chemicals
@@ -345,6 +345,17 @@
 				saved_recipes += list(list("recipe_name" = name, "contents" = recipe))
 		yogs - removed chem recipes */
 
+/obj/machinery/chem_dispenser/proc/can_display_reagent(mob/user, reagent_type)
+	if(dispensable_reagents.Find(reagent_type))
+		return TRUE
+	if(user.skill_check(SKILL_SCIENCE, EXP_GENIUS) && t4_upgrade_reagents.Find(reagent_type))
+		return TRUE
+	if(user.skill_check(SKILL_SCIENCE, EXP_HIGH) && t3_upgrade_reagents.Find(reagent_type))
+		return TRUE
+	if(user.skill_check(SKILL_SCIENCE, EXP_MID) && t2_upgrade_reagents.Find(reagent_type))
+		return TRUE
+	return FALSE
+
 /obj/machinery/chem_dispenser/attackby(obj/item/I, mob/living/user, params)
 	if(default_unfasten_wrench(user, I))
 		return