Merge branch 'master' into Screwdriver-and-autolathe

BlueMoon-Labs · Jan 12, 2025 · 30534ad · 30534ad
2 parents 4a179ab + 2a95a32
commit 30534ad
Show file tree

Hide file tree

Showing 96 changed files with 13,862 additions and 1,223 deletions.
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -2814,6 +2814,12 @@
 /obj/machinery/computer/med_data{
 	dir = 4
 	},
+/obj/machinery/requests_console{
+	department = "Chief Medical Officer's Desk";
+	name = "Chief Medical Officer RC";
+	pixel_y = -1;
+	pixel_x = -32
+	},
 /turf/open/floor/plasteel/white,
 /area/command/heads_quarters/cmo)
 "anQ" = (
@@ -15172,6 +15178,7 @@
 	network = list("ss13","medbay")
 	},
 /obj/machinery/cell_charger,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "blo" = (
@@ -36491,6 +36498,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "cJC" = (
@@ -39116,6 +39126,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "dPR" = (
@@ -43620,6 +43633,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "goh" = (
@@ -44639,6 +44655,9 @@
 	id_tag = "MedbayFoyer";
 	name = "Medbay"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/medical/medbay/central)
 "gMQ" = (
@@ -54447,6 +54466,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "mmX" = (
@@ -56510,6 +56532,17 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/factory)
+"nuY" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+	id = "chemistry_shutters2";
+	name = "Chemistry Shutter"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/medical/medbay/factory)
 "nvj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable{
@@ -64199,6 +64232,9 @@
 	icon_state = "1-8"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "rNc" = (
@@ -65653,7 +65689,6 @@
 "sFg" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -65690,10 +65725,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4;
-	external_pressure_bound = 140;
-	name = "server vent";
-	pressure_checks = 0
+	dir = 4
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
@@ -67027,6 +67059,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "tuQ" = (
@@ -67484,13 +67519,11 @@
 /area/maintenance/starboard/aft)
 "tKk" = (
 /obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
 /obj/machinery/airalarm/directional/south,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "tKE" = (
@@ -69446,6 +69479,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "uRS" = (
@@ -69553,6 +69589,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/medical/medbay/central)
 "uUP" = (
@@ -108804,7 +108843,7 @@ uJS
 qYG
 epz
 fCQ
-epz
+nuY
 uJS
 uJS
 uJS

diff --git a/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm b/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm
@@ -64721,10 +64721,6 @@
 	},
 /turf/open/floor/circuit,
 /area/science/nanite)
-"usD" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/openspace,
-/area/maintenance/department/science/upper)
 "usO" = (
 /obj/structure/chair/comfy,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -240918,7 +240914,7 @@ ylx
 kWS
 oxE
 dFe
-usD
+pVM
 pVM
 pVM
 pVM

diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
@@ -50,14 +50,14 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
 	if(!second)
 		return "сейчас"
 	if(second < 60)
-		return "[second] секунд[(second != 1)? "":"у"]"
+		return "[second] секунд[second % 10 == 1 && second % 100 != 11 ? "а" : (second % 10 >= 2 && second % 10 <= 4 && (second % 100 < 10 || second % 100 >= 20) ? "ы" : "")]"
 	var/minute = FLOOR(second / 60, 1)
 	second = FLOOR(MODULUS(second, 60), round_seconds_to)
 	var/secondT
 	if(second)
-		secondT = " и [second] секунд[(second != 1)? "":"у"]"
+		secondT = " и [second] секунд[second % 10 == 1 && second % 100 != 11 ? "а" : (second % 10 >= 2 && second % 10 <= 4 && (second % 100 < 10 || second % 100 >= 20) ? "ы" : "")]"
 	if(minute < 60)
-		return "[minute] минут[(minute != 1)? "":"ы"][secondT]"
+		return "[minute] минут[minute % 10 == 1 && minute % 100 != 11 ? "а" : (minute % 10 >= 2 && minute % 10 <= 4 && (minute % 100 < 10 || minute % 100 >= 20) ? "ы" : "")][secondT]"
 	var/hour = FLOOR(minute / 60, 1)
 	minute = MODULUS(minute, 60)
 	var/minuteT

diff --git a/code/__SANDCODE/DEFINES/chat.dm b/code/__SANDCODE/DEFINES/chat.dm
@@ -1,4 +1,6 @@
 /// Adds a generic box around whatever message you're sending in chat. Really makes things stand out.
 #define examine_block(str) ("<div class='examine_block'>" + str + "</div>")
+#define vote_block(str) ("<div class='votepanel'>" + str + "</div>")
+#define vote_results(str) ("<div class='voteresults'>" + str + "</div>")
 
 #define MESSAGE_TYPE_INFO "info"
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
@@ -738,7 +738,9 @@ SUBSYSTEM_DEF(job)
 	var/mob/the_mob = N
 	if(!the_mob)
 		the_mob = M // cause this doesn't get assigned if player is a latejoiner
-	var/list/chosen_gear = the_mob.client.prefs.loadout_data["SAVE_[the_mob.client.prefs.loadout_slot]"]
+	var/list/chosen_gear
+	if(the_mob.client.prefs.loadout_data)
+		chosen_gear = the_mob.client.prefs.loadout_data["SAVE_[the_mob.client.prefs.loadout_slot]"]
 	var/heirloomer = FALSE
 	if(!is_dummy)
 		var/list/my_quirks = the_mob.client.prefs.all_quirks.Copy()
@@ -824,7 +826,9 @@ SUBSYSTEM_DEF(job)
 	var/mob/the_mob = N
 	if(!the_mob)
 		the_mob = M // cause this doesn't get assigned if player is a latejoiner
-	var/list/chosen_gear = the_mob.client.prefs.loadout_data["SAVE_[the_mob.client.prefs.loadout_slot]"]
+	var/list/chosen_gear
+	if(the_mob.client.prefs.loadout_data)
+		chosen_gear = the_mob.client.prefs.loadout_data["SAVE_[the_mob.client.prefs.loadout_slot]"]
 	var/heirloomer = FALSE
 	if(!is_dummy)
 		var/list/my_quirks = the_mob.client.prefs.all_quirks.Copy()

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -199,6 +199,7 @@ SUBSYSTEM_DEF(ticker)
 			// BLUEMOON ADD START - воут за карту и перезагрузка сервера, если прошлый раунд окончился крашем
 			if(mapvote_restarter_in_progress)
 				return
+			#ifndef LOWMEMORYMODE
 			if(!SSpersistence.CheckGracefulEnding())
 				SetTimeLeft(-1)
 				start_immediately = FALSE
@@ -207,6 +208,7 @@ SUBSYSTEM_DEF(ticker)
 				SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = vote_type)
 				to_chat(world, span_boldwarning("Активировано голосование за смену карты из-за неудачного завершения прошлого раунда. После его окончания сервер будет перезапущен."))
 				return
+			#endif
 			// BLUEMOON ADD END
 
 			//lobby stats for statpanels
@@ -225,8 +227,13 @@ SUBSYSTEM_DEF(ticker)
 				var/forcemode = CONFIG_GET(string/force_gamemode)
 				if(forcemode)
 					force_gamemode(forcemode)
+				#ifndef LOWMEMORYMODE
 				if(!forcemode || (GLOB.master_mode == "dynamic" && CONFIG_GET(flag/dynamic_voting)))
 					send_gamemode_vote()
+				#else
+				modevoted = TRUE
+				SEND_SOUND(world, sound('sound/announcer/tonelow.ogg')) // Чтобы не придумывать колесо пусть будет тут
+				#endif
 			//countdown
 			if(timeLeft < 0)
 				return