Merge pull request #1425 from Yawn-Wider/upstream-update

Voreupdate [MDB IGNORE] [IDB IGNORE]

code/ZAS/Fire.dm

@@ -365,7 +365,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
 	var/total_combustables = (total_fuel + total_oxidizers)
 	var/active_combustables = (FIRE_REACTION_OXIDIZER_AMOUNT/FIRE_REACTION_FUEL_AMOUNT + 1)*reaction_limit
 
-	if(total_combustables > 0)
+	if(total_combustables > 0 && total_moles > 0)
 		//slows down the burning when the concentration of the reactants is low
 		var/damping_multiplier = min(1, active_combustables / (total_moles/group_multiplier))
 

code/__defines/admin_vr.dm

@@ -7,8 +7,10 @@
 #define MODIFIY_ROBOT_MODULE_ADD	"Add a Module"
 #define MODIFIY_ROBOT_MODULE_REMOVE	"Remove a Module"
 #define MODIFIY_ROBOT_APPLY_UPGRADE	"Apply an Upgrade"
+#define MODIFIY_ROBOT_SUPP_ADD		"Add Upgrade Support"
+#define MODIFIY_ROBOT_SUPP_REMOVE	"Remove Upgrade Support"
 #define MODIFIY_ROBOT_RADIOC_ADD	"Add a Radio Channel"
 #define MODIFIY_ROBOT_RADIOC_REMOVE	"Remove a Radio Channel"
 #define MODIFIY_ROBOT_COMP_ADD		"Replace a Component"
 #define MODIFIY_ROBOT_COMP_REMOVE	"Remove a Component"
-#define MODIFIY_ROBOT_RESET_MODULE	"Fully Resets a Robot Module"
+#define MODIFIY_ROBOT_RESET_MODULE	"Fully Reset Robot Module"

code/__defines/exosuit_fab.dm

@@ -1,15 +1,30 @@
+
+/// Module is compatible with All Cyborg models, utility upgrades
+#define BORG_UTILITY				(1<<0)
+/// Module is compatible with All Cyborg models, basic upgrades
+#define BORG_BASIC					(1<<1)
+/// Module is compatible with All Cyborg models, advanced upgrades
+#define BORG_ADVANCED				(1<<2)
 /// Module is compatible with Security Cyborg models
-#define BORG_MODULE_SECURITY 		(1<<0)
+#define BORG_MODULE_SECURITY 		(1<<3)
 /// Module is compatible with Miner Cyborg models
-#define BORG_MODULE_MINER			(1<<1)
+#define BORG_MODULE_MINER			(1<<4)
 /// Module is compatible with Janitor Cyborg models
-#define BORG_MODULE_JANITOR			(1<<2)
+#define BORG_MODULE_JANITOR			(1<<5)
 /// Module is compatible with Medical Cyborg models
-#define BORG_MODULE_MEDICAL			(1<<3)
+#define BORG_MODULE_MEDICAL			(1<<6)
 /// Module is compatible with Engineering Cyborg models
-#define BORG_MODULE_ENGINEERING		(1<<4)
+#define BORG_MODULE_ENGINEERING		(1<<7)
 /// Module is compatible with Science Cyborg models
-#define BORG_MODULE_SCIENCE			(1<<5)
+#define BORG_MODULE_SCIENCE			(1<<8)
+/// Module is compatible with Service Cyborg models
+#define BORG_MODULE_SERVICE			(1<<9)
+/// Module is compatible with Clerical Cyborg models
+#define BORG_MODULE_CLERIC			(1<<10)
+/// Module is compatible with Combat Cyborg models
+#define BORG_MODULE_COMBAT			(1<<11)
+/// Module is compatible with Exploration Cyborg models
+#define BORG_MODULE_EXPLO			(1<<12)
 /// Module is compatible with Ripley Exosuit models
 #define EXOSUIT_MODULE_RIPLEY		(1<<0)
 /// Module is compatible with Odyseeus Exosuit models

code/__defines/span_vr.dm

@@ -10,15 +10,15 @@
 
 #define span_comradio(str) ("<span class='comradio'>" + str + "</span>")
 #define span_syndradio(str) ("<span class='syndradio'>" + str + "</span>")
-#define span_centradio(str) ("<span class='centradio'>" + str + "</span>"
+#define span_centradio(str) ("<span class='centradio'>" + str + "</span>")
 #define span_airadio(str) ("<span class='airadio'>" + str + "</span>")
 #define span_entradio(str) ("<span class='entradio'>" + str + "</span>")
 
 #define span_secradio(str) ("<span class='secradio'>" + str + "</span>")
 #define span_engradio(str) ("<span class='engradio'>" + str + "</span>")
 #define span_medradio(str) ("<span class='medradio'>" + str + "</span>")
 #define span_sciradio(str) ("<span class='sciradio'>" + str + "</span>")
-#define span_supradio(str) ("<span class='supradio'>" + str + "</span>"
+#define span_supradio(str) ("<span class='supradio'>" + str + "</span>")
 #define span_srvradio(str) ("<span class='srvradio'>" + str + "</span>")
 #define span_expradio(str) ("<span class='expradio'>" + str + "</span>")
 
@@ -81,10 +81,20 @@
 #define span_debug_debug(str) ("<span class='debug_debug'>" + str + "</span>")
 #define span_debug_trace(str) ("<span class='debug_trace'>" + str + "</span>")
 
+#define span_white(str) ("<span class='white'>" + str + "</span>")
 #define span_black(str) ("<span class='black'>" + str + "</span>")
 #define span_darkgray(str) ("<span class='darkgray'>" + str + "</span>")
 #define span_gray(str) ("<span class='gray'>" + str + "</span>")
 #define span_red(str) ("<span class='red'>" + str + "</span>")
 #define span_orange(str) ("<span class='orange'>" + str + "</span>")
 #define span_blue(str) ("<span class='blue'>" + str + "</span>")
 #define span_green(str) ("<span class='green'>" + str + "</span>")
+#define span_purple(str) ("<span class='purple'>" + str + "</span>")
+#define span_yellow(str) ("<span class='yellow'>" + str + "</span>")
+#define span_pink(str) ("<span class='pink'>" + str + "</span>")
+#define span_cyan(str) ("<span class='cyan'>" + str + "</span>")
+#define span_crimson(str) ("<span class='crimson'>" + str + "</span>")
+#define span_maroon(str) ("<span class='maroon'>" + str + "</span>")
+#define span_brown(str) ("<span class='brown'>" + str + "</span>")
+#define span_lightpurple(str) ("<span class='lightpurple'>" + str + "</span>")
+#define span_darkpink(str) ("<span class='lightpurple'>" + str + "</span>")

code/_helpers/files.dm

@@ -39,7 +39,7 @@
 
 	var/extension = copytext(path,-4,0)
 	if( !fexists(path) || !(extension in valid_extensions) )
-		to_chat(src, "<font color='red'>Error: browse_files(): File not found/Invalid file([path]).</font>")
+		to_chat(src, span_red("Error: browse_files(): File not found/Invalid file([path])."))
 		return
 
 	return path
@@ -53,7 +53,7 @@
 /client/proc/file_spam_check()
 	var/time_to_wait = fileaccess_timer - world.time
 	if(time_to_wait > 0)
-		to_chat(src, "<font color='red'>Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds.</font>")
+		to_chat(src, span_red("Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds."))
 		return 1
 	fileaccess_timer = world.time + FTPDELAY
 	return 0

code/_helpers/mobs.dm

@@ -121,9 +121,9 @@ Proc for attack log creation, because really why not
 	var/target_str = key_name(target)
 
 	if(ismob(user))
-		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Attacked [target_str]: [what_done]</font>")
+		user.attack_log += text("\[[time_stamp()]\] [span_red("Attacked [target_str]: [what_done]")]")
 	if(ismob(target))
-		target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Attacked by [user_str]: [what_done]</font>")
+		target.attack_log += text("\[[time_stamp()]\] [span_orange("Attacked by [user_str]: [what_done]")]")
 	log_attack(user_str,target_str,what_done)
 	if(admin_notify)
 		msg_admin_attack("[key_name_admin(user)] vs [target_str]: [what_done]")

code/controllers/subsystems/ticker.dm

@@ -469,22 +469,22 @@ var/global/datum/controller/subsystem/ticker/ticker
 				var/turf/playerTurf = get_turf(Player)
 				if(emergency_shuttle.departed && emergency_shuttle.evac)
 					if(isNotAdminLevel(playerTurf.z))
-						to_chat(Player, "<span class='filter_system'><font color='blue'><b>You survived the round, but remained on [station_name()] as [Player.real_name].</b></font></span>")
+						to_chat(Player, "<span class='filter_system'>[span_blue("<b>You survived the round, but remained on [station_name()] as [Player.real_name].</b>")]</span>")
 					else
-						to_chat(Player, "<span class='filter_system'><font color='green'><b>You managed to survive the events on [station_name()] as [Player.real_name].</b></font></span>")
+						to_chat(Player, "<span class='filter_system'>[span_green("<b>You managed to survive the events on [station_name()] as [Player.real_name].</b>")]</span>")
 				else if(isAdminLevel(playerTurf.z))
-					to_chat(Player, "<span class='filter_system'><font color='green'><b>You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].</b></font></span>")
+					to_chat(Player, "<span class='filter_system'>[span_green("<b>You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].</b>")]</span>")
 				else if(issilicon(Player))
-					to_chat(Player, "<span class='filter_system'><font color='green'><b>You remain operational after the events on [station_name()] as [Player.real_name].</b></font></span>")
+					to_chat(Player, "<span class='filter_system'>[span_green("<b>You remain operational after the events on [station_name()] as [Player.real_name].</b>")]</span>")
 				else
-					to_chat(Player, "<span class='filter_system'><font color='blue'><b>You missed the crew transfer after the events on [station_name()] as [Player.real_name].</b></font></span>")
+					to_chat(Player, "<span class='filter_system'>[span_blue("<b>You missed the crew transfer after the events on [station_name()] as [Player.real_name].</b>")]</span>")
 			else
 				if(istype(Player,/mob/observer/dead))
 					var/mob/observer/dead/O = Player
 					if(!O.started_as_observer)
-						to_chat(Player, "<span class='filter_system'><font color='red'><b>You did not survive the events on [station_name()]...</b></font></span>")
+						to_chat(Player, "<span class='filter_system'>[span_red("<b>You did not survive the events on [station_name()]...</b>")]</span>")
 				else
-					to_chat(Player, "<span class='filter_system'><font color='red'><b>You did not survive the events on [station_name()]...</b></font></span>")
+					to_chat(Player, "<span class='filter_system'>[span_red("<b>You did not survive the events on [station_name()]...</b>")]</span>")
 	to_world("<br>")
 
 	for (var/mob/living/silicon/ai/aiPlayer in mob_list)

code/controllers/subsystems/vote.dm

@@ -104,7 +104,7 @@ SUBSYSTEM_DEF(vote)
 					else
 						factor = 1.4
 				choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor)
-				to_world("<font color='purple'>Crew Transfer Factor: [factor]</font>")
+				to_world(span_purple("Crew Transfer Factor: [factor]"))
 				greatest_votes = max(choices["Initiate Crew Transfer"], choices["Extend the Shift"]) //VOREStation Edit
 
 	. = list() // Get all options with that many votes and return them in a list
@@ -137,7 +137,7 @@ SUBSYSTEM_DEF(vote)
 		if(mode == VOTE_ADD_ANTAGONIST)
 			antag_add_failed = 1
 	log_vote(text)
-	to_chat(world, "<font color='purple'>[text]</font>")
+	to_chat(world, span_purple("[text]"))
 
 /datum/controller/subsystem/vote/proc/result()
 	. = announce_result()
@@ -166,7 +166,7 @@ SUBSYSTEM_DEF(vote)
 	if(mode == VOTE_GAMEMODE) //fire this even if the vote fails.
 		if(!round_progressing)
 			round_progressing = 1
-			to_world("<font color='red'><b>The round will start soon.</b></font>")
+			to_world(span_red("<b>The round will start soon.</b>"))
 
 	if(restart)
 		to_world("World restarting due to vote...")
@@ -252,15 +252,15 @@ SUBSYSTEM_DEF(vote)
 
 		log_vote(text)
 
-		to_world("<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=\ref[src]'>here</a> to place your votes.\nYou have [config.vote_period / 10] seconds to vote.</font>")
+		to_world(span_purple("<b>[text]</b>\nType <b>vote</b> or click <a href='?src=\ref[src]'>here</a> to place your votes.\nYou have [config.vote_period / 10] seconds to vote."))
 		if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE || vote_type == VOTE_CUSTOM)
 			world << sound('sound/misc/notice1.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) //YW Edit
 
 
 		if(mode == VOTE_GAMEMODE && round_progressing)
 			gamemode_vote_called = TRUE
 			round_progressing = 0
-			to_world("<font color='red'><b>Round start has been delayed.</b></font>")
+			to_world(span_red("<b>Round start has been delayed.</b>"))
 
 		time_remaining = round(config.vote_period / 10)
 		return 1
@@ -309,13 +309,13 @@ SUBSYSTEM_DEF(vote)
 		if(admin || config.allow_vote_restart)
 			. += "<a href='?src=\ref[src];vote=restart'>Restart</a>"
 		else
-			. += "<font color='grey'>Restart (Disallowed)</font>"
+			. += span_gray("Restart (Disallowed)")
 		. += "</li><li>"
 
 		if(admin || config.allow_vote_restart)
 			. += "<a href='?src=\ref[src];vote=crew_transfer'>Crew Transfer</a>"
 		else
-			. += "<font color='grey'>Crew Transfer (Disallowed)</font>"
+			. += span_gray("Crew Transfer (Disallowed)")
 
 		if(admin)
 			. += "\t(<a href='?src=\ref[src];[HrefToken()];vote=toggle_restart'>[config.allow_vote_restart ? "Allowed" : "Disallowed"]</a>)"
@@ -324,7 +324,7 @@ SUBSYSTEM_DEF(vote)
 		if(admin || config.allow_vote_mode)
 			. += "<a href='?src=\ref[src];vote=gamemode'>GameMode</a>"
 		else
-			. += "<font color='grey'>GameMode (Disallowed)</font>"
+			. += span_gray("GameMode (Disallowed)")
 
 		if(admin)
 			. += "\t(<a href='?src=\ref[src];[HrefToken()];vote=toggle_gamemode'>[config.allow_vote_mode ? "Allowed" : "Disallowed"]</a>)"
@@ -333,7 +333,7 @@ SUBSYSTEM_DEF(vote)
 		if(!antag_add_failed && config.allow_extra_antags)
 			. += "<a href='?src=\ref[src];vote=add_antagonist'>Add Antagonist Type</a>"
 		else
-			. += "<font color='grey'>Add Antagonist (Disallowed)</font>"
+			. += span_gray("Add Antagonist (Disallowed)")
 		. += "</li>"
 
 		if(admin)

code/datums/mind.dm

@@ -143,9 +143,9 @@
 		for(var/datum/objective/O in objectives)
 			out += "<b>Objective #[num]:</b> [O.explanation_text] "
 			if(O.completed)
-				out += "(<font color='green'>complete</font>)"
+				out += "([span_green("complete")])"
 			else
-				out += "(<font color='red'>incomplete</font>)"
+				out += "([span_red("incomplete")])"
 			out += " <a href='?src=\ref[src];[HrefToken()];obj_completed=\ref[O]'>\[toggle\]</a>"
 			out += " <a href='?src=\ref[src];[HrefToken()];obj_delete=\ref[O]'>\[remove\]</a><br>"
 			num++
@@ -419,7 +419,7 @@
 
 	else if (href_list["obj_announce"])
 		var/obj_count = 1
-		to_chat(current, "<font color='blue'>Your current objectives:</font>")
+		to_chat(current, span_blue("Your current objectives:"))
 		for(var/datum/objective/objective in objectives)
 			to_chat(current, "<B>Objective #[obj_count]</B>: [objective.explanation_text]")
 			obj_count++

code/datums/observation/stat_set.dm

@@ -22,3 +22,12 @@ GLOBAL_DATUM_INIT(stat_set_event, /decl/observ/stat_set, new)
 	. = ..()
 	if(stat != old_stat)
 		GLOB.stat_set_event.raise_event(src, old_stat, new_stat)
+
+		if(isbelly(src.loc))
+			var/obj/belly/ourbelly = src.loc
+			if(!ourbelly.owner.client)
+				return
+			if(stat == CONSCIOUS)
+				to_chat(ourbelly.owner, "<span class='notice'>\The [src.name] is awake.</span>")
+			else if(stat == UNCONSCIOUS)
+				to_chat(ourbelly.owner, "<span class='red'>\The [src.name] has fallen unconscious!</span>")

code/datums/supplypacks/recreation.dm

@@ -38,7 +38,7 @@
 /datum/supply_pack/recreation/donksoftborg
 	name = "Donk-Soft Cyborg Blaster Crate"
 	contains = list(
-			/obj/item/borg/upgrade/toygun = 2,
+			/obj/item/borg/upgrade/no_prod/toygun = 2,
 			)
 	cost = 35
 	containertype = /obj/structure/closet/crate/allico
@@ -136,4 +136,4 @@
 	contains = list(
 			/obj/machinery/porta_turret/lasertag/blue,
 			/obj/machinery/porta_turret/lasertag/red
-			)
+			)

code/game/antagonist/antagonist_print.dm

@@ -16,17 +16,17 @@
 			for(var/datum/objective/O in P.objectives)
 				text += print_objective(O, num)
 				if(O.check_completion())
-					text += "<font color='green'><B>Success!</B></font>"
+					text += span_green("<B>Success!</B>")
 					feedback_add_details(feedback_tag,"[O.type]|SUCCESS")
 				else
-					text += "<font color='red'>Fail.</font>"
+					text += span_red("Fail.")
 					feedback_add_details(feedback_tag,"[O.type]|FAIL")
 					failed = TRUE
 				num++
 			if(failed)
-				text += "<br><font color='red'><B>The [role_text] has failed.</B></font>"
+				text += "<br>" + span_red("<B>The [role_text] has failed.</B>")
 			else
-				text += "<br><font color='green'><B>The [role_text] was successful!</B></font>"
+				text += "<br>" + span_green("<B>The [role_text] was successful!</B>")
 
 	if(global_objectives && global_objectives.len)
 		text += "<BR><FONT size = 2>Their objectives were:</FONT>"
@@ -42,9 +42,9 @@
 	var/text = "<br><b>Objective [num]:</b> [O.explanation_text] "
 	if(append_success)
 		if(O.check_completion())
-			text += "<font color='green'><B>Success!</B></font>"
+			text += span_green("<B>Success!</B>")
 		else
-			text += "<font color='red'>Fail.</font>"
+			text += span_red("Fail.")
 	return text
 
 /datum/antagonist/proc/print_player_lite(var/datum/mind/ply)

code/game/atoms.dm

@@ -691,7 +691,7 @@
 		return
 	var/list/speech_bubble_hearers = list()
 	for(var/mob/M in get_mobs_in_view(7, src))
-		M.show_message("<span class='game say'><span class='name'>[src]</span> [atom_say_verb], \"[message]\"</span>", 2, null, 1)
+		M.show_message("<span class='npcsay'><span class='name'>[src]</span> [atom_say_verb], \"[message]\"</span>", 2, null, 1)
 		if(M.client)
 			speech_bubble_hearers += M.client
 

code/game/dna/dna_modifier.dm

@@ -217,7 +217,7 @@
 		if(!M.client && M.mind)
 			for(var/mob/observer/dead/ghost in player_list)
 				if(ghost.mind == M.mind)
-					to_chat(ghost, "<b><font color = #330033><font size = 3>Your corpse has been placed into a cloning scanner. Return to your body if you want to be resurrected/cloned!</b> (Verbs -> Ghost -> Re-enter corpse)</font></font>")
+					to_chat(ghost, span_interface("<font size = 3><b>Your corpse has been placed into a cloning scanner. Return to your body if you want to be resurrected/cloned!</b> (Verbs -> Ghost -> Re-enter corpse)</font>"))
 					break
 	SStgui.update_uis(src)
 

code/game/gamemodes/cult/runes.dm

@@ -357,9 +357,9 @@ var/list/sacrificed = list()
 	else if(!corpse_to_raise.client && corpse_to_raise.mind) //Don't force the dead person to come back if they don't want to.
 		for(var/mob/observer/dead/ghost in player_list)
 			if(ghost.mind == corpse_to_raise.mind)
-				to_chat(ghost, "<b><font color = #330033><font size = 3>The cultist [usr.real_name] is trying to \
+				to_chat(ghost, span_interface("<b><font size = 3>The cultist [usr.real_name] is trying to \
 				revive you. Return to your body if you want to be resurrected into the service of Nar'Sie!</b> \
-				(Verbs -> Ghost -> Re-enter corpse)</font></font>")
+				(Verbs -> Ghost -> Re-enter corpse)</font>"))
 				break
 
 	sleep(10 SECONDS)

code/game/gamemodes/events/holidays/Holidays.dm

@@ -268,11 +268,11 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 			holidays.Add(p)
 			holiday_blurbs.Add("[Holiday[p]]")
 		var/holidays_string = english_list(holidays, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" )
-		to_world("<font color='blue'>and...</font>")
+		to_world(span_blue("and..."))
 		to_world("<h4>Happy [holidays_string] Everybody!</h4>")
 		if(holiday_blurbs.len != 0)
 			for(var/blurb in holiday_blurbs)
-				to_world("<div align='center'><font color='blue'>[blurb]</font></div>")
+				to_world(span_blue("<div align='center'>[blurb]</div>"))
 		switch(Holiday)			//special holidays
 			if("Easter")
 				//do easter stuff