Merge remote-tracking branch 'Aurora/master' into whereabouts_of_the_heart

# Conflicts:
#	tgui/public/tgui.bundle.js

Author: Matt Atlas

aurorastation.dme

@@ -2022,6 +2022,7 @@
 #include "code\modules\clothing\masks\xeno\skrell.dm"
 #include "code\modules\clothing\masks\xeno\tajara.dm"
 #include "code\modules\clothing\masks\xeno\unathi.dm"
+#include "code\modules\clothing\pants\highvis.dm"
 #include "code\modules\clothing\pants\pants.dm"
 #include "code\modules\clothing\pants\shorts.dm"
 #include "code\modules\clothing\pants\skirts.dm"
@@ -2082,6 +2083,7 @@
 #include "code\modules\clothing\suits\armor.dm"
 #include "code\modules\clothing\suits\hazardvests.dm"
 #include "code\modules\clothing\suits\hazmat.dm"
+#include "code\modules\clothing\suits\highvis.dm"
 #include "code\modules\clothing\suits\hoodies.dm"
 #include "code\modules\clothing\suits\jobs.dm"
 #include "code\modules\clothing\suits\labcoat.dm"
@@ -3161,6 +3163,7 @@
 #include "code\modules\organs\subtypes\augment\augments\zengu_plate.dm"
 #include "code\modules\organs\subtypes\parasite\_parasite.dm"
 #include "code\modules\organs\subtypes\parasite\black_kois.dm"
+#include "code\modules\organs\subtypes\parasite\greim_eggs.dm"
 #include "code\modules\organs\subtypes\parasite\heart_fluke.dm"
 #include "code\modules\organs\subtypes\parasite\kois.dm"
 #include "code\modules\organs\subtypes\parasite\tumours.dm"
@@ -4200,6 +4203,11 @@
 #include "maps\away\ships\scc\scc_scout_ship_areas.dm"
 #include "maps\away\ships\scc\scc_scout_ship_ghostroles.dm"
 #include "maps\away\ships\scc\scc_scout_ship_landmarks.dm"
+#include "maps\away\ships\sol\sol_frigate\sol_frigateship.dm"
+#include "maps\away\ships\sol\sol_frigate\sol_frigateship_areas.dm"
+#include "maps\away\ships\sol\sol_frigate\sol_frigateship_ghostroles.dm"
+#include "maps\away\ships\sol\sol_frigate\sol_frigateship_landmarks.dm"
+#include "maps\away\ships\sol\sol_frigate\sol_frigateship_shuttle.dm"
 #include "maps\away\ships\sol\sol_merc\fsf_patrol_ship.dm"
 #include "maps\away\ships\sol\sol_merc\fsf_patrol_ship_areas.dm"
 #include "maps\away\ships\sol\sol_merc\fsf_patrol_ship_ghostroles.dm"

code/__DEFINES/access.dm

@@ -888,5 +888,6 @@
 	desc = "Himean Military Patrol Vessel"
 
 #define ACCESS_QUARANTINED_OUTPOST_ENGINEER 254
+/datum/access/quarantined_outpost_engineer
 	id = ACCESS_QUARANTINED_OUTPOST_ENGINEER
 	desc = "Outpost Nemora, Engineering Clearance"

code/__DEFINES/mobs.dm

@@ -165,6 +165,7 @@
 #define BP_WORM_NERVE "nerve fluke"
 #define BP_TUMOUR_NONSPREADING "benign tumour"
 #define BP_TUMOUR_SPREADING "malignant tumour"
+#define BP_GREIMORIAN_EGGCLUSTER "greimorian egg cluster"
 
 //Augment organs
 #define BP_AUG_ACC_CORDS          "modified synthetic vocal cords"
@@ -196,6 +197,13 @@
 #define BP_AUG_HAIR               "synthetic hair extensions"
 #define BP_AUG_HEALTHSCAN         "integrated health scanner"
 #define BP_AUG_LANGUAGE           "integrated language processor"
+#define BP_AUG_LANGUAGE_CTHUR     "cthur language processor"
+#define BP_AUG_LANGUAGE_KLAX      "klaxan language processor"
+#define BP_AUG_LANGUAGE_MIKUETZ   "mikuetz language processor"
+#define BP_AUG_LANGUAGE_TRADEBAND "tradeband language processor"
+#define BP_AUG_LANGUAGE_VEKATAK   "vekatak language processor"
+#define BP_AUG_LANGUAGE_ZENG      "zeng language processor"
+#define BP_AUG_LANGUAGE_ZINO      "zino language processor"
 #define BP_AUG_LIGHTER            "retractable lighter"
 #define BP_AUG_MAGBOOT            "integrated mag-claws"
 #define BP_AUG_MEMORY             "memory inhibitor"

code/__DEFINES/projectiles.dm

@@ -8,7 +8,7 @@
 // Delete self without hitting
 #define PROJECTILE_DELETE_WITHOUT_HITTING 3
 
-// IFF values
+// IFF values. As of 2025/11, these are not used by any game mechanics; see 'var/iff_faction' and 'var/iff_capable'
 #define IFF_DEFAULT "station"
 #define IFF_TCFL "tcfl"
 #define IFF_SYNDICATE "syndicate"

code/__HELPERS/text.dm

@@ -667,6 +667,9 @@
 	t = replacetext(t, "\[barcode\]", "<img src = barcode[rand(0, 3)].png>")
 	t = replacetext(t, "\[time\]", "[worldtime2text()]")
 	t = replacetext(t, "\[date\]", "[worlddate2text()]")
+	t = replacetext(t, "\[tajtime\]", "[tajaran_time()]")
+	t = replacetext(t, "\[tajdate\]", "[tajaran_full_date()]")
+	t = replacetext(t, "\[cr\]", "电")
 	t = replacetext(t, "\[editorbr\]", "<BR>")
 	t = replacetext(t, @"[image id=([\w]*?\.[\w]*?)]", "<img style=\"display:block;width:90%;\" src = [GLOB.config.docs_image_host]$1></img>")
 	return t

code/__HELPERS/time.dm

@@ -5,20 +5,27 @@ var/round_start_time
 
 //Returns the world time in english
 /proc/worldtime2text(time = world.time, timeshift = 1)
-	if(!roundstart_hour) roundstart_hour = REALTIMEOFDAY - (TIME_OFFSET HOURS)
+	if(!roundstart_hour)
+		roundstart_hour = REALTIMEOFDAY - (TIME_OFFSET HOURS)
 	return timeshift ? time2text(time+roundstart_hour, "hh:mm") : time2text(time, "hh:mm")
 
 /proc/worldtime2hours()
 	if (!roundstart_hour)
 		worldtime2text()
-	. = text2num(time2text(world.time + (roundstart_hour HOURS), "hh"))
+	. = text2num(time2text(world.time+roundstart_hour, "hh"))
+
+/proc/worldtime2minutes()
+	if (!roundstart_hour)
+		worldtime2text()
+	. = text2num(time2text(world.time+roundstart_hour, "mm"))
 
 /proc/worlddate2text()
 	return num2text(GLOB.game_year) + "-" + time2text(world.timeofday, "MM-DD")
 
 /proc/time_stamp()
 	return time2text(world.timeofday, "hh:mm:ss")
 
+
 /**
  * Check if specific day of the year
  *
@@ -121,3 +128,60 @@ var/real_round_start_time
 	if(hour)
 		hourT = " and [hour] hour[(hour != 1)? "s":""]"
 	return "[day] day[(day != 1)? "s":""][hourT][minuteT][secondT]"
+
+/**
+ * The current time on Adhomai
+ */
+/proc/tajaran_time()
+	var/adhomian_time = worldtime2hours()
+	var/adhomian_minute = worldtime2minutes()
+	var/adhomian_day = tajaran_date()
+	if(ISEVEN(adhomian_day))
+		adhomian_time += 24
+	if(adhomian_minute < 10) // make it display 5:08 instead of 5:8 when the time is in single digits
+		adhomian_minute = "0[adhomian_minute]"
+	return "[adhomian_time]:[adhomian_minute]"
+
+/**
+ * The current month/season on Adhomai
+ */
+/proc/tajaran_month()
+	var/static/months = list("Menshe-aysaif", "Sil'nryy-aysaif", "Menshe-rhazzimy", "Sil'nryy-rhazzimy")
+
+	var/adhomian_month = text2num(time2text(world.time, "MM"))
+
+	adhomian_month = months[Ceiling(adhomian_month/3)]
+
+	return adhomian_month
+
+/**
+ * The current date on Adhomai
+ */
+/proc/tajaran_date()
+	var/adhomian_day = text2num(time2text(world.time, "DD"))
+	var/current_month = text2num(time2text(world.time, "MM"))
+	switch(current_month)
+		if(2, 5, 8, 11)
+			adhomian_day += 31
+		if(6, 9, 12)
+			adhomian_day += 61
+		if(3)
+			adhomian_day += 59 + isLeap(text2num(time2text(world.realtime, "YYYY"))) // we can conveniently use the result of `isLeap` to add 1 when we are in a leap year
+
+	adhomian_day = FLOOR(adhomian_day / 2, 1)
+
+	return adhomian_day
+
+/**
+ * The current year on Adhomai
+ */
+/proc/tajaran_year()
+	return GLOB.game_year + 1158
+
+/**
+ * The full year, month and date on Adhomai
+ */
+/proc/tajaran_full_date()
+	var/adhomian_month = text2num(time2text(world.time, "MM"))
+	adhomian_month = Ceiling(adhomian_month/3)
+	return "[tajaran_year()]-[adhomian_month]-[tajaran_date()]"

code/__HELPERS/type2type.dm

@@ -109,6 +109,21 @@
 	if (degree < 315) return WEST
 	return NORTH|WEST
 
+/**
+ * Returns the trigonometric degrees of a given direction.
+ * Use this instead of dir2angle if you're using cos() and sin() to generate a velocity or acceleration vector.
+ */
+/proc/dir2degree(var/D)
+	switch (D) // Starting from 0 on a Unit Circle
+		if (EAST) 		return 0
+		if (NORTHEAST)  return 45
+		if (NORTH) 		return 90
+		if (NORTHWEST)  return 135
+		if (WEST) 		return 180
+		if (SOUTHWEST)  return 225
+		if (SOUTH) 		return 270
+		if (SOUTHEAST)  return 315
+
 // Returns the north-zero clockwise angle in degrees, given a direction
 /proc/dir2angle(var/D)
 	switch (D)