Merge pull request #21 from ParadiseSS13/master

Merge from Master

code/game/machinery/bots/secbot.dm

@@ -23,6 +23,7 @@
 	var/weaponscheck = 1 //If true, arrest people for weapons if they lack access
 	var/check_records = 1 //Does it check security records?
 	var/arrest_type = 0 //If true, don't handcuff
+	var/harmbaton = 0
 	radio_frequency = SEC_FREQ //Security channel
 	radio_name = "Security"
 	bot_type = SEC_BOT
@@ -48,6 +49,15 @@
 	name = "Officer Pingsky"
 	desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
 	radio_frequency = AIPRIV_FREQ
+	radio_name = "AI Private"
+
+/obj/machinery/bot/secbot/buzzsky
+	name = "Officer Buzzsky"
+	desc = "It's Officer Buzzsky! Rusted and falling apart, he seems less than thrilled with the crew for leaving him in his current state."
+	declare_arrests = 0
+	arrest_type = 1
+	harmbaton = 1
+	emagged = 2
 
 /obj/item/weapon/secbot_assembly
 	name = "incomplete securitron assembly"
@@ -215,6 +225,8 @@ Auto Patrol: []"},
 			if(target)		// make sure target exists
 				if(Adjacent(target) && isturf(target.loc))	// if right next to perp
 					playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+					if(harmbaton)
+						playsound(loc, 'sound/weapons/genhit1.ogg', 50, 1, -1)
 					icon_state = "secbot-c"
 					spawn(2)
 						icon_state = "secbot[on]"
@@ -222,6 +234,8 @@ Auto Patrol: []"},
 					if(istype(M, /mob/living/carbon/human))
 						if( M.stuttering < 5 && !(M_HULK in M.mutations) )
 							M.stuttering = 5
+						if(harmbaton) // Bots with harmbaton enabled become shitcurity. - Dave
+							M.apply_damage(10)
 						M.Stun(5)
 						M.Weaken(5)
 					else
@@ -232,8 +246,8 @@ Auto Patrol: []"},
 					if(declare_arrests)
 						var/area/location = get_area(src)
 						speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag <b>[target]</b> in [location].",radio_frequency, radio_name)
-					target.visible_message("<span class='danger'>[target] has been stunned by [src]!</span>",\
-											"<span class='userdanger'>[target] has been stunned by [src]!</span>")
+					target.visible_message("<span class='danger'>[target] has been [harmbaton ? "beaten" : "stunned"] by [src]!</span>",\
+											"<span class='userdanger'>[target] has been [harmbaton ? "beaten" : "unlocked"] by [src]!</span>")
 
 					mode = BOT_PREP_ARREST
 					anchored = 1