Small object manipulation stuff

2026-08-27 22:17:32 +01:00 · 2015-05-26 14:00:20 -04:00
parent 264369bdfa
commit 5c79a9a065
16 changed files with 55 additions and 20 deletions
@@ -30,6 +30,8 @@
 	src.ui_interact(user)

 /obj/machinery/embedded_controller/attack_hand(mob/user as mob)
+	if(!user.IsAdvancedToolUser())
+		return 0
 	src.ui_interact(user)

 /obj/machinery/embedded_controller/ui_interact()
@@ -130,6 +130,8 @@


 /obj/machinery/navbeacon/attack_hand(var/mob/user)
+	if(!user.IsAdvancedToolUser())
+		return 0
 	interact(user, 0)

 /obj/machinery/navbeacon/interact(var/mob/user, var/ai = 0)
@@ -180,6 +180,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 /obj/machinery/newscaster/attack_hand(mob/user as mob)            //########### THE MAIN BEEF IS HERE! And in the proc below this...############
 	if(!src.ispowered || src.isbroken)
 		return
+
+	if(!user.IsAdvancedToolUser())
+		return 0
+
 	if(istype(user, /mob/living/carbon/human) || istype(user,/mob/living/silicon) )
 		var/mob/living/human_or_robot_user = user
 		var/dat
@@ -96,6 +96,8 @@
 		return
 	if(stat & NOPOWER)
 		return
+	if(!user.IsAdvancedToolUser())
+		return 0
 	if(src.panelopen) //The maintenance panel is open. Time for some shady stuff
 		dat+= "<HEAD><TITLE>Suit storage unit: Maintenance panel</TITLE></HEAD>"
 		dat+= "<Font color ='black'><B>Maintenance panel controls</B></font><HR>"
@@ -743,6 +745,9 @@
 	if(..() || stat & (BROKEN|NOPOWER))
 		return

+	if(!user.IsAdvancedToolUser())
+		return 0
+
 	if(electrified != 0)
 		if(src.shock(user, 100))
 			return
@@ -99,8 +99,7 @@
 		var/mob/living/carbon/human/H = M
 		if(H.species.flags & IS_SYNTHETIC)
 			return
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		user << "\red You don't have the dexterity to do this!"
+	if (!usr.IsAdvancedToolUser())
 		return

 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [name] by [user.name] ([user.ckey])</font>")
@@ -17,6 +17,9 @@
 	var/trashtype = null //For disposable cuffs

 /obj/item/weapon/restraints/handcuffs/attack(mob/living/carbon/C, mob/user)
+	if(!user.IsAdvancedToolUser())
+		return
+
 	if(CLUMSY in user.mutations && prob(50))
 		user << "<span class='warning'>Uh... how do those things work?!</span>"
 		apply_cuffs(user,user)
@@ -10,6 +10,13 @@
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/mask.dmi'
 		)
+
+// Clumsy folks can't take the mask off themselves.
+/obj/item/clothing/mask/muzzle/attack_hand(mob/user as mob)
+	if(user.wear_mask == src && !user.IsAdvancedToolUser())
+		return 0
+	..()
+
 /obj/item/clothing/mask/muzzle/gag
 	name = "gag"
 	desc = "Stick this in their mouth to stop the noise."
@@ -1091,9 +1091,6 @@
 		tinted += MT.tint
 	return tinted

-/mob/living/carbon/human/IsAdvancedToolUser()
-	return 1//Humans can use guns and such
-

 /mob/living/carbon/human/abiotic(var/full_body = 0)
 	if(full_body && ((src.l_hand && !(src.l_hand.flags & ABSTRACT)) || (src.r_hand && !(src.r_hand.flags & ABSTRACT)) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves)))
@@ -1690,4 +1687,12 @@
 	return 1

 /mob/living/carbon/human/InCritical()
-	return (health <= config.health_threshold_crit && stat == UNCONSCIOUS)
+	return (health <= config.health_threshold_crit && stat == UNCONSCIOUS)
+
+
+/mob/living/carbon/human/IsAdvancedToolUser(var/silent)
+	if(species.has_fine_manipulation)
+		return 1
+	if(!silent)
+		src << "<span class='warning'>You don't have the dexterity to use that!<span>"
+	return 0
@@ -11,7 +11,8 @@
 	default_language = "Chimpanzee"
 	greater_form = "Human"
 	is_small = 1
-	//has_fine_manipulation = 0
+	has_fine_manipulation = 0
+	ventcrawler = 1
 	show_ssd = 0
 	eyes = "blank_eyes"

@@ -56,6 +56,7 @@
 	var/list/default_genes = list()

 	var/ventcrawler = 0 //Determines if the mob can go through the vents.
+	var/has_fine_manipulation = 1 // Can use small items.

 	var/flags = 0       // Various specific features.
 	var/bloodflags=0
@@ -321,3 +321,6 @@
 		if ("Disable")
 			sensor_mode = 0
 			src << "Sensor augmentations disabled."
+
+/mob/living/silicon/IsAdvancedToolUser()
+	return 1
@@ -1492,4 +1492,4 @@ mob/proc/yank_out_object()
 	return

 /mob/proc/handle_ventcrawl()
-	return // Only living mobs can ventcrawl
+	return // Only living mobs can ventcrawl
@@ -811,6 +811,8 @@
 		return 0
 	if(!user.client)
 		return 0
+	if(!user.IsAdvancedToolUser())
+		return 0
 	if ( ! (istype(user, /mob/living/carbon/human) || \
 			istype(user, /mob/living/silicon)))
 		user << "\red You don't have the dexterity to use this [src]!"
@@ -56,6 +56,8 @@


 	proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver.
+		if(!usr.IsAdvancedToolUser())
+			return 0
 		return 1


@@ -212,22 +212,19 @@

 	// human interact with machine
 	attack_hand(mob/user as mob)
+		if(stat & BROKEN)
+			return
+
 		if(user && user.loc == src)
 			usr << "\red You cannot reach the controls from inside."
 			return
-		/*
-		if(mode==-1)
-			usr << "\red The disposal units power is disabled."
-			return
-		*/
-		interact(user, 0)

-	// hostile mob escape from disposals
-	attack_animal(var/mob/living/simple_animal/M)
-		if(M.environment_smash)
-			M.do_attack_animation(src)
-			visible_message("<span class='danger'>[M.name] smashes \the [src] apart!</span>")
-			qdel(src)
+		// Clumsy folks can only flush it.
+		if(user.IsAdvancedToolUser(1))
+			interact(user, 0)
+		else
+			flush = !flush
+			update()
 		return

 	// user interaction
@@ -52,6 +52,8 @@
 		stat |= NOPOWER

 /obj/machinery/keycard_auth/attack_hand(mob/user as mob)
+	if(!user.IsAdvancedToolUser())
+		return 0
 	ui_interact(user)

 /obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)