Merge remote-tracking branch 'upstream/master'

SatinIsle · Sep 21, 2024 · 880941d · 880941d
2 parents 18e7e27 + 14ebb8f
commit 880941d
Show file tree

Hide file tree

Showing 44 changed files with 3,593 additions and 145 deletions.
diff --git a/code/__defines/faction.dm b/code/__defines/faction.dm
@@ -21,6 +21,7 @@
 
 #define FACTION_ALTEVIAN "altevian"
 #define FACTION_CULT "cult"
+#define FACTION_GLAMOUR "glamour"
 #define FACTION_PIRATE "pirate"
 #define FACTION_SHADEKIN "shadekin"
 #define FACTION_SPACE_GHOST "space ghost"

diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm
@@ -345,7 +345,7 @@
 //___________________________________________________________
 
 
-// Talom jobs
+// Talon jobs
 #define JOB_TALON_CAPTAIN "Talon Captain"
 	// Talon Captain alt titles
 	#define JOB_ALT_TALON_COMMANDER "Talon Commander"

diff --git a/code/datums/underwear/top.dm b/code/datums/underwear/top.dm
@@ -78,6 +78,10 @@
 	name = "Binder"
 	icon_state = "binder_s"
 
+/datum/category_item/underwear/top/binder_hyper
+	name = "HYPER Binder"
+	icon_state = "hyper_binder"
+
 /datum/category_item/underwear/top/straplessbinder
 	name = "Binder Strapless"
 	icon_state = "straplessbinder_s"

diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm
@@ -493,6 +493,7 @@ var/const/access_pilot = 67
 /var/const/access_syndicate = 150//General Syndicate Access
 /datum/access/syndicate
 	id = access_syndicate
+	desc = "Syndicate"
 	access_type = ACCESS_TYPE_SYNDICATE
 
 /*******
@@ -507,11 +508,13 @@ var/const/access_pilot = 67
 /var/const/access_crate_cash = 200
 /datum/access/crate_cash
 	id = access_crate_cash
+	desc = "Crate cash"
 	access_type = ACCESS_TYPE_NONE
 
 /var/const/access_trader = 160//General Beruang Trader Access
 /datum/access/trader
 	id = access_trader
+	desc = "Trader"
 	access_type = ACCESS_TYPE_PRIVATE
 
 /var/const/access_alien = 300 // For things like crashed ships.

diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm
@@ -74,7 +74,7 @@
 
 /datum/alt_title/supply_courier
 	title = JOB_ALT_SUPPLY_COURIER
-	title_blurb = "A " + JOB_ALT_SUPPLY_COURIER + " is usually tasked with devlivering packages or cargo directly to whoever requires it."
+	title_blurb = "A " + JOB_ALT_SUPPLY_COURIER + " is usually tasked with delivering packages or cargo directly to whoever requires it."
 
 /datum/alt_title/cargo_loader
 	title = JOB_ALT_CARGO_LOADER

diff --git a/code/game/objects/micro_structures.dm b/code/game/objects/micro_structures.dm
@@ -1,3 +1,5 @@
+var/global/list/micro_tunnels = list()
+
 /obj/structure/micro_tunnel
 	name = "mouse hole"
 	desc = "A tiny little hole... where does it go?"
@@ -18,6 +20,10 @@
 		/mob/living/simple_mob/slime
 	)
 
+/obj/structure/micro_tunnel/New()
+	. = ..()
+	micro_tunnels.Add(src)
+
 /obj/structure/micro_tunnel/Initialize()
 	. = ..()
 	if(name == initial(name))
@@ -34,6 +40,8 @@
 		thing.forceMove(get_turf(src.loc))
 		thing.cancel_camera()
 
+	micro_tunnels.Remove(src)
+
 	return ..()
 
 /obj/structure/micro_tunnel/set_dir(new_dir)
@@ -63,7 +71,7 @@
 		if(myturf.z in P.expected_z_levels)
 			planet = P
 		else
-	for(var/obj/structure/micro_tunnel/t in world)
+	for(var/obj/structure/micro_tunnel/t in micro_tunnels)
 		if(t == src)
 			continue
 		if(magic || t.magic)
@@ -342,6 +350,8 @@
 					return
 				if(QDELETED(src))
 					return
+				if(usr.loc != src)
+					return
 				var/obj/our_choice = choice
 
 				var/list/new_contained_mobs = list()

diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
@@ -73,7 +73,7 @@
 			water_breath.adjust_gas(gasid, BREATH_MOLES) // They have no oxygen, but non-zero moles and temp
 			water_breath.temperature = above_air.temperature
 			return water_breath
-	if(L && L.is_bad_swimmer() && depth >= 2 && !L.buckled())
+	if(L && L.is_bad_swimmer() && depth >= 2 && !L.buckled() && !L.flying)
 		if(prob(10))
 			L.visible_message("<span class='notice'>[L] splashes wildly.</span>","<span class='warning'>You struggle to keep your head above the water!</span>")
 		if(L.can_breathe_water())