Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj/weapon.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/DetectiveWork/footprints_and_rag.dm

@@ -178,7 +178,7 @@ proc/blood_incompatible(donor,receiver)
 	attack(atom/target as obj|turf|area, mob/user as mob , flag)
 		if(ismob(target) && target.reagents && reagents.total_volume)
 			user.visible_message("\red \The [target] has been smothered with \the [src] by \the [user]!", "\red You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise")
-			src.reagents.reaction(target, TOUCH)
+			src.reagents.reaction(target, INGEST)
 			spawn(5) src.reagents.clear_reagents()
 			return
 		else

code/modules/admin/verbs/randomverbs.dm

@@ -508,30 +508,27 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		src << "Only administrators may use this command."
 		return
 	var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
+	var/customname = input(usr, "Pick a title for the report.", "Title") as text|null
 	if(!input)
 		return
+	if(!customname)
+		customname = "NanoTrasen Update"
+	for (var/obj/machinery/computer/communications/C in machines)
+		if(! (C.stat & (BROKEN|NOPOWER) ) )
+			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
+			P.name = "'[command_name()] Update.'"
+			P.info = input
+			P.update_icon()
+			C.messagetitle.Add("[command_name()] Update")
+			C.messagetext.Add(P.info)
 
-	var/confirm = alert(src, "Do you want to announce the contents of the report to the crew?", "Announce", "Yes", "No")
-	if(confirm == "Yes")
-		command_alert(input);
-		for (var/obj/machinery/computer/communications/C in machines)
-			if(! (C.stat & (BROKEN|NOPOWER) ) )
-				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
-				P.name = "paper- '[command_name()] Update.'"
-				P.info = input
-				C.messagetitle.Add("[command_name()] Update")
-				C.messagetext.Add(P.info)
-	else
-		command_alert("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message");
-		for (var/obj/machinery/computer/communications/C in machines)
-			if(! (C.stat & (BROKEN|NOPOWER) ) )
-				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
-				P.name = "paper- 'Classified [command_name()] Update.'"
-				P.info = input
-				C.messagetitle.Add("Classified [command_name()] Update")
-				C.messagetext.Add(P.info)
+	switch(alert("Should this be announced to the general population?",,"Yes","No"))
+		if("Yes")
+			command_alert(input, maintitle=customname);
+		if("No")
+			world << "\red New NanoTrasen Update available at all communication consoles."
 
-	world << sound('sound/AI/commandreport.ogg')
+	world << sound('commandreport.ogg')
 	log_admin("[key_name(src)] has created a command report: [input]")
 	message_admins("[key_name_admin(src)] has created a command report", 1)
 	feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/clothing/uniforms/lawyer.dm

@@ -62,4 +62,4 @@
 	item_state = "judge"
 	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
-	allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/money)
+	allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/spacecash)

code/modules/detectivework/footprints_and_rag.dm

@@ -178,7 +178,7 @@ proc/blood_incompatible(donor,receiver)
 	attack(atom/target as obj|turf|area, mob/user as mob , flag)
 		if(ismob(target) && target.reagents && reagents.total_volume)
 			user.visible_message("\red \The [target] has been smothered with \the [src] by \the [user]!", "\red You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise")
-			src.reagents.reaction(target, TOUCH)
+			src.reagents.reaction(target, INGEST)
 			spawn(5) src.reagents.clear_reagents()
 			return
 		else

code/modules/mob/dead/observer/observer.dm

@@ -65,6 +65,7 @@ Works together with spawning an observer, noted above.
 	if(key)
 		var/mob/dead/observer/ghost = new(src)	//Transfer safety to observer spawning proc.
 		ghost.can_reenter_corpse = can_reenter_corpse
+		ghost.timeofdeath = timeofdeath //BS12 EDIT
 		ghost.key = key
 		return ghost
 

code/modules/mob/mob.dm

@@ -337,14 +337,35 @@ var/list/slot_equipment_priority = list( \
 	set category = "OOC"
 
 	if (!( abandon_allowed ))
+		usr << "\blue Respawn is disabled."
 		return
 	if ((stat != 2 || !( ticker )))
 		usr << "\blue <B>You must be dead to use this!</B>"
 		return
+	if (ticker.mode.name == "meteor" || ticker.mode.name == "epidemic") //BS12 EDIT
+		usr << "\blue Respawn is disabled."
+		return
+	else
+		var/deathtime = world.time - src.timeofdeath
+		var/deathtimeminutes = round(deathtime / 600)
+		var/pluralcheck = "minute"
+		if(deathtimeminutes == 0)
+			pluralcheck = ""
+		else if(deathtimeminutes == 1)
+			pluralcheck = " [deathtimeminutes] minute and"
+		else if(deathtimeminutes > 1)
+			pluralcheck = " [deathtimeminutes] minutes and"
+		var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
+		usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
+		if (deathtime < 18000)
+			usr << "You must wait 30 minutes to respawn!"
+			return
+		else
+			usr << "You can respawn now, enjoy your new life!"
 
 	log_game("[usr.name]/[usr.key] used abandon mob.")
 
-	usr << "\blue <B>Please roleplay correctly!</B>"
+	usr << "\blue <B>Make sure to play a different character, and please roleplay correctly!</B>"
 
 	if(!client)
 		log_game("[usr.key] AM failed due to disconnect.")

code/modules/mob/new_player/new_player.dm

@@ -321,14 +321,9 @@
 
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
-			var/ailist[] = list()
-			for (var/mob/living/silicon/ai/A in living_mob_list)
-				ailist += A
-			if (ailist.len)
-				var/mob/living/silicon/ai/announcer = pick(ailist)
-				if(character.mind)
-					if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
-						announcer.say("[character.real_name] has signed up as [rank].")
+			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI.
+			a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer")
+			del(a)
 
 	proc/LateChoices()
 		var/mills = world.time // 1/10 of a second, not real milliseconds but whatever