Merge branch 'master' of https://github.com/hazelrat/Aurora.3

aurorastation.dme

@@ -1872,6 +1872,7 @@
 #include "code\modules\clothing\ears\xeno\skrell.dm"
 #include "code\modules\clothing\ears\xeno\tajara.dm"
 #include "code\modules\clothing\factions\assunzione.dm"
+#include "code\modules\clothing\factions\biesel.dm"
 #include "code\modules\clothing\factions\dominia.dm"
 #include "code\modules\clothing\factions\einstein.dm"
 #include "code\modules\clothing\factions\elyra.dm"
@@ -3883,6 +3884,7 @@
 #include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette.dm"
 #include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_areas.dm"
 #include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_ghostroles.dm"
+#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_landmarks.dm"
 #include "maps\away\ships\biesel\tcfl_patrol\tcfl_peacekeeper_ship.dm"
 #include "maps\away\ships\biesel\tcfl_patrol\tcfl_peacekeeper_ship_ghostroles.dm"
 #include "maps\away\ships\casino\casino.dm"

code/__DEFINES/species.dm

@@ -16,7 +16,8 @@
 #define SPECIES_TAJARA_TESLA_BODY	"Tesla Rejuvenation Suit Tajara"
 
 #define SPECIES_VAURCA_WORKER		"Vaurca Worker"
-#define SPECIES_VAURCA_WARRIOR		"Vaurca Warrior"
+#define SPECIES_VAURCA_WARRIOR		"Vaurca Myrmidon"
+#define SPECIES_VAURCA_ATTENDANT	"Vaurca Attendant"
 #define SPECIES_VAURCA_BREEDER		"Vaurca Breeder"
 #define SPECIES_VAURCA_WARFORM		"Vaurca Warform"
 #define SPECIES_VAURCA_BULWARK		"Vaurca Bulwark"
@@ -90,6 +91,7 @@
 #define BODYTYPE_VAURCA				"Vaurca"
 #define BODYTYPE_VAURCA_BREEDER		"Vaurca Breeder"
 #define BODYTYPE_VAURCA_BULWARK		"Vaurca Bulwark"
+#define BODYTYPE_VAURCA_ATTENDANT 	"Vaurca Attendant"
 #define BODYTYPE_VAURCA_WARFORM		"Vaurca Warform"
 
 #define BODYTYPE_IPC				"Machine"
@@ -110,7 +112,7 @@
 		SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, \
 		SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, \
 		SPECIES_UNATHI, \
-		SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, \
+		SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, \
 	)
 
 #define ALL_HUMAN_SPECIES list(\

code/game/jobs/faction/hephaestus.dm

@@ -22,6 +22,7 @@
 		/datum/species/unathi,
 		/datum/species/bug = TRUE,
 		/datum/species/bug/type_b = TRUE,
+		/datum/species/bug/type_b/type_bb = TRUE,
 		/datum/species/bug/type_e = TRUE,
 		/datum/species/tajaran,
 		/datum/species/diona

code/game/jobs/faction/orion_express.dm

@@ -20,6 +20,7 @@
 		/datum/species/unathi,
 		/datum/species/bug = TRUE,
 		/datum/species/bug/type_b = TRUE,
+		/datum/species/bug/type_b/type_bb = TRUE,
 		/datum/species/bug/type_e = TRUE,
 		/datum/species/tajaran,
 		/datum/species/diona

code/game/jobs/faction/pmc.dm

@@ -21,6 +21,7 @@
 		/datum/species/unathi,
 		/datum/species/bug = TRUE,
 		/datum/species/bug/type_b = TRUE,
+		/datum/species/bug/type_b/type_bb = TRUE,
 		/datum/species/machine
 	)
 

code/game/jobs/faction/zavodskoi.dm

@@ -21,6 +21,7 @@
 		/datum/species/machine,
 		/datum/species/bug = TRUE,
 		/datum/species/bug/type_b = TRUE,
+		/datum/species/bug/type_b/type_bb = TRUE,
 		/datum/species/bug/type_e = TRUE
 	)
 

code/game/jobs/faction/zeng_hu.dm

@@ -22,6 +22,7 @@
 		/datum/species/machine,
 		/datum/species/bug = TRUE,
 		/datum/species/bug/type_b = TRUE,
+		/datum/species/bug/type_b/type_bb = TRUE,
 		/datum/species/bug/type_e = TRUE,
 		/datum/species/diona
 	)

code/game/objects/items/devices/versebook.dm

@@ -88,7 +88,7 @@
 	desc_extended = "This book contains some of the words of Temple, a sacred AI within the Trinary Perfection and namesake of the Lodge of the Temple Architect. It also includes some teachings by leading members within the sect. Due to its recent establishment, this book is frequently changed and amended \
 	as new insights into their faith are realized."
 	icon_state = "templeistbook"
-	item_state = "trinary"
+	item_state = "templeist"
 
 /obj/item/device/versebook/templeist/Initialize()
 	. = ..()

code/game/objects/items/weapons/cards_ids.dm

@@ -650,6 +650,12 @@ var/const/NO_EMAG_ACT = -50
 	icon_state = "coalition_card"
 	overlay_state = "nothing"
 
+/obj/item/card/id/tcaf // For ghostroles, rather than ERTs.
+	name = "\improper Tau Ceti Armed Forces identification card"
+	desc = "An old-fashioned, practical plastic card. Cheaply produced for Tau Ceti's finest."
+	icon_state = "legion"
+	overlay_state = "nothing"
+
 /obj/item/card/id/bluespace
 	name = "bluespace identification card"
 	desc = "A bizarre imitation of an ID card; shifting and moving."

code/modules/admin/verbs/viewlist.dm

@@ -46,13 +46,19 @@
 
 	data["listvar"] = list()
 
-	var/index = 1
-	for(var/k in viewed_list)
-		if(!isnull(viewed_list[k]))
-			data["listvar"] += list(list("key" = k, "value" = viewed_list[k]))
+	//Let's just compute it once instead of for every element
+	var/is_normal_list = IS_NORMAL_LIST(viewed_list)
+
+	for(var/index in 1 to length(viewed_list))
+		var/entry = viewed_list[index]
+
+		if(is_normal_list && IS_VALID_ASSOC_KEY(entry))
+			if(!isnull(viewed_list[entry]))
+				data["listvar"] += list(list("key" = entry, "value" = viewed_list[entry]))
+			else
+				data["listvar"] += list(list("key" = index, "value" = entry))
 		else
-			data["listvar"] += list(list("key" = index, "value" = k))
-			index++
+			data["listvar"] += list(list("key" = index, "value" = entry))
 
 	return data
 
@@ -84,6 +90,10 @@
 				to_chat(usr, "No entry found to open!")
 				return FALSE
 
+			if(!isdatum(entry_to_open))
+				to_chat(usr, "The entry is not a datum!")
+				return FALSE
+
 			user_client.debug_variables_open(entry_to_open)
 
 			return TRUE

code/modules/admin/view_variables/view_variables.dm

@@ -157,18 +157,35 @@
 	else if(islist(value))
 		var/list/L = value
 		vtext = "/list ([length(L)])"
+
+		//Let's just compute it once instead of for every element
+		var/is_normal_list = IS_NORMAL_LIST(L)
+
 		if(!(varname in view_variables_dont_expand) && length(L) > 0 && length(L) < 100)
 			extra += "<ul>"
-			for(var/index = 1 to length(L))
+
+			//Loop through the list and make the elements into html
+			for(var/index in 1 to length(L))
 				var/entry = L[index]
-				if(IS_NORMAL_LIST(L) && IS_VALID_ASSOC_KEY(entry))
+
+				//If the key is a valid associative key (not a number)
+				if(is_normal_list && IS_VALID_ASSOC_KEY(entry))
+
+					//The possibly associative key is actually referencing something, now we know the list is associative
 					if(!isnull(L[entry]))
 						extra += "<li>[index]: [make_view_variables_value(D, entry)] -> [make_view_variables_value(D, L[entry])]</li>"
+					//The possibly associative key is not referencing anything, so it's just a normal element in the list
 					else
 						extra += "<li>[index]: [make_view_variables_value(D, entry)]</li>"
+
+				//The list is a list with numbers as keys
+				else
+					extra += "<li>[index]: [make_view_variables_value(D, entry)]</li>"
+
 			extra += "</ul>"
+
 		else if(length(L) >= 100)
-			vtext = "([length(L)]): <ul><li><a href='?_src_=vars;datumview=[REF(L)];varnameview=[varname]'>List too large to display, click to view.</a></ul>"
+			vtext = "([length(L)]): <ul><li><a href='?_src_=vars;datumview=[REF(L)];varnameview=[varname];original_datum=[REF(D)]'>List too large to display, click to view.</a></ul>"
 
 	else
 		vtext = "[value]"

code/modules/clothing/factions/biesel.dm

@@ -0,0 +1,125 @@
+// This file contains assets for the Tau Ceti Armed Forces. Excludes some older TCFL assets.
+
+// Intended for legionnaires that are expected to engage in combat.
+/obj/item/clothing/under/legion/tcaf
+	name = "\improper TCAF armsman's uniform"
+	desc = "A black longsleeved top over rough khaki tactical pants. Designed for the use of on-ship legionnaires of the Tau Ceti Armed Forces."
+	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	contained_sprite = TRUE
+	icon_state = "tcaf_armsman_uniform"
+	item_state = "tcaf_armsman_uniform"
+	worn_state = "tcaf_armsman_uniform"
+
+// Generic gloves.
+/obj/item/clothing/gloves/tcaf
+	name = "\improper TCAF uniform gloves"
+	desc = "A pair of khaki tactical gloves with reinforcement at the knuckles and an adjustable strap at the wrist."
+	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	contained_sprite = TRUE
+	icon_state = "tcaf_armsman_gloves"
+	item_state = "tcaf_armsman_gloves"
+	build_from_parts = TRUE
+	worn_overlay = "over"
+
+// Intended for legionnaires that aren't in active combat roles but are still expected to be able to fight if necessary, like ship crews, engineers, and medics.
+/obj/item/clothing/under/legion/tcaf/technician
+	name = "\improper TCAF technician's uniform"
+	desc = "A plain drab jumpsuit trimmed with dark accents, designed to be cheap and stain-resistant. It could be more comfortable. Worn by members of the Tau Ceti Armed Forces that aren't in active combat roles, such as medical and engineering staff."
+	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	contained_sprite = TRUE
+	icon_state = "tcaf_technician_uniform"
+	item_state = "tcaf_technician_uniform"
+	worn_state = "tcaf_technician_uniform"
+
+/obj/item/clothing/head/tcaf_technician
+	name = "\improper TCAF technician's cap"
+	desc = "A plain drab softcap, marked in a small manner at the front with the insignia of the Tau Ceti Armed Forces. Worn by members of the Tau Ceti Armed Forces that aren't in active combat roles, such as medical and engineering staff."
+	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon_state = "tcaf_technician_cap"
+	item_state = "tcaf_technician_cap"
+	contained_sprite = TRUE
+
+// For specialist roles.
+/obj/item/clothing/accessory/legion/specialist
+	name = "specialist medallion"
+	desc = "Two small medallions, one worn on the shoulder and the other worn on the chest. Meant to display the rank of specialist troops in the Tau Ceti Armed Forces."
+	icon_state = "specialist_medallion"
+	item_state = "specialist_medallion"
+	overlay_state = "specialist_medallion"
+
+// For any legionnaires with significant authority, including officers.
+/obj/item/clothing/accessory/legion
+	name = "seniority ribbons"
+	desc = "A ribbon meant to attach to the chest and sling around the shoulder accompanied by two medallions, marking seniority in the Tau Ceti Armed Forces."
+	icon_state = "senior_ribbon"
+	item_state = "senior_ribbon"
+	overlay_state = "senior_ribbon"
+	slot = ACCESSORY_SLOT_CAPE
+	flippable = TRUE
+
+// Specifically for Prefects.
+/obj/item/clothing/accessory/tcaf_prefect_pauldron
+	name = "\improper TCAF prefect pauldron"
+	desc = "A bright red hard pauldron to indicate the wearer has the rank of Prefect in the Tau Ceti Armed Forces."
+	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon_state = "tcaf_prefect_pauldron"
+	item_state = "tcaf_prefect_pauldron"
+	contained_sprite = TRUE
+	slot = ACCESSORY_SLOT_GENERIC
+	flippable = FALSE
+
+// Specifically for Senior Legionnaires.
+/obj/item/clothing/accessory/tcaf_senior_legion_pauldron
+	name = "\improper TCAF senior legionnaire pauldron"
+	desc = "A blue hard pauldron to indicate the wearer has the rank of Senior Legionnaire in the Tau Ceti Armed Forces."
+	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon_state = "tcaf_senior_legion_pauldron"
+	item_state = "tcaf_senior_legion_pauldron"
+	contained_sprite = TRUE
+	slot = ACCESSORY_SLOT_GENERIC
+	flippable = FALSE
+
+// For officers that want to look like a One Piece villain.
+/obj/item/clothing/suit/storage/toggle/tcaf_officer_greatcoat
+	name = "\improper TCAF officer's greatcoat"
+	desc = "This is a well-trimmed greatcoat worn by commissioned officers in the Tau Ceti Armed Forces, such as by a Decurion or Captain. The fabric seems quite robust, but not particularly well used."
+	icon = 'icons/clothing/suits/coats/tcaf_coat.dmi'
+	icon_state = "tcaf_officer_coat"
+	item_state = "tcaf_officer_coat"
+	contained_sprite = TRUE
+	blood_overlay_type = "coat"
+	body_parts_covered = UPPER_TORSO|ARMS
+	protects_against_weather = TRUE
+
+/obj/item/clothing/head/tcaf_officer
+	name = "\improper TCAF officer's cap"
+	desc = "This is a peaked cap bearing the colours and insignia of the Tau Ceti Armed Forces, typically worn by commissioned officers therein. It looks like it'd fly off one's head very easily in windy weather."
+	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon_state = "tcaf_officer_cap"
+	item_state = "tcaf_officer_cap"
+	contained_sprite = TRUE
+
+/obj/item/clothing/under/legion/tcaf_officer
+	name = "\improper TCAF officer's uniform"
+	desc = "A pristine, well-ironed, and perfectly cleaned white jumpsuit with black trimmings, worn by commissioned officers of the Tau Ceti Armed Forces. Who wears a white uniform but someone who intends never to dirty it?"
+	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	contained_sprite = TRUE
+	icon_state = "tcaf_officer_uniform"
+	item_state = "tcaf_officer_uniform"
+	worn_state = "tcaf_officer_uniform"
+
+// Not to be confused with the TCFL variant. Redeclaring icon for clarity's sake, this isn't in the tcaf_uniform file.
+/obj/item/clothing/head/helmet/pilot/tcaf
+	name = "\improper TCAF flight helmet"
+	desc = "A pilot's helmet marked all over with the imagery of the Republic of Biesel, worn by the pilots of the Tau Ceti Armed Forces. It looks a little scuffed."
+	icon = 'icons/clothing/head/pilot_helmets.dmi'
+	icon_state = "tcaf_pilot"
+	item_state = "tcaf_pilot"
+
+// Identical sprites to the TCFL variant, just reflavoured.
+/obj/item/clothing/head/softcap/tcaf_cap
+	name = "TCAF uniform cap"
+	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	desc = "A rugged blue softcap bearing the insignia of the Tau Ceti Armed Forces, the military of the Republic of Biesel."
+	icon_state = "tcaf_cap"
+	item_state = "tcaf_cap"

code/modules/clothing/gloves/miscellaneous.dm

@@ -285,16 +285,6 @@
 	build_from_parts = TRUE
 	worn_overlay = "over"
 
-/obj/item/clothing/gloves/tcaf
-	name = "\improper TCAF armsman gloves"
-	desc = "A pair of khaki tactical gloves with reinforcement at the knuckles and an adjustable strap at the wrist."
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
-	contained_sprite = TRUE
-	icon_state = "tcaf_armsman_gloves"
-	item_state = "tcaf_armsman_gloves"
-	build_from_parts = TRUE
-	worn_overlay = "over"
-
 /obj/item/clothing/gloves/ballistic
 	name = "ballistic gauntlet"
 	desc = "A metal gauntlet armed with a wrist-mounted shotgun."

code/modules/clothing/suits/miscellaneous.dm

@@ -238,6 +238,10 @@
 	)
 	siemens_coefficient = 0.75
 
+/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion/tcaf
+	name = "TCAF flight jacket"
+	desc = "A cheap pilot's jacket. An immense stock of exactly this design has been grandfathered into the Tau Ceti Armed Forces via its predecessor, the Tau Ceti Foreign Legion, to the point of a near-complete ubiquity."
+
 /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion/alt
 	desc = "A Tau Ceti Foreign Legion pilot's jacket made from a silky, shiny nanonylon material and lined with tough, protective synthfabrics."
 	armor = list(
@@ -499,7 +503,7 @@
 	item_state = "tcfljacket"
 
 /obj/item/clothing/suit/storage/legion/tcaf
-	name = "tcaf jacket"
+	name = "TCAF jacket"
 	desc = "A pale blue canvas jacket embossed with the insignia of the Tau Ceti Armed Forces."
 	icon_state = "tcaf_jacket"
 	item_state = "tcaf_jacket"

code/modules/clothing/suits/modular_armor.dm

@@ -297,7 +297,7 @@
 
 /obj/item/clothing/accessory/storage/chest_gear
 	name = "standard vest equipment"
-	desc = "the standard pouch and commlink each Minuteman gets issued out of basic. This one has a bullet wedged in the radio, don't expect it to work anytime soon."
+	desc = "The standard pouch and commlink each Minuteman gets issued out of basic. This one has a bullet wedged in the radio, don't expect it to work anytime soon."
 	icon = 'icons/clothing/kit/modular_armor.dmi'
 	icon_state = "tcaf_chest_gear"
 	item_state = "tcaf_chest_gear"
@@ -865,23 +865,3 @@
 	Szalai and MacPherson sought to undo."
 	icon_state = "flagpatch_ssmd"
 	item_state = "flagpatch_ssmd"
-
-/obj/item/clothing/accessory/tcaf_prefect_pauldron
-	name = "\improper TCAF prefect pauldron"
-	desc = "A bright red hard pauldron to indicate the wearer has the rank of Prefect in the Tau Ceti Armed Forces."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
-	icon_state = "tcaf_prefect_pauldron"
-	item_state = "tcaf_prefect_pauldron"
-	contained_sprite = TRUE
-	slot = ACCESSORY_SLOT_GENERIC
-	flippable = FALSE
-
-/obj/item/clothing/accessory/tcaf_senior_legion_pauldron
-	name = "\improper TCAF senior legionnaire pauldron"
-	desc = "A blue hard pauldron to indicate the wearer has the rank of Senior Legionnaire in the Tau Ceti Armed Forces."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
-	icon_state = "tcaf_senior_legion_pauldron"
-	item_state = "tcaf_senior_legion_pauldron"
-	contained_sprite = TRUE
-	slot = ACCESSORY_SLOT_GENERIC
-	flippable = FALSE