Cleans Up Rejected Mirror files (#414)

* bang

* updates tgstation.dme

* fixes missing stylesheet entries

* updates the map

includes backup map file

* removes ten billion runtimes

_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej

@@ -1,215 +0,0 @@
-diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm	(rejected hunks)
-@@ -7936,7 +7936,9 @@
- /obj/structure/chair{
- 	dir = 4
- 	},
--/obj/effect/landmark/start/cargo_technician,
-+/obj/effect/landmark/start{
-+	name = "Cargo Technician"
-+	},
- /turf/open/floor/plasteel,
- /area/quartermaster/office)
- "aqV" = (
-@@ -15366,7 +15368,9 @@
- /turf/open/floor/mineral/titanium/blue,
- /area/shuttle/arrival)
- "aHt" = (
--/obj/effect/landmark/observer_start,
-+/obj/effect/landmark{
-+	name = "Observer-Start"
-+	},
- /turf/open/floor/mineral/titanium/blue,
- /area/shuttle/arrival)
- "aHu" = (
-@@ -26739,7 +26743,9 @@
- /obj/structure/chair/office/light{
- 	dir = 1
- 	},
--/obj/effect/landmark/start/roboticist,
-+/obj/effect/landmark/start{
-+	name = "Roboticist"
-+	},
- /turf/open/floor/plasteel/white,
- /area/assembly/robotics)
- "biN" = (
-@@ -59513,7 +59519,7 @@
- 	anchored = 1
- 	},
- /obj/structure/light_construct,
--/turf/open/floor/plasteel/shuttle/white,
-+/turf/open/floor/mineral/titanium,
- /area/shuttle/abandoned)
- "czo" = (
- /turf/open/space,
-@@ -64916,8 +64928,22 @@
- /turf/open/floor/plating,
- /area/shuttle/arrival)
- "cMC" = (
--/turf/closed/wall/r_wall,
--/area/engine/supermatter)
-+/obj/structure/cable{
-+	d1 = 1;
-+	d2 = 8;
-+	icon_state = "1-8"
-+	},
-+/obj/machinery/computer/security/telescreen{
-+	desc = "Used for watching the Engine.";
-+	dir = 8;
-+	layer = 4;
-+	name = "Engine Monitor";
-+	network = list("Engine");
-+	pixel_x = 30;
-+	pixel_y = 0
-+	},
-+/turf/open/floor/plasteel,
-+/area/engine/engineering)
- "cMD" = (
- /turf/closed/wall/r_wall,
- /area/engine/supermatter)
-@@ -64928,21 +64954,33 @@
- /turf/closed/wall/r_wall,
- /area/engine/supermatter)
- "cMG" = (
--/turf/open/floor/engine,
-+/turf/closed/wall/r_wall,
- /area/engine/supermatter)
- "cMH" = (
- /turf/open/floor/engine,
- /area/engine/supermatter)
- "cMI" = (
--/turf/closed/wall/r_wall,
-+/obj/machinery/power/rad_collector{
-+	anchored = 1
-+	},
-+/obj/structure/cable/yellow{
-+	d2 = 8;
-+	icon_state = "0-8"
-+	},
-+/turf/open/floor/engine,
- /area/engine/supermatter)
- "cMJ" = (
--/turf/closed/wall/r_wall,
-+/obj/machinery/power/rad_collector{
-+	anchored = 1
-+	},
-+/obj/structure/cable/yellow{
-+	d2 = 8;
-+	icon_state = "0-8"
-+	},
-+/turf/open/floor/engine,
- /area/engine/supermatter)
- "cMK" = (
--/obj/structure/grille,
--/obj/structure/window/reinforced/highpressure/fulltile,
--/turf/open/floor/plating,
-+/turf/open/floor/engine,
- /area/engine/supermatter)
- "cML" = (
- /turf/closed/wall/r_wall,
-@@ -64951,37 +64989,15 @@
- /turf/closed/wall/r_wall,
- /area/engine/supermatter)
- "cMN" = (
--/obj/structure/cable{
--	d1 = 1;
--	d2 = 8;
--	icon_state = "1-8"
--	},
--/obj/machinery/computer/security/telescreen{
--	desc = "Used for watching the Engine.";
--	dir = 8;
--	layer = 4;
--	name = "Engine Monitor";
--	network = list("Engine");
--	pixel_x = 30;
--	pixel_y = 0
--	},
--/turf/open/floor/plasteel,
--/area/engine/engineering)
-+/obj/structure/grille,
-+/obj/structure/window/reinforced/highpressure/fulltile,
-+/turf/open/floor/plating,
-+/area/engine/supermatter)
- "cMO" = (
--/obj/machinery/power/rad_collector{
--	anchored = 1
--	},
--/obj/structure/cable/yellow{
--	d2 = 8;
--	icon_state = "0-8"
--	},
--/obj/machinery/camera{
--	c_tag = "Supermatter Chamber";
--	dir = 2;
--	network = list("Engine");
--	pixel_x = 23
--	},
--/turf/open/floor/engine,
-+/turf/closed/wall/r_wall,
-+/area/engine/supermatter)
-+"cMP" = (
-+/turf/closed/wall/r_wall,
- /area/engine/supermatter)
- 
- (1,1,1) = {"
-@@ -93185,11 +93201,11 @@ cpy
- cDv
- cDD
- cqU
--cMC
--cMO
--cEu
-+cMF
- cEu
--cMC
-+cMI
-+cMJ
-+cML
- cFL
- cGf
- cGw
-@@ -93441,12 +93457,12 @@ chV
- cDq
- cqf
- cqD
--cMC
-+cME
- crs
- cEv
- cEv
- cFe
--cMC
-+cMM
- cFM
- czE
- cGx
-@@ -94468,13 +94484,13 @@ ccw
- cii
- cDq
- cqi
--cMC
-+cMD
- cAP
- crv
- cEy
- cEy
- cFh
--cMC
-+cMO
- cFQ
- czE
- cGx
-@@ -94727,11 +94743,11 @@ cDr
- cDw
- cDE
- cEa
--cMC
-+cMG
- cEz
- cEz
- cEz
--cMC
-+cMP
- cFR
- cGf
- cGz

code/game/machinery/cloning.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm	(rejected hunks)
-@@ -130,7 +130,7 @@
- 	// We want to simulate the clone not being in contact with
- 	// the atmosphere, so we'll put them in a constant pressure
- 	// nitrogen. They'll breathe through the chemicals we pump into them.
--	var/global/datum/gas_mixture/immutable/cloner/GM //global so that there's only one instance made for all cloning pods
-+	var/static/datum/gas_mixture/immutable/cloner/GM //global so that there's only one instance made for all cloning pods
- 	if(!GM)
- 		GM = new
- 	return GM

code/game/turfs/space/space.dm.rej

@@ -1,17 +0,0 @@
-diff a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm	(rejected hunks)
-@@ -12,7 +12,7 @@
- 	var/destination_x
- 	var/destination_y
- 
--	var/global/datum/gas_mixture/space/space_gas = new
-+	var/global/datum/gas_mixture/immutable/space/space_gas = new
- 	plane = PLANE_SPACE
- 	light_power = 0.25
- 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-@@ -210,4 +210,4 @@
- 			to_chat(user, "<span class='notice'>You build a floor.</span>")
- 			ChangeTurf(/turf/open/floor/plating)
- 			return TRUE
--	return FALSE
-\ No newline at end of file
-+	return FALSE

code/modules/admin/admin_verbs.dm

@@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(admin_verbs_default, AVerbsDefault())
 	/client/proc/reestablish_db_connection,/*reattempt a connection to the database*/
 	/client/proc/cmd_admin_pm_context,	/*right-click adminPM interface*/
 	/client/proc/cmd_admin_pm_panel,		/*admin-pm list*/
-	/client/proc/mentor_memo,			/*mentor memo system. show/delete/write. +SERVER needed to delete mentor memos of others*/
+//	/client/proc/mentor_memo,			/*mentor memo system. show/delete/write. +SERVER needed to delete mentor memos of others*/
 	/client/proc/stop_sounds
 	)
 GLOBAL_PROTECT(admin_verbs_admin)

code/modules/admin/verbs/debug.dm.rej

@@ -1,24 +0,0 @@
-diff a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm	(rejected hunks)
-@@ -90,14 +90,16 @@ GLOBAL_PROTECT(AdminProcCall)
- 		UNTIL(!GLOB.AdminProcCall)
- 		to_chat(usr, "<span class='adminnotice'>Running your proc</span>")
- 	GLOB.AdminProcCall = usr.client.ckey	//if this runtimes, too bad for you
--	try
--		if(target == GLOBAL_PROC)
--			. = call(procname)(arglist(arguments))
--		else
--			. = call(procname)(arglist(arguments))
--	catch(exception/E)
-+	world.WrapAdminProcCall(target, procname, arguments)
- 	GLOB.AdminProcCall = null
- 
-+//adv proc call this, ya nerds
-+/world/proc/WrapAdminProcCall(target, procname, list/arguments)
-+	if(target == GLOBAL_PROC)
-+		return call(procname)(arglist(arguments))
-+	else
-+		return call(procname)(arglist(arguments))
-+
- /proc/IsAdminAdvancedProcCall()
- 	return usr && usr.client && GLOB.AdminProcCall == usr.client.ckey
- 

code/modules/atmospherics/environmental/LINDA_turf_tile.dm.rej

@@ -1,14 +0,0 @@
-diff a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm	(rejected hunks)
-@@ -322,10 +322,10 @@
- 
- 	for(var/t in turf_list)
- 		var/turf/open/T = t
--		if (space_is_all_consuming && !space_in_group && istype(T.air, /datum/gas_mixture/space))
-+		if (space_is_all_consuming && !space_in_group && istype(T.air, /datum/gas_mixture/immutable/space))
- 			space_in_group = 1
- 			qdel(A)
--			A = new/datum/gas_mixture/space()
-+			A = new/datum/gas_mixture/immutable/space()
- 		A.merge(T.air)
- 
- 	for(var/id in A_gases)

code/modules/atmospherics/gasmixtures/immutable_mixtures.dm.rej

@@ -1,28 +0,0 @@
-diff a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm	(rejected hunks)
-@@ -12,6 +12,9 @@
- 	..()
- 	reset_gas_mix()
- 
-+/datum/gas_mixture/immutable/garbage_collect()
-+	reset_gas_mix()
-+
- /datum/gas_mixture/immutable/archive()
- 	return 1 //nothing changes, so we do nothing and the archive is successful
- 
-@@ -63,3 +66,16 @@
- 
- /datum/gas_mixture/immutable/space/remove_ratio()
- 	return copy() //we're always empty, so we can just return a copy.
-+
-+
-+//used by cloners
-+/datum/gas_mixture/immutable/cloner
-+	initial_temperature = T20C
-+
-+/datum/gas_mixture/immutable/cloner/reset_gas_mix()
-+	assert_gas("n2")
-+	gases["n2"][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
-+	..()
-+
-+/datum/gas_mixture/immutable/cloner/heat_capacity()
-+	return (MOLES_O2STANDARD + MOLES_N2STANDARD)*20 //specific heat of nitrogen is 20

code/modules/client/client_procs.dm

@@ -68,7 +68,7 @@
 		if (topiclimiter[SECOND_COUNT] > config.secondtopiclimit)
 			to_chat(src, "<span class='danger'>Your previous action was ignored because you've done too many in a second</span>")
 			return
-
+/*
 	if(href_list["mentor_msg"])
 		if(config.mentors_mobname_only)
 			var/mob/M = locate(href_list["mentor_msg"])
@@ -76,7 +76,7 @@
 		else
 			cmd_mentor_pm(href_list["mentor_msg"],null)
 		return
-
+*/
 	//Logs all hrefs
 	if(config && config.log_hrefs && GLOB.href_logfile)
 		GLOB.href_logfile << "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"

code/modules/client/verbs/who.dm

@@ -2,65 +2,59 @@
 	set name = "Who"
 	set category = "OOC"
 
-	var/msg = "<b>Current Population:</b>\n"
+	var/msg = "<b>Current Players:</b>\n"
 
 	var/list/Lines = list()
 
-	if(length(GLOB.admins) > 0)
-		Lines += "<b>Admins:</b>"
-		for(var/client/C in sortList(GLOB.admins))
-			if(!C.holder.fakekey)
-				Lines += "\t <font color='#FF0000'>[C.key]</font>[show_info(C)]"
+	if(holder)
+		if (check_rights(R_ADMIN,0) && isobserver(src.mob))//If they have +ADMIN and are a ghost they can see players IC names and statuses.
+			var/mob/dead/observer/G = src.mob
+			if(!G.started_as_observer)//If you aghost to do this, KorPhaeron will deadmin you in your sleep.
+				log_admin("[key_name(usr)] checked advanced who in-round")
+			for(var/client/C in GLOB.clients)
+				var/entry = "\t[C.key]"
+				if(C.holder && C.holder.fakekey)
+					entry += " <i>(as [C.holder.fakekey])</i>"
+				if (isnewplayer(C.mob))
+					entry += " - <font color='darkgray'><b>In Lobby</b></font>"
+				else
+					entry += " - Playing as [C.mob.real_name]"
+					switch(C.mob.stat)
+						if(UNCONSCIOUS)
+							entry += " - <font color='darkgray'><b>Unconscious</b></font>"
+						if(DEAD)
+							if(isobserver(C.mob))
+								var/mob/dead/observer/O = C.mob
+								if(O.started_as_observer)
+									entry += " - <font color='gray'>Observing</font>"
+								else
+									entry += " - <font color='black'><b>DEAD</b></font>"
+							else
+								entry += " - <font color='black'><b>DEAD</b></font>"
+					if(is_special_character(C.mob))
+						entry += " - <b><font color='red'>Antagonist</font></b>"
+				entry += " (<A HREF='?_src_=holder;adminmoreinfo=\ref[C.mob]'>?</A>)"
+				entry += " ([round(C.avgping, 1)]ms)"
+				Lines += entry
+		else//If they don't have +ADMIN, only show hidden admins
+			for(var/client/C in GLOB.clients)
+				var/entry = "\t[C.key]"
+				if(C.holder && C.holder.fakekey)
+					entry += " <i>(as [C.holder.fakekey])</i>"
+				entry += " ([round(C.avgping, 1)]ms)"
+				Lines += entry
+	else
+		for(var/client/C in GLOB.clients)
+			if(C.holder && C.holder.fakekey)
+				Lines += "[C.holder.fakekey] ([round(C.avgping, 1)]ms)"
+			else
+				Lines += "[C.key] ([round(C.avgping, 1)]ms)"
 
-	if(length(GLOB.mentors) > 0)
-		Lines += "<b>Mentors:</b>"
-		for(var/client/C in sortList(GLOB.clients))
-			var/mentor = GLOB.mentor_datums[C.ckey]
-			if(mentor)
-				Lines += "\t <font color='#0033CC'>[C.key]</font>[show_info(C)]"
-
-	Lines += "<b>Players:</b>"
-	for(var/client/C in sortList(GLOB.clients))
-		if(!check_mentor_other(C) || (C.holder && C.holder.fakekey))
-			Lines += "\t [C.key][show_info(C)]"
-
-	for(var/line in Lines)
+	for(var/line in sortList(Lines))
 		msg += "[line]\n"
 
 	msg += "<b>Total Players: [length(Lines)]</b>"
-	src << msg
-
-/client/proc/show_info(var/client/C)
-	if(!C)
-		return ""
-
-	if(!src.holder)
-		return ""
-
-	var/entry = ""
-	if(C.holder && C.holder.fakekey)
-		entry += " <i>(as [C.holder.fakekey])</i>"
-	if (isnewplayer(C.mob))
-		entry += " - <font color='darkgray'><b>In Lobby</b></font>"
-	else
-		entry += " - Playing as [C.mob.real_name]"
-		switch(C.mob.stat)
-			if(UNCONSCIOUS)
-				entry += " - <font color='darkgray'><b>Unconscious</b></font>"
-			if(DEAD)
-				if(isobserver(C.mob))
-					var/mob/dead/observer/O = C.mob
-					if(O.started_as_observer)
-						entry += " - <font color='gray'>Observing</font>"
-					else
-						entry += " - <font color='black'><b>DEAD</b></font>"
-				else
-					entry += " - <font color='black'><b>DEAD</b></font>"
-		if(is_special_character(C.mob))
-			entry += " - <b><font color='red'>Antagonist</font></b>"
-	entry += " (<A HREF='?_src_=holder;adminmoreinfo=\ref[C.mob]'>?</A>)"
-	entry += " ([round(C.avgping, 1)]ms)"
-	return entry
+	to_chat(src, msg)
 
 /client/verb/adminwho()
 	set category = "Admin"
@@ -91,23 +85,4 @@
 			if(!C.holder.fakekey)
 				msg += "\t[C] is a [C.holder.rank]\n"
 		msg += "<span class='info'>Adminhelps are also sent to IRC. If no admins are available in game adminhelp anyways and an admin on IRC will see it and respond.</span>"
-	src << msg
-
-/client/verb/mentorwho()
-	set category = "Mentor"
-	set name = "Mentorwho"
-	var/msg = "<b>Current Mentors:</b>\n"
-	for(var/client/C in GLOB.mentors)
-		var/suffix = ""
-		if(holder)
-			if(isobserver(C.mob))
-				suffix += " - Observing"
-			else if(istype(C.mob,/mob/dead/new_player))
-				suffix += " - Lobby"
-			else
-				suffix += " - Playing"
-
-			if(C.is_afk())
-				suffix += " (AFK)"
-		msg += "\t[C][suffix]\n"
 	to_chat(src, msg)

code/world.dm

@@ -40,7 +40,8 @@
 	load_mode()
 	load_motd()
 	load_admins()
-	load_mentors()
+//disabled to prevent runtimes until it's fixed
+//	load_mentors()
 	if(config.usewhitelist)
 		load_whitelist()
 	LoadBans()

interface/stylesheet.dm

@@ -150,4 +150,7 @@ BIG IMG.icon 			{width: 32px; height: 32px;}
 .drone					{color: #848482;}
 .monkey					{color: #975032;}
 .swarmer				{color: #2C75FF;}
+
+.love					{color: #FF69Bf;}
+.lovebold				{color: #FF69Bf;	font-weight: bold;}
 </style>"}

tgstation.dme

@@ -1436,13 +1436,6 @@
 #include "code\modules\mapping\map_template.dm"
 #include "code\modules\mapping\reader.dm"
 #include "code\modules\mapping\ruins.dm"
-#include "code\modules\mentor\follow.dm"
-#include "code\modules\mentor\holder2.dm"
-#include "code\modules\mentor\mentor_ranks.dm"
-#include "code\modules\mentor\verbs\mentor_memo.dm"
-#include "code\modules\mentor\verbs\mentorhelp.dm"
-#include "code\modules\mentor\verbs\mentorpm.dm"
-#include "code\modules\mentor\verbs\mentorsay.dm"
 #include "code\modules\mining\abandoned_crates.dm"
 #include "code\modules\mining\aux_base.dm"
 #include "code\modules\mining\aux_base_camera.dm"

tgstation.dme.rej

@@ -1,11 +0,0 @@
-diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
-@@ -1030,8 +1030,8 @@
- #include "code\modules\atmospherics\environmental\LINDA_turf_tile.dm"
- #include "code\modules\atmospherics\gasmixtures\gas_mixture.dm"
- #include "code\modules\atmospherics\gasmixtures\gas_types.dm"
-+#include "code\modules\atmospherics\gasmixtures\immutable_mixtures.dm"
- #include "code\modules\atmospherics\gasmixtures\reactions.dm"
--#include "code\modules\atmospherics\gasmixtures\space_mixture.dm"
- #include "code\modules\atmospherics\machinery\airalarm.dm"
- #include "code\modules\atmospherics\machinery\atmosmachinery.dm"
- #include "code\modules\atmospherics\machinery\datum_pipeline.dm"