Merge branch 'cmss13-devs:master' into mortar

cmss13-devs · Mar 17, 2024 · f3d73e2 · f3d73e2
2 parents 5bb65ad + 9b6f711
commit f3d73e2
Show file tree

Hide file tree

Showing 37 changed files with 9,815 additions and 2,850 deletions.
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
@@ -11,7 +11,10 @@
 	if (mods["middle"])
 		if (isStructure(A) && get_dist(src, A) <= 1)
 			var/obj/structure/S = A
-			S.do_climb(src, mods)
+			if(S.climbable)
+				S.do_climb(src, mods)
+			else if(S.can_buckle)
+				S.buckle_mob(src, src)
 			return TRUE
 		else if(!(isitem(A) && get_dist(src, A) <= 1) && (client && (client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_SWAP_HANDS)))
 			swap_hand()

diff --git a/code/datums/emergency_calls/ert_stations.dm b/code/datums/emergency_calls/ert_stations.dm
@@ -12,3 +12,6 @@
 
 /datum/lazy_template/ert/weyland_station
 	map_name = "weyland_ert_station"
+
+/datum/lazy_template/ert/pizza_station
+	map_name = "pizza_ert_station"
diff --git a/code/datums/emergency_calls/pizza.dm b/code/datums/emergency_calls/pizza.dm
@@ -8,6 +8,7 @@
 	objectives = "Make sure you get a tip!"
 	shuttle_id = MOBILE_SHUTTLE_ID_ERT_SMALL
 	name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza
+	home_base = /datum/lazy_template/ert/pizza_station
 	probability = 1
 
 /datum/emergency_call/pizza/create_member(datum/mind/M, turf/override_spawn_loc)

diff --git a/code/datums/entities/player.dm b/code/datums/entities/player.dm
@@ -455,15 +455,19 @@ BSQL_PROTECT_DATUM(/datum/entity/player)
 			LAZYSET(stats, S.stat_id, S)
 
 /datum/entity/player/proc/load_byond_account_age()
-	var/datum/http_request/request = new()
-	request.prepare(RUSTG_HTTP_METHOD_GET, "https://www.byond.com/members/[ckey]?format=text")
-	request.execute_blocking()
-	var/datum/http_response/response = request.into_response()
-	if(response.errored)
+	var/list/http_request = world.Export("http://byond.com/members/[ckey]?format=text")
+	if(!http_request)
+		log_admin("Could not check BYOND account age for [ckey] - no response from server.")
+		return
+
+	var/body = file2text(http_request["CONTENT"])
+	if(!body)
+		log_admin("Could not check BYOND account age for [ckey] - invalid response.")
 		return
 
 	var/static/regex/regex = regex("joined = \"(\\d{4}-\\d{2}-\\d{2})\"")
-	if(!regex.Find(response.body))
+	if(!regex.Find(body))
+		log_admin("Could not check BYOND account age for [ckey] - no valid date in response.")
 		return
 
 	byond_account_age = regex.group[1]

diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm
@@ -162,5 +162,5 @@
 
 		to_chat_spaced(T, html = "[SPAN_ANNOUNCEMENT_HEADER(title)]<br><br>[SPAN_ANNOUNCEMENT_BODY(message)]", type = MESSAGE_TYPE_RADIO)
 		if(isobserver(T) && !(T.client?.prefs?.toggles_sound & SOUND_OBSERVER_ANNOUNCEMENTS))
-			return
+			continue
 		playsound_client(T.client, sound_to_play, T, vol = 45)
diff --git a/code/game/area/admin_level.dm b/code/game/area/admin_level.dm
@@ -113,6 +113,10 @@
 	name = "UPP Station"
 	icon_state = "green"
 
+/area/adminlevel/ert_station/pizza_station
+	name = "Pizza Galaxy"
+	icon_state = "red"
+
 /area/adminlevel/ert_station/clf_station
 	name = "CLF Station"
 	icon_state = "white"

diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm
@@ -366,8 +366,12 @@
 	name = "\improper Upper Deck Aft Hallway"
 	icon_state = "aft"
 
-/area/almayer/hallways/upper/stern_hallway
-	name = "\improper Upper Deck Stern Hallway"
+/area/almayer/hallways/upper/fore_hallway
+	name = "\improper Upper Deck Fore Hallway"
+	icon_state = "stern"
+
+/area/almayer/hallways/upper/midship_hallway
+	name = "\improper Upper Deck Midship Hallway"
 	icon_state = "stern"
 
 /area/almayer/hallways/upper/port
@@ -425,6 +429,18 @@
 /area/almayer/maint/upper/u_m_s
 	name = "\improper Upper Deck Starboard-Midship Maintenance"
 
+/area/almayer/maint/upper/u_f_p
+	name = "\improper Upper Deck Port-Fore Maintenance"
+
+/area/almayer/maint/upper/u_f_s
+	name = "\improper Upper Deck Starboard-Fore Maintenance"
+
+/area/almayer/maint/upper/u_a_p
+	name = "\improper Upper Deck Port-Aft Maintenance"
+
+/area/almayer/maint/upper/u_a_s
+	name = "\improper Upper Deck Starboard-Aft Maintenance"
+
 // hull areas
 /area/almayer/maint/hull