(R-UST) please end my pain

cev_eris.dme

@@ -2836,4 +2836,61 @@
 #include "maps\submaps\planetary_ruins\radshrine\radshrine.dm"
 #include "maps\submaps\planetary_ruins\spider_nest\spider_nest.dm"
 #include "maps\submaps\planetary_ruins\tar_anomaly\tar_anomaly.dm"
+#include "proxima\code\game\atoms.dm"
+#include "proxima\code\game\objects\effects\misc.dm"
+#include "proxima\code\game\objects\structures\window.dm"
+#include "proxima\code\game\turf\flooring\flooring_decals.dm"
+#include "proxima\code\game\turf\simulated\walls.dm"
+#include "proxima\code\modules\factions\avalon\church.dm"
+#include "proxima\code\modules\factions\command\command.dm"
+#include "proxima\code\modules\factions\ftu\ftu.dm"
+#include "proxima\code\modules\factions\hephestus\engineering.dm"
+#include "proxima\code\modules\factions\lawson_arms\lawson_arms.dm"
+#include "proxima\code\modules\factions\mirania\mirania.dm"
+#include "proxima\code\modules\factions\nt\nanotrasens.dm"
+#include "proxima\code\modules\factions\pcrc\jobs.dm"
+#include "proxima\code\modules\factions\pcrc\pcrc.dm"
+#include "proxima\code\modules\factions\zeng-hu\medical.dm"
+#include "proxima\code\modules\factions\zeng-hu\science.dm"
+#include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm"
+//#include "proxima\code\modules\power\fusion\fusion.dm"
+#include "proxima\code\modules\power\fusion\consoles\_consoles.dm"
+#include "proxima\code\modules\power\fusion\consoles\core_control.dm"
+#include "proxima\code\modules\power\fusion\consoles\gyrotron_control.dm"
+#include "proxima\code\modules\power\fusion\consoles\injector_control.dm"
+#include "proxima\code\modules\power\fusion\core\_core.dm"
+#include "proxima\code\modules\power\fusion\core\core_field.dm"
+#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_assembly.dm"
+#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_compressor.dm"
+#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_injector.dm"
+#include "proxima\code\modules\power\fusion\gyrotron\gyrotron.dm"
+#include "proxima\code\modules\power\fusion\fusion_circuits.dm"
+#include "proxima\code\modules\power\fusion\fusion_particle_catcher.dm"
+#include "proxima\code\modules\power\fusion\fusion_reactions.dm"
+#include "proxima\code\modules\power\fusion\kinetic_harvester.dm"
+
+#include "proxima\code\modules\TGS\_TGSDefines.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\includes.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\core\_definitions.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\core\core.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\core\datum.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\core\tgs_version.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v3210\api.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v3210\commands.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v4\api.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v4\commands.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\__interop_version.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\_defines.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\api.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\bridge.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\chunking.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\commands.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\serializers.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\topic.dm"
+#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\undefs.dm"
+#include "proxima\code\modules\TGS\TGSIntegration\TGSChatCommands.dm"
+#include "proxima\code\modules\TGS\TGSIntegration\TGSChatHelpers.dm"
+#include "proxima\code\modules\TGS\TGSIntegration\TGSChatHooks.dm"
+#include "proxima\code\modules\TGS\TGSIntegration\TGSIntegrationFiles.dm"
 // END_INCLUDE

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -22,6 +22,7 @@
 	 2: Nitrogen: Nitrogen ONLY
 	 3: Carbon Dioxide: Carbon Dioxide ONLY
 	 4: Sleeping Agent (N2O)
+	 5: Hydrogen
 	*/
 	var/filter_type = -1
 	var/list/filtered_out = list()
@@ -49,6 +50,8 @@
 			filtered_out = list("carbon_dioxide")
 		if(4)//removing N2O
 			filtered_out = list("sleeping_agent")
+		if(5)//removing h2
+			filtered_out = list("hydrogen")
 
 	air1.volume = ATMOS_DEFAULT_VOLUME_FILTER
 	air2.volume = ATMOS_DEFAULT_VOLUME_FILTER
@@ -168,6 +171,8 @@
 			current_filter_type = "Carbon Dioxide"
 		if(4)
 			current_filter_type = "Nitrous Oxide"
+		if(5)
+			current_filter_type = "Hydrogen"
 		if(-1)
 			current_filter_type = "Nothing"
 		else
@@ -182,6 +187,7 @@
 			<A href='?src=\ref[src];filterset=2'>Nitrogen</A><BR>
 			<A href='?src=\ref[src];filterset=3'>Carbon Dioxide</A><BR>
 			<A href='?src=\ref[src];filterset=4'>Nitrous Oxide</A><BR>
+			<A href='?src=\ref[src];filterset=5'>Hydrogen</A><BR>
 			<A href='?src=\ref[src];filterset=-1'>Nothing</A><BR>
 			<HR>
 			<B>Set Flow Rate Limit:</B>
@@ -213,6 +219,8 @@
 				filtered_out += "carbon_dioxide"
 			if(4)//removing N2O
 				filtered_out += "sleeping_agent"
+			if(5)//removing h2
+				filtered_out += "hydrogen"
 
 	if (href_list["temp"])
 		src.temp = null

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -26,7 +26,7 @@
 	var/last_zas_update = null
 
 	var/scrubbing = SCRUBBING
-	var/list/scrubbing_gas = list("carbon_dioxide","sleeping_agent","plasma")
+	var/list/scrubbing_gas = list("carbon_dioxide","sleeping_agent","plasma", "hydrogen")
 	var/expanded_range = FALSE
 
 	var/panic = FALSE //is this scrubber panicked?
@@ -108,6 +108,7 @@
 		"filter_n2" = ("nitrogen" in scrubbing_gas),
 		"filter_co2" = ("carbon_dioxide" in scrubbing_gas),
 		"filter_plasma" = ("plasma" in scrubbing_gas),
+		"filter_h2" = ("hydrogen" in scrubbing_gas),
 		"filter_n2o" = ("sleeping_agent" in scrubbing_gas),
 		"sigtype" = "status"
 	)
@@ -239,6 +240,11 @@
 	else if(signal.data["toggle_tox_scrub"])
 		toggle += "plasma"
 
+	if(!isnull(signal.data["h2_scrub"]) && text2num(signal.data["h2_scrub"]) != ("hydrogen" in scrubbing_gas))
+		toggle += "hydrogen"
+	else if(signal.data["toggle_h2_scrub"])
+		toggle += "hydrogen"
+
 	if(!isnull(signal.data["n2o_scrub"]) && text2num(signal.data["n2o_scrub"]) != ("sleeping_agent" in scrubbing_gas))
 		toggle += "sleeping_agent"
 	else if(signal.data["toggle_n2o_scrub"])

code/ATMOSPHERICS/pipes.dm

@@ -1180,6 +1180,21 @@
 	..()
 	icon_state = "plasma"
 
+/obj/machinery/atmospherics/pipe/tank/hydrogen
+	name = "Pressure Tank (Hydrogen)"
+	description_antag = "Will make people suddenly combust"
+	icon_state = "h2_map"
+
+/obj/machinery/atmospherics/pipe/tank/hydrogen/New()
+	air_temporary = new
+	air_temporary.volume = volume
+	air_temporary.temperature = T20C
+
+	air_temporary.adjust_gas("hydrogen", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+
+	..()
+	icon_state = "hydrogen"
+
 /obj/machinery/atmospherics/pipe/tank/nitrous_oxide
 	name = "Pressure Tank (Nitrous Oxide)"
 	icon_state = "n2o_map"

code/ZAS/Controller.dm

@@ -368,6 +368,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
 	if(A.plasma != B.plasma) return 0
 	if(A.carbon_dioxide != B.carbon_dioxide) return 0
 	if(A.temperature != B.temperature) return 0
+	if(A.hydrogen != B.hydrogen) return 0
 	return 1
 
 /datum/controller/air_system/proc/remove_edge(connection_edge/E)

code/ZAS/Turf.dm

@@ -272,6 +272,7 @@
 		GM.gas["carbon_dioxide"] = (carbon_dioxide/sum)*amount
 		GM.gas["nitrogen"] = (nitrogen/sum)*amount
 		GM.gas["plasma"] = (plasma/sum)*amount
+		GM.gas["hydrogen"] = (hydrogen/sum)*amount
 
 	GM.temperature = temperature
 	GM.update_values()

code/__DEFINES/atmos.dm

@@ -94,6 +94,7 @@
 #define ATMOSTANK_OXYGEN        40000 // O2 is also important for airmix, but not as much as N2 as it's only 21% of it.
 #define ATMOSTANK_CO2           25000 // CO2 and PH are not critically important for station, only for toxins and alternative coolants, no need to store a lot of those.
 #define ATMOSTANK_PLASMA        25000
+#define ATMOSTANK_HYDROGEN		100000
 #define ATMOSTANK_NITROUSOXIDE  10000 // N2O doesn't have a real useful use, i guess it's on station just to allow refilling of sec's riot control canisters?
 
 #define R_IDEAL_GAS_EQUATION       8.31    // kPa*L/(K*mol).

code/__DEFINES/colors.dm

@@ -44,6 +44,7 @@
 #define COLOR_BOTTLE_GREEN     "#1f6b4f"
 #define COLOR_PALE_BTL_GREEN   "#57967f"
 #define COLOR_GUNMETAL         "#545c68"
+#define COLOR_WALL_GUNMETAL    "#353a42"
 #define COLOR_MUZZLE_FLASH     "#ffffb2"
 #define COLOR_CHESTNUT         "#996633"
 #define COLOR_BEASTY_BROWN     "#663300"
@@ -52,6 +53,7 @@
 #define COLOR_LIGHT_CYAN       "#66ccff"
 #define COLOR_PAKISTAN_GREEN   "#006600"
 #define COLOR_HULL             "#436b8e"
+#define COLOR_HULL_BLUE        "#436b8e"
 #define COLOR_AMBER            "#ffbf00"
 #define COLOR_COMMAND_BLUE     "#46698c"
 #define COLOR_SKY_BLUE         "#5ca1cc"
@@ -60,6 +62,7 @@
 #define COLOR_TITANIUM         "#d1e6e3"
 #define COLOR_DARK_GUNMETAL    "#4c535b"
 #define COLOR_INDIGO           "#4b0082"
+#define COLOR_ALUMINIUM        "#bbbbbb"
 #define COLOR_DARK_BLUE_GRAY   "#3e4855"
 #define COLOR_ASTEROID_ROCK    "#735555"
 #define COLOR_PALE_YELLOW      "#c1bb7a"

code/__DEFINES/jobs.dm

@@ -1,28 +1,28 @@
 #define ASSISTANT_TITLE "Vagabond"
 
 //Jobs depatment lists for use in constant expressions
-#define JOBS_SECURITY "Ironhammer Commander","Ironhammer Gunnery Sergeant","Ironhammer Inspector","Ironhammer Medical Specialist","Ironhammer Operative"
-#define JOBS_COMMAND "Captain","First Officer","Ironhammer Commander","Guild Merchant","Technomancer Exultant","Moebius Biolab Officer","Moebius Expedition Overseer","NeoTheology Preacher"
-#define JOBS_ENGINEERING "Technomancer Exultant","Technomancer"
-#define JOBS_MEDICAL "Moebius Biolab Officer","Moebius Doctor","Moebius Psychiatrist","Moebius Chemist","Moebius Paramedic","Moebius Bio-Engineer"
-#define JOBS_SCIENCE "Moebius Expedition Overseer","Moebius Scientist","Moebius Roboticist"
-#define JOBS_MOEBIUS "Moebius Biolab Officer","Moebius Doctor","Moebius Psychiatrist","Moebius Chemist","Moebius Paramedic","Moebius Bio-Engineer","Moebius Expedition Overseer","Moebius Scientist","Moebius Roboticist"
-#define JOBS_CARGO "Guild Merchant","Guild Technician","Guild Miner",
+#define JOBS_SECURITY "PCRC Commander","PCRC Gunnery Sergeant","PCRC Inspector","PCRC Medical Specialist","PCRC Operative"
+#define JOBS_COMMAND "Captain","First Mate","PCRC Commander","FTU Merchant","Hephaestus Exultant","Zeng-Hu Biolab Officer","Zeng-Hu Expedition Overseer","NeoChristianity Preacher"
+#define JOBS_ENGINEERING "Hephaestus Foreman","Hephaestus Engineer"
+#define JOBS_MEDICAL "Zeng-Hu Biolab Officer","Zeng-Hu Doctor","Zeng-Hu Psychiatrist","Zeng-Hu Chemist","Zeng-Hu Paramedic","Zeng-Hu Bio-Engineer"
+#define JOBS_SCIENCE "Zeng-Hu Expedition Overseer","Zeng-Hu Scientist","Zeng-Hu Roboticist"
+#define JOBS_MOEBIUS "Zeng-Hu Biolab Officer","Zeng-Hu Doctor","Zeng-Hu Psychiatrist","Zeng-Hu Chemist","Zeng-Hu Paramedic","Zeng-Hu Bio-Engineer","Zeng-Hu Expedition Overseer","Zeng-Hu Scientist","Zeng-Hu Roboticist"
+#define JOBS_CARGO "FTU Merchant","FTU Technician","Guild Miner",
 #define JOBS_CIVILIAN "Club Manager","Club Worker","Club Artist",ASSISTANT_TITLE
-#define JOBS_CHURCH	"NeoTheology Preacher","NeoTheology Acolyte","NeoTheology Agrolyte","NeoTheology Custodian"
+#define JOBS_CHURCH	"Neo-Christianity Preacher","Alanian Knight","Alanian Herbalist","Alanian Custodian"
 #define JOBS_NONHUMAN "AI","Robot","pAI"
 #define CREDITS "¢"
 #define CREDS "¢"
 
 
 #define DEPARTMENT_COMMAND	"Command"
-#define DEPARTMENT_MEDICAL	"Medical"
-#define DEPARTMENT_ENGINEERING	"Engineering"
-#define DEPARTMENT_SCIENCE	"Science"
-#define DEPARTMENT_SECURITY "Security"
-#define DEPARTMENT_GUILD "Guild"
+#define DEPARTMENT_MEDICAL	"Zeng-Hu Medical"
+#define DEPARTMENT_ENGINEERING	"Hephaestus Industries"
+#define DEPARTMENT_SCIENCE	"Zeng-Hu Science"
+#define DEPARTMENT_SECURITY "Proxima Centauri Risk Control"
+#define DEPARTMENT_GUILD "Free Trade Union"
 #define DEPARTMENT_CIVILIAN	"Civilian"
-#define DEPARTMENT_CHURCH	"Church"
+#define DEPARTMENT_CHURCH	"Neo-Christianity"
 #define DEPARTMENT_OFFSHIP "Offship"
 #define DEPARTMENT_SILICON "Silicon"
 

code/__DEFINES/materials.dm

@@ -29,6 +29,7 @@
 #define MATERIAL_CARPET "carpet"
 #define MATERIAL_BIOMATTER "biomatter"
 #define MATERIAL_COMPRESSED "compressed matter"
+#define MATERIAL_PLASTAN	"plastan"
 
 #define MATERIAL_LIST list(\
 	MATERIAL_STEEL,\
@@ -76,6 +77,7 @@
 #define ORE_GOLD "o_gold"
 #define ORE_PLATINUM "o_platinum"
 #define ORE_HYDROGEN "o_hydrogen"
+#define ORE_TITANIUM "o_titanium"
 
 #define ORE_LIST list(\
 	ORE_CARBON,\
@@ -86,4 +88,6 @@
 	ORE_DIAMOND,\
 	ORE_SILVER,\
 	ORE_GOLD,\
-	ORE_PLATINUM)
+	ORE_PLATINUM,\
+	ORE_TITANIUM\
+	)

code/__DEFINES/species_languages.dm

@@ -23,13 +23,13 @@
 #define HAS_HAIR_COLOR    0x20   // Hair colour selectable in chargen. (RGB)
 
 // Languages.
-#define LANGUAGE_COMMON "English Common"
-#define LANGUAGE_CYRILLIC "Techno-Russian"
-#define LANGUAGE_SERBIAN "Serbian"
-#define LANGUAGE_JIVE	"Jive"
-#define LANGUAGE_GERMAN "German"
-#define LANGUAGE_NEOHONGO "Neohongo"
-#define LANGUAGE_LATIN "Latin"
+#define LANGUAGE_COMMON "Спейсер"
+#define LANGUAGE_CYRILLIC "Пан-Славик"
+#define LANGUAGE_SERBIAN "Сербский"
+#define LANGUAGE_JIVE	"Гаттер"
+#define LANGUAGE_GERMAN "Миранийский"
+#define LANGUAGE_NEOHONGO "Янгуй"
+#define LANGUAGE_LATIN "Алаин"
 
 
 #define LANGUAGE_ROBOT "Robot Talk"

code/__HELPERS/manifest.dm

@@ -16,14 +16,14 @@
 	var/list/dept_data = list(
 
 		list("names" = list(), "header" = "Command Staff", "flag" = COMMAND),
-		list("names" = list(), "header" = "Ironhammer Security", "flag" = IRONHAMMER),
-		list("names" = list(), "header" = "Moebius Medical", "flag" = MEDICAL),
-		list("names" = list(), "header" = "Moebius Research", "flag" = SCIENCE),
-		list("names" = list(), "header" = "Church of NeoTheology", "flag" = CHURCH),
-		list("names" = list(), "header" = "Asters Guild", "flag" = GUILD),
+		list("names" = list(), "header" = "Proxima Centauri Risk Control", "flag" = IRONHAMMER),
+		list("names" = list(), "header" = "Zeng-Hu Medical", "flag" = MEDICAL),
+		list("names" = list(), "header" = "Zeng-Hu Research", "flag" = SCIENCE),
+		list("names" = list(), "header" = "Alanian Church of Neo-Christianity", "flag" = CHURCH),
+		list("names" = list(), "header" = "Free Trade Union", "flag" = GUILD),
 		list("names" = list(), "header" = "Civilian", "flag" = CIVILIAN),
 		list("names" = list(), "header" = "Service", "flag" = SERVICE),
-		list("names" = list(), "header" = "Technomancer League", "flag" = ENGINEERING),
+		list("names" = list(), "header" = "Hephaestus Industries", "flag" = ENGINEERING),
 		list("names" = list(), "header" = "Miscellaneous", "flag" = MISC),
 		list("names" = list(), "header" = "Silicon")
 	)
@@ -151,4 +151,4 @@
 /proc/flat_nano_crew_manifest()
 	. = list()
 	. += filtered_nano_crew_manifest(null, TRUE)
-	. += silicon_nano_crew_manifest(nonhuman_positions)
+	. += silicon_nano_crew_manifest(nonhuman_positions)

code/controllers/subsystems/air.dm

@@ -517,6 +517,8 @@ SUBSYSTEM_DEF(air)
 		return FALSE
 	if(A.carbon_dioxide != B.carbon_dioxide)
 		return FALSE
+	if(A.hydrogen != B.hydrogen)
+		return FALSE
 	if(A.temperature != B.temperature)
 		return FALSE
 

code/controllers/subsystems/supply.dm

@@ -74,7 +74,7 @@ SUBSYSTEM_DEF(supply)
 	exports.Cut()
 
 	var/datum/money_account/GA = department_accounts[DEPARTMENT_GUILD]
-	var/datum/transaction/T = new(points, "Asters Guild", "Exports", "Asters Automated Trading System")
+	var/datum/transaction/T = new(points, "FTU", "Exports", "Free Trade Union Trading System")
 	T.apply_to(GA)
 
 	centcom_message = msg

code/controllers/subsystems/trade.dm

@@ -1,4 +1,4 @@
-#define TRADE_SYSTEM_IC_NAME "Asters Automated Trading System"
+#define TRADE_SYSTEM_IC_NAME "Free Trade Union Trading System"
 GLOBAL_LIST_EMPTY(price_cache)
 SUBSYSTEM_DEF(trade)
 	name = "Trade"
@@ -249,7 +249,7 @@ SUBSYSTEM_DEF(trade)
 		if(!current_container.reagents)								// If the previous check fails, we are looking for a container with reagents or a specific reagent
 			return FALSE											// If the container is empty, fail
 
-		for(var/datum/reagent/current_reagent in current_container.reagents?.reagent_list)											
+		for(var/datum/reagent/current_reagent in current_container.reagents?.reagent_list)
 			if(current_reagent.volume >= target_volume && istype(current_reagent, target_reagent))		// Check volume and reagent type
 				return TRUE
 
@@ -531,7 +531,7 @@ SUBSYSTEM_DEF(trade)
 		// The max is a soft cap
 		if(export_count > EXPORT_COUNT_MAXIMUM)
 			break
-	
+
 	senderBeacon.start_export()
 	var/datum/money_account/guild_account = department_accounts[DEPARTMENT_GUILD]
 	var/datum/transaction/T = new(cost, guild_account.get_name(), "Export", TRADE_SYSTEM_IC_NAME)
@@ -552,7 +552,7 @@ SUBSYSTEM_DEF(trade)
 
 	// Junk tags override hockable tags and offer types override both
 	if(target_hockable_tags.len)
-		. = HOCKABLE				
+		. = HOCKABLE
 	if(target_junk_tags.len)
 		. = JUNK
 	for(var/offer_type in offer_types)

code/game/gamemodes/scores.dm

@@ -284,7 +284,7 @@ GLOBAL_VAR_INIT(score_technomancer_faction_item_loss, 0)
 	<b>Antagonist contracts completed:</b> [GLOB.completed_antag_contracts] ([to_score_color(GLOB.score_antag_contracts)] Points)<br>
 	<b>Antagonists killed or captured:</b> [GLOB.captured_or_dead_antags] ([to_score_color(GLOB.captured_or_dead_antags_score)] Points)<br>
 	<b>Escaped Antagonists:</b> [GLOB.ironhammer_escaped_antagonists] ([to_score_color(GLOB.ironhammer_escaped_antagonists_score)] Points)<br>
-	<b>IH operatives killed:</b> [GLOB.ironhammer_operative_dead] ([to_score_color(GLOB.ironhammer_operative_dead_score)] Points)<br>
+	<b>PCRC operatives killed:</b> [GLOB.ironhammer_operative_dead] ([to_score_color(GLOB.ironhammer_operative_dead_score)] Points)<br>
 	<b>Final Ironhammer score:</b> [get_color_score(GLOB.ironhammer_score, GLOB.ironhammer_score)] Points<br><br>
 	"}