Merge pull request #8605 from Novacat/nova-shuttle

Translocator and Micromech Tweaks

code/game/mecha/micro/micro.dm

@@ -28,7 +28,8 @@
 	//operation_req_access = list(access_hos)
 	damage_absorption = list("brute"=1,"fire"=1,"bullet"=1,"laser"=1,"energy"=1,"bomb"=1)
 	var/am = "d3c2fbcadca903a41161ccc9df9cf948"
-
+	damage_minimum = 0				//Incoming damage lower than this won't actually deal damage. Scrapes shouldn't be a real thing.
+	minimum_penetration = 0		//Incoming damage won't be fully applied if you don't have at least 20. Almost all AP clears this.
 
 /obj/mecha/micro/melee_action(target as obj|mob|turf)
 	if(internal_damage&MECHA_INT_CONTROL_LOST)

code/game/mecha/micro/security.dm

@@ -30,6 +30,7 @@
 	max_equip = 3
 	max_micro_utility_equip = 0
 	max_micro_weapon_equip = 3
+	damage_minimum = 5		//A teeny bit of armor
 
 /obj/effect/decal/mecha_wreckage/micro/sec/polecat
 	name = "Polecat wreckage"

code/game/objects/items/devices/translocator_vr.dm

@@ -289,6 +289,16 @@
 	if(!teleport_checks(target,user))
 		return //The checks proc can send them a message if it wants.
 
+	if(istype(target, /mob/living))
+		var/mob/living/L = target
+		if(!L.stat)
+			if(L != user)
+				if(L.a_intent != I_HELP || L.has_AI())
+					to_chat(user, "<span class='notice'>[L] is resisting your attempt to teleport them with \the [src].</span>")
+					to_chat(L, "<span class='danger'> [user] is trying to teleport you with \the [src]!</span>")
+					if(!do_after(user, 30, L))
+						return
+
 	//Bzzt.
 	ready = 0
 	power_source.use(charge_cost)