Merge pull request #269 from SoundScopes/master

Scopes updates

code/modules/mob/hear_say.dm

@@ -76,7 +76,9 @@
 	if(hard_to_hear)
 		message = stars(message)
 
-	var/speaker_name = speaker.name
+	var/speaker_name
+	if(speaker)
+		speaker_name = speaker.name
 
 	if(vname)
 		speaker_name = vname

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

@@ -131,13 +131,15 @@
 					//and leave an attack log
 					M.attack_log += text("\[[time_stamp()]\] <font color='red'>Bit [src.name] ([src.ckey]) in the neck and draining their blood</font>")
 					src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been bit in the neck by [M.name] ([M.ckey])</font>")
-					msg_admin_attack("[M.name] ([M.ckey]) bit [src.name] ([src.ckey]) in the neck")
+					msg_admin_attack("[M.name] ([M.ckey]) bit [src.name] ([src.ckey]) in the neck - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[M.x];Y=[M.y];Z=[M.z]'>JMP</a>")
 					M.handle_bloodsucking(src)
+//					var/datum/organ/external/affecting = get_organ(src.zone_sel.selecting)
+//					affecting.take_damage(10,0,1,0,"dual puncture marks") //this does not work and causes runtimes.
 					return
 			//end vampire codes
 			M.attack_log += text("\[[time_stamp()]\] <font color='red'>[pick(attack.attack_verb)]ed [src.name] ([src.ckey])</font>")
 			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [pick(attack.attack_verb)]ed by [M.name] ([M.ckey])</font>")
-			msg_admin_attack("[key_name(M)] [pick(attack.attack_verb)]ed [key_name(src)]")
+			msg_admin_attack("[key_name(M)] [pick(attack.attack_verb)]ed [key_name(src)] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[M.x];Y=[M.y];Z=[M.z]'>JMP</a>")
 
 			var/damage = rand(0, 5)//BS12 EDIT
 			if(!damage)
@@ -168,7 +170,7 @@
 			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Disarmed [src.name] ([src.ckey])</font>")
 			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been disarmed by [M.name] ([M.ckey])</font>")
 
-			msg_admin_attack("[key_name(M)] disarmed [src.name] ([src.ckey])")
+			msg_admin_attack("[key_name(M)] disarmed [src.name] ([src.ckey]) - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[M.x];Y=[M.y];Z=[M.z]'>JMP</a>")
 
 			if(w_uniform)
 				w_uniform.add_fingerprint(M)

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

@@ -22,17 +22,29 @@
 	if(wear_suit)
 		tally += wear_suit.slowdown
 
-	if(shoes)
-		tally += shoes.slowdown
 
-	for(var/organ_name in list("l_foot","r_foot","l_leg","r_leg"))
-		var/datum/organ/external/E = get_organ(organ_name)
-		if(!E || (E.status & ORGAN_DESTROYED))
-			tally += 4
-		if(E.status & ORGAN_SPLINTED)
-			tally += 0.5
-		else if(E.status & ORGAN_BROKEN)
-			tally += 1.5
+	if(!buckled || (buckled && !istype(buckled, /obj/structure/stool/bed/chair/wheelchair)))
+		if(shoes)
+			tally += shoes.slowdown
+
+		for(var/organ_name in list("l_foot","r_foot","l_leg","r_leg"))
+			var/datum/organ/external/E = get_organ(organ_name)
+			if(!E || (E.status & ORGAN_DESTROYED))
+				tally += 4
+			if(E.status & ORGAN_SPLINTED)
+				tally += 0.5
+			else if(E.status & ORGAN_BROKEN)
+				tally += 1.5
+
+	if(buckled && istype(buckled, /obj/structure/stool/bed/chair/wheelchair))
+		for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm"))
+			var/datum/organ/external/E = get_organ(organ_name)
+			if(!E || (E.status & ORGAN_DESTROYED))
+				tally += 4
+			if(E.status & ORGAN_SPLINTED)
+				tally += 0.5
+			else if(E.status & ORGAN_BROKEN)
+				tally += 1.5
 
 	if(shock_stage >= 10) tally += 3
 

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

@@ -237,7 +237,7 @@
 					handled = 1
 
 	if((HULK in mutations) && health >= 25 && length(message))
-		message = "[uppertext(message)]!!!"
+		//message = "[uppertext(message)]!!!"  //this is really irritating.  let's not.
 		verb = pick("yells","roars","hollers")
 		handled = 1
 	if(slurring)

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

@@ -747,12 +747,12 @@ var/list/ai_list = list()
 	if(centcomm_message_cooldown)
 		usr << "\red Arrays recycling.  Please stand by."
 		return
-	var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")
+	var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response. There is a 10 minute delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")
 	if(!input || !(usr in view(1,src)))
 		return
-	Centcomm_announce(input, usr)
+	Centcomm_announce(input, usr, 1)
 	usr << "\blue Message transmitted."
 	log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]")
 	centcomm_message_cooldown = 1
-	spawn(300)//10 minute cooldown
+	spawn(6000)//10 minute cooldown
 		centcomm_message_cooldown = 0

code/modules/mob/living/silicon/ai/death.dm

@@ -42,6 +42,7 @@
 		emergency_shuttle.incall(2)
 		log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
 		message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
+		message_mods("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
 		captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
 		world << sound('sound/AI/shuttlecalled.ogg')
 

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

@@ -90,6 +90,7 @@
 		if(D.stat != 2)
 			usr << "\red You issue a kill command for the unfortunate drone."
 			message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
+			message_mods("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
 			log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.")
 			D.shut_down()
 

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

@@ -731,6 +731,7 @@
 					connected_ai = null
 					user << "You emag [src]'s interface."
 					message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)].  Laws overridden.")
+					message_mods("[key_name_admin(user)] emagged cyborg [key_name_admin(src)].  Laws overridden.")
 					log_game("[key_name(user)] emagged cyborg [key_name(src)].  Laws overridden.")
 					clear_supplied_laws()
 					clear_inherent_laws()

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

@@ -13,11 +13,11 @@
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
 	speed = 4
-	maxHealth = 70
-	health = 70
+	maxHealth = 45
+	health = 45
 
 	harm_intent_damage = 8
-	melee_damage_lower = 15
+	melee_damage_lower = 10
 	melee_damage_upper = 15
 	attacktext = "bites"
 	attack_sound = 'sound/weapons/bite.ogg'

code/modules/mob/login.dm

@@ -18,9 +18,11 @@
 				if(matches)
 					if(M.client)
 						message_admins("<font color='red'><B>Notice: </B></font><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as <A href='?src=\ref[usr];priv_msg=\ref[M]'>[key_name_admin(M)]</A>.</font>", 1)
+						message_mods("<font color='red'><B>Notice: </B></font><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as <A href='?src=\ref[usr];priv_msg=\ref[M]'>[key_name_admin(M)]</A>.</font>")
 						log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)].")
 					else
 						message_admins("<font color='red'><B>Notice: </B></font><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as [key_name_admin(M)] (no longer logged in). </font>", 1)
+						message_mods("<font color='red'><B>Notice: </B></font><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as [key_name_admin(M)] (no longer logged in). </font>")
 						log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
 
 /mob/Login()
@@ -56,4 +58,4 @@
 		if(H.species && H.species.abilities)
 			client.verbs |= H.species.abilities
 
-	nanomanager.send_resources(client)
+	nanomanager.send_resources(client)

code/modules/mob/logout.dm

@@ -7,6 +7,7 @@
 			var/admins_number = admins.len
 
 			message_admins("Admin logout: [key_name(src)]")
+			message_mods("Staff logout: [key_name(src)]")
 			if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
 				send2adminirc("[key_name(src)] logged out - no more admins online.")
 	..()

code/modules/mob/mob_grab.dm

@@ -137,7 +137,7 @@
 				affecting.loc = assailant.loc
 			affecting.attack_log += "\[[time_stamp()]\] <font color='orange'>Has had their neck grabbed by [assailant.name] ([assailant.ckey])</font>"
 			assailant.attack_log += "\[[time_stamp()]\] <font color='red'>Grabbed the neck of [affecting.name] ([affecting.ckey])</font>"
-			msg_admin_attack("[key_name(assailant)] grabbed the neck of [key_name(affecting)]")
+			msg_admin_attack("[key_name(assailant)] grabbed the neck of [key_name(affecting)] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[affecting.x];Y=[affecting.y];Z=[affecting.z]'>JMP</a>")
 			hud.icon_state = "disarm/kill"
 			hud.name = "disarm/kill"
 		else
@@ -158,7 +158,7 @@
 					assailant.visible_message("<span class='danger'>[assailant] has tightened \his grip on [affecting]'s neck!</span>")
 					affecting.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been strangled (kill intent) by [assailant.name] ([assailant.ckey])</font>"
 					assailant.attack_log += "\[[time_stamp()]\] <font color='red'>Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>"
-					msg_admin_attack("[key_name(assailant)] strangled (kill intent) [key_name(affecting)]")
+					msg_admin_attack("[key_name(assailant)] strangled (kill intent) [key_name(affecting)] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[affecting.x];Y=[affecting.y];Z=[affecting.z]'>JMP</a>")
 
 					assailant.next_move = world.time + 10
 					affecting.losebreath += 1

code/modules/mob/mob_movement.dm

@@ -200,10 +200,14 @@
 
 	if(Process_Grab())	return
 
-	if(mob.buckled)							//if we're buckled to something, tell it we moved.
-		return mob.buckled.relaymove(mob, direct)
+//	if(mob.buckled)							//if we're buckled to something, tell it we moved.
+//		return mob.buckled.relaymove(mob, direct)
 
-	if(!mob.canmove)	return
+//	if(!mob.canmove)	return
+
+	if(!mob.canmove)
+		if (mob.buckled && (istype(mob.buckled, /obj/structure/stool/bed/chair/wheelchair))) // Exception for wheelchairs
+		else return
 
 	//if(istype(mob.loc, /turf/space) || (mob.flags & NOGRAV))
 	//	if(!mob.Process_Spacemove(0))	return 0
@@ -254,8 +258,20 @@
 			var/tickcomp = ((1/(world.tick_lag))*1.3)
 			move_delay = move_delay + tickcomp
 
-
-
+		if(mob.pulledby || mob.buckled) // Wheelchair driving!
+			if(istype(mob.loc, /turf/space))
+				return // No wheelchair driving in space
+			if(istype(mob.pulledby, /obj/structure/stool/bed/chair/wheelchair))
+				return mob.pulledby.relaymove(mob, direct)
+			else if(istype(mob.buckled, /obj/structure/stool/bed/chair/wheelchair))
+				if(ishuman(mob.buckled))
+					var/mob/living/carbon/human/driver = mob.buckled
+					var/datum/organ/external/l_hand = driver.get_organ("l_hand")
+					var/datum/organ/external/r_hand = driver.get_organ("r_hand")
+					if((!l_hand || (l_hand.status & ORGAN_DESTROYED)) && (!r_hand || (r_hand.status & ORGAN_DESTROYED)))
+						return // No hands to drive your chair? Tough luck!
+				move_delay += 2
+				return mob.buckled.relaymove(mob,direct)
 
 		//We are now going to move
 		moving = 1

code/modules/mob/new_player/new_player.dm

@@ -293,6 +293,10 @@
 		EquipCustomItems(character)
 		character.loc = pick(latejoin)
 		character.lastarea = get_area(loc)
+		// Moving wheelchair if they have one
+		if(character.buckled && istype(character.buckled, /obj/structure/stool/bed/chair/wheelchair))
+			character.buckled.loc = character.loc
+			character.buckled.dir = character.dir
 
 		ticker.mode.latespawn(character)