Merge branch 'master' of https://github.com/ZomgPonies/Paradise

Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm

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

@@ -19,6 +19,69 @@
 	if(src.stat == 2.0 && (act != "deathgasp"))
 		return
 	switch(act)
+		if("ping")
+			if (species.name == "Machine")
+				var/M = null
+				if(param)
+					for (var/mob/A in view(null, null))
+						if (param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if (param)
+					message = "<B>[src]</B> pings at [param]."
+				else
+					message = "<B>[src]</B> pings."
+				playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+				m_type = 1
+			else
+				if (!species.name == "Machine")
+					return
+
+		if("buzz")
+			if (species.name == "Machine")
+				var/M = null
+				if(param)
+					for (var/mob/A in view(null, null))
+						if (param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if (param)
+					message = "<B>[src]</B> buzzes at [param]."
+				else
+					message = "<B>[src]</B> buzzes."
+				playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+				m_type = 1
+			else
+				if (!species.name == "Machine")
+					return
+
+		if("beep")
+			if(species.name == "Machine")
+				var/M = null
+				if(param)
+					for (var/mob/A in view(null, null))
+						if (param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if (param)
+					message = "<B>[src]</B> beeps at [param]."
+				else
+					message = "<B>[src]</B> beeps."
+				playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+				m_type = 1
+			else
+				if (!species.name == "Machine")
+					return
+
 		if ("airguitar")
 			if (!src.restrained())
 				message = "<B>[src]</B> is strumming the air and headbanging like a safari chimp."
@@ -567,6 +630,8 @@
 					message = "<B>[src]</B> makes a very loud noise."
 					m_type = 2
 
+
+
 		// Needed for M_TOXIC_FART
 		if("fart")
 			if(world.time-lastFart >= 600)

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

@@ -244,6 +244,17 @@
 			else
 				var/atom/target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
 				throw_at(target, 200, 4)
+
+				var/limbs_affected = pick(2,3,4)
+				var/datum/organ/external/processing_dismember
+
+				while(limbs_affected != 0)
+					processing_dismember = pick(organs)
+					if(processing_dismember.name != "chest" && processing_dismember.name != "groin")
+						processing_dismember.dismember_limb()
+						limbs_affected -= 1
+
+
 			//return
 //				var/atom/target = get_edge_target_turf(user, get_dir(src, get_step_away(user, src)))
 				//user.throw_at(target, 200, 4)
@@ -258,6 +269,25 @@
 				b_loss = b_loss/1.5
 				f_loss = f_loss/1.5
 
+				var/limbs_affected = pick(0, 1, 2)
+				var/datum/organ/external/processing_dismember
+
+				while(limbs_affected != 0)
+					processing_dismember = pick(organs)
+					if(processing_dismember.name != "chest" && processing_dismember.name != "groin" && processing_dismember.name != "head")
+						processing_dismember.dismember_limb()
+						limbs_affected -= 1
+
+			else
+				var/limbs_affected = pick(1, 2, 3)
+				var/datum/organ/external/processing_dismember
+
+				while(limbs_affected != 0)
+					processing_dismember = pick(organs)
+					if(processing_dismember.name != "chest" && processing_dismember.name != "groin")
+						processing_dismember.dismember_limb()
+						limbs_affected -= 1
+
 			if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
 				ear_damage += 30
 				ear_deaf += 120
@@ -268,6 +298,18 @@
 			b_loss += 30
 			if (prob(getarmor(null, "bomb")))
 				b_loss = b_loss/2
+
+			else
+
+				var/limbs_affected = pick(0, 1)
+				var/datum/organ/external/processing_dismember
+
+				while(limbs_affected != 0)
+					processing_dismember = pick(organs)
+					if(processing_dismember.name != "chest" && processing_dismember.name != "groin" && processing_dismember.name != "head")
+						processing_dismember.dismember_limb()
+						limbs_affected -= 1
+
 			if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
 				ear_damage += 15
 				ear_deaf += 60

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

@@ -10,8 +10,6 @@ emp_act
 
 /mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone)
 
-	var/datum/organ/external/organ = get_organ(check_zone(def_zone))
-
 	if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
 		if(check_reflect(def_zone)) // Checks if you've passed a reflection% check
 			visible_message("<span class='danger'>The [P.name] gets reflected by [src]!</span>", \
@@ -40,6 +38,7 @@ emp_act
 
 	//Shrapnel
 	if (P.damage_type == BRUTE)
+		var/datum/organ/external/organ = get_organ(check_zone(def_zone))
 		var/armor = getarmor_organ(organ, "bullet")
 		if((P.embed && prob(20 + max(P.damage - armor, -10))))
 			var/obj/item/weapon/shard/shrapnel/SP = new()
@@ -265,7 +264,7 @@ emp_act
 	if(armor >= 2)	return 0
 	if(!I.force)	return 0
 	var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
-	
+
 	apply_damage(I.force, I.damtype, affecting, armor, sharp=weapon_sharp, edge=weapon_edge, used_weapon=I)
 
 	var/bloody = 0
@@ -313,8 +312,13 @@ emp_act
 
 
 	if(Iforce > 10 || Iforce >= 5 && prob(33))
-		forcesay(hit_appends)	//forcesay checks stat already					
-					
+		forcesay(hit_appends)	//forcesay checks stat already
+
+	if (I.damtype == BRUTE)
+		if((I.edge && prob(2 * I.force)) || (I.force > 20 && prob(I.force)))
+			if(affecting.brute_dam >= affecting.max_damage * config.organ_health_multiplier)
+				affecting.dismember_limb()
+
 	//Melee weapon embedded object code.
 	if (I.damtype == BRUTE && !I.is_robot_module())
 		var/damage = I.force
@@ -353,11 +357,11 @@ emp_act
 			zone = get_zone_with_miss_chance(zone, src, min(15*(distance-2), 0))
 		else
 			zone = get_zone_with_miss_chance(zone, src, 15)
-
+		/*
 		if(!zone)
 			visible_message("\blue \The [O] misses [src] narrowly!")
 			return
-
+		*/
 		O.throwing = 0		//it hit, so stop moving
 
 		if ((O.thrower != src) && check_shields(throw_damage, "[O]"))
@@ -465,7 +469,7 @@ emp_act
 	var/penetrated_dam = max(0,(damage - max(0,(SS.breach_threshold - SS.damage))))
 
 	if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam)
-	
+
 /mob/living/carbon/human/mech_melee_attack(obj/mecha/M)
 	if(M.occupant.a_intent == "harm")
 		if(M.damtype == "brute")

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

@@ -99,17 +99,14 @@
 
 				if(findtext(temp, "*", 1, 2))	//emotes
 					return
-				world << "Text after stuff is [temp]"
 				temp = copytext(trim_left(temp), 1, rand(5,8))
-				world << "Text after trimming is [temp]"
-
 				var/trimmed = trim_left(temp)
 				if(length(trimmed))
 					if(append)
 						temp += pick(append)
 
 					say(temp)
-				winset(client, "input", "text=[null]")	
+				winset(client, "input", "text=[null]")
 
 /mob/living/carbon/human/say_understands(var/other,var/datum/language/speaking = null)
 

code/modules/mob/living/living_defense.dm

@@ -57,13 +57,14 @@
 			signaler.signal()
 */
 
-	//Stun Beams
+/*
+	//Stun Beams -- These were commented out, making appropriate changes here. - Dave
 	if(istype(P, /obj/item/projectile/beam/stun) || istype(P, /obj/item/projectile/bullet/stunshot))
 		stun_effect_act(0, P.agony, def_zone, P)
 		src <<"\red You have been hit by [P]!"
 		del P
 		return
-
+*/
 	//Armor
 	var/absorb = run_armor_check(def_zone, P.flag)
 	var/proj_sharp = is_sharp(P)
@@ -119,15 +120,15 @@
 
 		var/throw_damage = O.throwforce*(speed/5)
 
-		var/miss_chance = 15
-		if (O.throw_source)
-			var/distance = get_dist(O.throw_source, loc)
-			miss_chance = min(15*(distance-2), 0)
-
+		//var/miss_chance = 15
+		//if (O.throw_source)
+			//var/distance = get_dist(O.throw_source, loc)
+			//miss_chance = min(15*(distance-2), 0)
+		/*
 		if (prob(miss_chance))
 			visible_message("\blue \The [O] misses [src] narrowly!")
 			return
-
+		*/
 		src.visible_message("\red [src] has been hit by [O].")
 		var/armor = run_armor_check(null, "melee")
 
@@ -168,7 +169,7 @@
 					visible_message("<span class='warning'>[src] is pinned to the wall by [O]!</span>","<span class='warning'>You are pinned to the wall by [O]!</span>")
 					src.anchored = 1
 					src.pinned += O
-					
+
 /mob/living/mech_melee_attack(obj/mecha/M)
 	if(M.occupant.a_intent == "harm")
 		if(M.damtype == "brute")

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

@@ -1242,7 +1242,7 @@
 		else
 			src << "Module isn't activated"
 		installed_modules()
-		
+
 	if (href_list["lawc"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawc"])
 		switch(lawcheck[L+1])
@@ -1404,6 +1404,61 @@
 	else
 		src << "Your icon has been set. You now require a module reset to change it."
 
+/mob/living/silicon/robot/deathsquad
+	var/searching_for_ckey = 0
+	icon_state = "nano_bloodhound"
+	lawupdate = 0
+	scrambledcodes = 1
+	syndicateborg = 1
+	modtype = "Commando"
+	faction = list("nanotrasen")
+	designation = "NT Combat Cyborg"
+	req_access = list(access_cent_specops)
+
+/mob/living/silicon/robot/deathsquad/New(loc)
+	..()
+	cell.maxcharge = 50000
+	cell.charge = 50000
+	radio = new /obj/item/device/radio/borg/deathsquad(src)
+	module = new /obj/item/weapon/robot_module/deathsquad(src)
+	laws = new /datum/ai_laws/deathsquad()
+
+/mob/living/silicon/robot/deathsquad/attack_hand(mob/user)
+	if((ckey == null) && searching_for_ckey == 0 && (alert(user,"Attempt to boot NanoTrasen Commando cyborg?","","Yes","No") == "Yes"))
+		get_borg_occupant(user, get_candidates())
+		return
+	..()
+
+
+/mob/living/silicon/robot/deathsquad/proc/get_borg_occupant(mob/user as mob, var/list/possiblecandidates = list())
+	var/time_passed = world.time
+	searching_for_ckey = 1
+	if(possiblecandidates.len <= 0)
+		searching_for_ckey = 0
+		user << "<span class='notice'>Cyborg MMI interface failure, unit unable to be started.</span>"
+		return
+	else
+		var/possibleborg = pick(possiblecandidates)
+		spawn(0)
+			var/input = alert(possibleborg,"Do you want to spawn in as a cyborg for the NT Deathsquad?","Please answer in thirty seconds!","Yes","No")
+			if(input == "Yes" && ckey == null)
+				if((world.time-time_passed)>300)
+					return
+				possiblecandidates -= possibleborg
+				searching_for_ckey = 0
+				ckey = possibleborg
+			else
+				possiblecandidates -= possibleborg
+				get_borg_occupant(user, possiblecandidates)
+				return
+
+		sleep(300)
+		if(searching_for_ckey)
+			possiblecandidates -= possibleborg
+			get_borg_occupant(user, possiblecandidates)
+			return
+
+
 /mob/living/silicon/robot/syndicate
 	icon_state = "syndie_bloodhound"
 	lawupdate = 0
@@ -1414,18 +1469,18 @@
 	designation = "Syndicate"
 	modtype = "Syndicate"
 	req_access = list(access_syndicate)
-	
+
 /mob/living/silicon/robot/syndicate/New(loc)
 	..()
 	cell.maxcharge = 25000
 	cell.charge = 25000
 	radio = new /obj/item/device/radio/borg/syndicate(src)
 	module = new /obj/item/weapon/robot_module/syndicate(src)
-	laws = new /datum/ai_laws/syndicate_override()		
-	
+	laws = new /datum/ai_laws/syndicate_override()
+
 	Namepick()
-	
-	
+
+
 /mob/living/silicon/robot/proc/notify_ai(var/notifytype, var/oldname, var/newname)
 	if(!connected_ai)
 		return

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

@@ -324,6 +324,20 @@
 		src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
 		return
 
+/obj/item/weapon/robot_module/deathsquad
+	name = "NT advanced combat module"
+
+/obj/item/weapon/robot_module/deathsquad/New()
+	src.modules += new /obj/item/device/flash(src)
+	src.modules += new /obj/item/device/flashlight(src)
+	src.modules += new /obj/item/borg/sight/thermal(src)
+	src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src)
+	src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/cyborg(src)
+	src.modules += new /obj/item/weapon/tank/jetpack/carbondioxide(src)
+	src.modules += new /obj/item/weapon/crowbar(src)
+	src.emag = null
+	return
+
 /obj/item/weapon/robot_module/syndicate
 	name = "syndicate robot module"
 

code/modules/mob/living/simple_animal/hostile/mushroom.dm

@@ -153,6 +153,6 @@
 	for(counter=0, counter<=powerlevel, counter++)
 		var/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
 		S.reagents.add_reagent("mushroomhallucinogen", powerlevel)
-		S.reagents.add_reagent("alchdranine", powerlevel)
+		S.reagents.add_reagent("doctorsdelight", powerlevel)
 		S.reagents.add_reagent("synaptizine", powerlevel)
 	del(src)