Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -444,6 +444,13 @@
 			AddCamoOverlay(loc)//Overlay camo.
 	else
 		invisibility = 0
+		if(targeted_by && target_locked)
+			overlays += target_locked
+		else if(targeted_by)
+			target_locked = new /obj/effect/target_locked(src)
+			overlays += target_locked
+		else if(!targeted_by && target_locked)
+			del(target_locked)
 
 	for (var/mob/M in viewers(1, src))
 		if ((M.client && M.machine == src))

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

@@ -1174,6 +1174,13 @@
 		invisibility = 2
 	else
 		invisibility = 0
+		if(targeted_by && target_locked)
+			overlays += target_locked
+		else if(targeted_by)
+			target_locked = new /obj/effect/target_locked(src)
+			overlays += target_locked
+		else if(!targeted_by && target_locked)
+			del(target_locked)
 
 /*
 	for (var/mob/M in viewers(1, src))//For the love of god DO NOT REFRESH EVERY SECOND - Mport

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -449,8 +449,7 @@
 
 	if(update_icon) // Skie
 		..()
-		for(var/i in overlays)
-			overlays -= i
+		overlays = null
 
 		if (!( lying ))
 			icon_state = "monkey1"
@@ -515,6 +514,13 @@
 
 			else
 				m_select.screen_loc = null
+	if(targeted_by && target_locked)
+		overlays += target_locked
+	else if(targeted_by)
+		target_locked = new /obj/effect/target_locked(src)
+		overlays += target_locked
+	else if(!targeted_by && target_locked)
+		del(target_locked)
 	for(var/mob/M in viewers(1, src))
 		if ((M.client && M.machine == src))
 			spawn( 0 )

code/modules/mob/living/damage_procs.dm

@@ -42,9 +42,9 @@
 	if(!effect || (blocked >= 2))	return 0
 	switch(effecttype)
 		if(STUN)
-			Stun((effect - (effect*getarmor(null, "laser")))/(blocked + 1))
+			Stun((effect - (min(effect*getarmor(null, "laser"), effect*(0.75 + (blocked*0.05))))))
 		if(WEAKEN)
-			Weaken((effect - (effect*getarmor(null, "laser")))/(blocked + 1))
+			Weaken((effect - (min(effect*getarmor(null, "laser"), effect*(0.75 + (blocked*0.05))))))
 		if(PARALYZE)
 			Paralyse(effect/(blocked+1))
 		if(IRRADIATE)
@@ -76,4 +76,4 @@
 
 
 /mob/living/proc/react_to_attack(mob/M)
-	return
+	return

code/modules/mob/living/living_defense.dm

@@ -45,6 +45,12 @@
 
 	flash_weak_pain()
 
+	if(istype(equipped(),/obj/item/device/assembly/signaler))
+		var/obj/item/device/assembly/signaler/signaler = equipped()
+		if(signaler.deadman && prob(80))
+			src.visible_message("\red [src] triggers their deadman's switch!")
+			signaler.signal()
+
 	var/absorb = run_armor_check(def_zone, P.flag)
 	if(absorb >= 2)
 		P.on_hit(src,2)

code/modules/mob/living/say.dm

@@ -86,22 +86,39 @@
 		var/channel_prefix = copytext(message, 1, 3)
 
 		var/list/keys = list(
-			  ":r" = "right ear",
-			  ":l" = "left ear",
-			  ":i" = "intercom",
-			  ":h" = "department",
-			  ":c" = "Command",
-			  ":n" = "Science",
-			  ":m" = "Medical",
-			  ":e" = "Engineering",
-			  ":s" = "Security",
-			  ":w" = "whisper",
-			  ":b" = "binary",
-			  ":a" = "alientalk",
-			  ":t" = "Syndicate",
-			  ":d" = "Mining",
-			  ":q" = "Cargo",
-			  ":g" = "changeling",
+			":r" = "right ear",
+			":l" = "left ear",
+			":i" = "intercom",
+			":h" = "department",
+			":c" = "Command",
+			":n" = "Science",
+			":m" = "Medical",
+			":e" = "Engineering",
+			":s" = "Security",
+			":w" = "whisper",
+			":b" = "binary",
+			":a" = "alientalk",
+			":t" = "Syndicate",
+			":d" = "Mining",
+			":q" = "Cargo",
+			":g" = "changeling",
+
+			":R" = "right hand",
+			":L" = "left hand",
+			":I" = "intercom",
+			":H" = "department",
+			":C" = "Command",
+			":N" = "Science",
+			":M" = "Medical",
+			":E" = "Engineering",
+			":S" = "Security",
+			":W" = "whisper",
+			":B" = "binary",
+			":A" = "alientalk",
+			":T" = "Syndicate",
+			":D" = "Mining",
+			":Q" = "Cargo",
+			":G" = "changeling",
 
 			  //kinda localization -- rastaf0
 			  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.

code/modules/mob/living/silicon/robot/robot.dm

@@ -700,6 +700,14 @@
 			overlays += "ov-openpanel +c"
 		else
 			overlays += "ov-openpanel -c"
+
+	if(targeted_by && target_locked)
+		overlays += target_locked
+	else if(targeted_by)
+		target_locked = new /obj/effect/target_locked(src)
+		overlays += target_locked
+	else if(!targeted_by && target_locked)
+		del(target_locked)
 	return
 
 

code/modules/mob/living/silicon/say.dm

@@ -15,13 +15,13 @@
 		return
 
 	if (length(message) >= 2)
-		if (copytext(message, 1, 3) == ":s")
+		if ((copytext(message, 1, 3) == ":s") || (copytext(message, 1, 3) == ":S"))
 			if(istype(src, /mob/living/silicon/pai))
 				return ..(message)
 			message = copytext(message, 3)
 			message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 			robot_talk(message)
-		else if (copytext(message, 1, 3) == ":h")
+		else if ((copytext(message, 1, 3) == ":h") || (copytext(message, 1, 3) == ":H"))
 			if(isAI(src)&&client)//For patching directly into AI holopads.
 				message = copytext(message, 3)
 				message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))

code/modules/mob/mob.dm

@@ -277,6 +277,13 @@
 		back = null
 	else if (W == wear_mask)
 		wear_mask = null
+	if(istype(W,/obj/item/weapon/gun))
+		var/obj/item/weapon/gun/gun = W
+		if(gun.target)
+			gun.target.NotTargeted(gun)
+		del(item_use_icon)
+		del(gun_move_icon)
+		del(gun_run_icon)
 	update_clothing()
 	return
 

code/modules/mob/mob_movement.dm

@@ -173,6 +173,7 @@
 					return 0
 
 		move_delay = world.time//set move delay
+		mob.last_move_intent = world.time + 10
 		switch(mob.m_intent)
 			if("run")
 				if(mob.drowsyness > 0)

code/modules/mob/screen.dm

@@ -5,6 +5,7 @@
 	unacidable = 1
 	var/id = 0.0
 	var/obj/master
+	var/gun_click_time = -100 //I'm lazy.
 
 /obj/screen/close
 	name = "close"
@@ -25,6 +26,25 @@
 	var/selecting = "chest"
 	screen_loc = "EAST+1,NORTH"
 
+/obj/screen/gun
+	name = "gun"
+	icon = 'screen1.dmi'
+	master = null
+
+	move
+		name = "Allow Walking"
+		icon_state = "no_walk"
+		screen_loc = ui_gun2
+
+	run
+		name = "Allow Running"
+		icon_state = "no_run"
+		screen_loc = ui_gun3
+
+	item
+		name = "Allow Item Use"
+		icon_state = "no_item"
+		screen_loc = ui_gun1
 
 /obj/screen/zone_sel/MouseDown(location, control,params)
 	// Changes because of 4.0
@@ -569,6 +589,79 @@
 					usr:inv3.icon_state = "inv3"
 					usr:module_active = null
 
+		if("Allow Walking")
+			if(gun_click_time > world.time - 15)	//give them 1.5 seconds between mode changes.
+				usr << "You need to wait some before you can change what they can do!"
+				return
+			if(!istype(usr.equipped(),/obj/item/weapon/gun))
+				usr << "You need your gun in your active hand to do that!"
+				return
+			usr.AllowTargetMove()
+			icon_state = "walking"
+			name = "Disallow Walking"
+			gun_click_time = world.time
+
+		if("Disallow Walking")
+			if(gun_click_time > world.time - 15)	//give them 1.5 seconds between mode changes.
+				usr << "You need to wait some before you can change what they can do!"
+				return
+			if(!istype(usr.equipped(),/obj/item/weapon/gun))
+				usr << "You need your gun in your active hand to do that!"
+				return
+			usr.AllowTargetMove()
+			icon_state = "no_walk"
+			name = "Allow Walking"
+			gun_click_time = world.time
+
+		if("Allow Running")
+			if(gun_click_time > world.time - 15)	//give them 1.5 seconds between mode changes.
+				usr << "You need to wait some before you can change what they can do!"
+				return
+			if(!istype(usr.equipped(),/obj/item/weapon/gun))
+				usr << "You need your gun in your active hand to do that!"
+				return
+			usr.AllowTargetRun()
+			icon_state = "running"
+			name = "Disallow Running"
+			gun_click_time = world.time
+
+		if("Disallow Running")
+			if(gun_click_time > world.time - 15)	//give them 1.5 seconds between mode changes.
+				usr << "You need to wait some before you can change what they can do!"
+				return
+			if(!istype(usr.equipped(),/obj/item/weapon/gun))
+				usr << "You need your gun in your active hand to do that!"
+				return
+			usr.AllowTargetRun()
+			icon_state = "no_run"
+			name = "Allow Running"
+			gun_click_time = world.time
+
+		if("Allow Item Use")
+			if(gun_click_time > world.time - 15)	//give them 1.5 seconds between mode changes.
+				usr << "You need to wait some before you can change what they can do!"
+				return
+			if(!istype(usr.equipped(),/obj/item/weapon/gun))
+				usr << "You need your gun in your active hand to do that!"
+				return
+			name = "Disallow Item Use"
+			icon_state = "act_throw_off"
+			usr.AllowTargetClick()
+			gun_click_time = world.time
+
+
+		if("Disallow Item Use")
+			if(gun_click_time > world.time - 15)	//give them 1.5 seconds between mode changes.
+				usr << "You need to wait some before you can change what they can do!"
+				return
+			if(!istype(usr.equipped(),/obj/item/weapon/gun))
+				usr << "You need your gun in your active hand to do that!"
+				return
+			name = "Allow Item Use"
+			icon_state = "no_item"
+			usr.AllowTargetClick()
+			gun_click_time = world.time
+
 		else
 			DblClick()
 	return