Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop

Conflicts:
	code/setup.dm

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm

@@ -86,9 +86,6 @@
 					for(var/coin_type in typesof(/obj/item/weapon/coin))
 						possible_spawns += coin_type
 
-					//no icon_state for mythril coins
-					possible_spawns -= /obj/item/weapon/coin/mythril
-
 					var/coin_type = pick(possible_spawns)
 					for(var/i=0,i<amount,i++)
 						new coin_type(C)

code/WorkInProgress/Chinsky/ashtray.dm

@@ -82,8 +82,7 @@
 	icon_broken  = "ashtray_bork_bl"
 	max_butts = 14
 	health = 24.0
-	g_amt = 30
-	m_amt = 30
+	matter = list("metal" = 30,"glass" = 30)
 	empty_desc = "Cheap plastic ashtray."
 	throwforce = 3.0
 	die()
@@ -103,7 +102,7 @@
 	icon_broken  = "ashtray_bork_br"
 	max_butts = 10
 	health = 72.0
-	m_amt = 80
+	matter = list("metal" = 80)
 	empty_desc = "Massive bronze ashtray."
 	throwforce = 10.0
 
@@ -124,7 +123,7 @@
 	icon_broken  = "ashtray_bork_gl"
 	max_butts = 12
 	health = 12.0
-	g_amt = 60
+	matter = list("glass" = 60)
 	empty_desc = "Glass ashtray. Looks fragile."
 	throwforce = 6.0
 

code/WorkInProgress/Chinsky/guestpass.dm

@@ -19,20 +19,20 @@
 /obj/item/weapon/card/id/guest/examine()
 	..()
 	if (world.time < expiration_time)
-		usr << "\blue This pass expires at [worldtime2text(expiration_time)]."
+		usr << "<span class='notice'>This pass expires at [worldtime2text(expiration_time)].</span>"
 	else
-		usr << "\red It expired at [worldtime2text(expiration_time)]."
+		usr << "<span class='warning'>It expired at [worldtime2text(expiration_time)].</span>"
 
 /obj/item/weapon/card/id/guest/read()
 	if (world.time > expiration_time)
-		usr << "This pass expired at [worldtime2text(expiration_time)]."
+		usr << "<span class='notice'>This pass expired at [worldtime2text(expiration_time)].</span>"
 	else
-		usr << "This pass expires at [worldtime2text(expiration_time)]."
+		usr << "<span class='notice'>This pass expires at [worldtime2text(expiration_time)].</span>"
 
-	usr << "It grants access to following areas:"
+	usr << "<span class='notice'>It grants access to following areas:</span>"
 	for (var/A in temp_access)
-		usr << "[get_access_desc(A)]."
-	usr << "Issuing reason: [reason]."
+		usr << "<span class='notice'>[get_access_desc(A)].</span>"
+	usr << "<span class='notice'>Issuing reason: [reason].</span>"
 	return
 
 /////////////////////////////////////////////
@@ -60,10 +60,13 @@
 
 /obj/machinery/computer/guestpass/attackby(obj/O, mob/user)
 	if(istype(O, /obj/item/weapon/card/id))
-		user.drop_item()
-		O.loc = src
-		giver = O
-		updateUsrDialog()
+		if(!giver)
+			user.drop_item()
+			O.loc = src
+			giver = O
+			updateUsrDialog()
+		else
+			user << "<span class='warning'>There is already ID card inside.</span>"
 
 /obj/machinery/computer/guestpass/attack_ai(var/mob/user as mob)
 	return attack_hand(user)
@@ -116,16 +119,16 @@
 			if ("giv_name")
 				var/nam = input("Person pass is issued to", "Name", name)
 				if (nam)
-					giv_name = nam
+					giv_name = strip_html_simple(nam)
 			if ("reason")
 				var/reas = input("Reason why pass is issued", "Reason", reason)
-				reason = reas
+				reason = strip_html_simple(reas)
 			if ("duration")
 				var/dur = input("Duration (in minutes) during which pass is valid.", "Duration") as num
 				if (dur > 0 && dur < 30)
 					duration = dur
 				else
-					usr << "\red Invalid duration."
+					usr << "<span class='warning'>Invalid duration.</span>"
 			if ("access")
 				var/A = text2num(href_list["access"])
 				if (A in accesses)

code/WorkInProgress/periodic_news.dm

@@ -6,7 +6,7 @@
 		round_time // time of the round at which this should be announced, in seconds
 		message // body of the message
 		author = "NanoTrasen Editor"
-		channel_name = "Tau Ceti Daily"
+		channel_name = "Nyx Daily"
 		can_be_redacted = 0
 
 	revolution_inciting_event
@@ -65,7 +65,7 @@
 			round_time = 60 * 50
 
 		found_ssd
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Doctor Eric Hanfield"
 
 			message = {"Several people have been found unconscious at their terminals. It is thought that it was due
@@ -77,7 +77,7 @@
 	lotus_tree
 
 		explosions
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Leland H. Howards"
 
 			message = {"The newly-christened civillian transport Lotus Tree suffered two very large explosions near the
@@ -91,7 +91,7 @@
 	food_riots
 
 		breaking_news
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Ro'kii Ar-Raqis"
 
 			message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae
@@ -102,7 +102,7 @@
 			round_time = 60 * 10
 
 		more
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Ro'kii Ar-Raqis"
 
 			message = {"More on the Refuge food riots: The Refuge Council has condemned NanoTrasen's withdrawal from