Merge branch 'master' of https://github.com/wonderinghost/Yogstation

Author: wonderinghost

.github/guides/DOWNLOADING.md

@@ -10,7 +10,7 @@ code tab of https://github.com/yogstation13/Yogstation
 (note: this will use a lot of bandwidth if you wish to update and is a lot of
 hassle if you want to make any changes at all, so it's not recommended.)
 
-## The Yogstation codebase recommends compiling using version [514.1589](https://www.byond.com/download/build/514/514.1589_byond.exe) and may potentially NOT work on newer or older versions.
+## The Yogstation codebase recommends compiling using version [514.1642](https://www.byond.com/download/build/514/514.1642_byond.exe) and may potentially NOT work on newer or older versions.
 
 ## :exclamation: How to compile :exclamation:
 

.github/workflows/turdis.yml

@@ -193,7 +193,7 @@ jobs:
           cp yogstation.rsc artifacts
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: DMB + RSC ${{matrix.map}}
           path: ${{github.workspace}}/artifacts

_maps/RandomZLevels/caves.dmm

@@ -1401,7 +1401,7 @@
 /area/awaymission/caves/BMP_asteroid)
 "el" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "em" = (
@@ -1650,8 +1650,8 @@
 "fc" = (
 /obj/structure/closet/crate,
 /obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
-/obj/item/gun/energy/laser/captain/scattershot,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /obj/item/gun/energy/laser,
 /obj/item/grenade/syndieminibomb/concussion,
 /obj/item/grenade/syndieminibomb/concussion,
@@ -1726,7 +1726,7 @@
 	},
 /obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
 /obj/item/organ/eyes/robotic/thermals,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /obj/item/slimepotion/fireproof,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
@@ -1789,7 +1789,7 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_two)
 "fw" = (
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
 	},

_maps/map_files/AsteroidStation/AsteroidStation.dmm

@@ -26154,6 +26154,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
+"hpK" = (
+/obj/effect/spawner/backrooms_portal,
+/turf/open/floor/plasteel,
+/area/quartermaster/warehouse)
 "hqn" = (
 /obj/structure/table/wood,
 /obj/effect/spawner/lootdrop/randomdrink,
@@ -94156,7 +94160,7 @@ aJI
 aZs
 xga
 xIK
-hSk
+hpK
 dCg
 gBO
 aZs

_maps/map_files/DonutStation/DonutStation.dmm

@@ -18389,6 +18389,7 @@
 	c_tag = "Cargo - Disposals Office";
 	dir = 8
 	},
+/obj/effect/spawner/backrooms_portal,
 /turf/open/floor/plasteel,
 /area/quartermaster/sorting)
 "hBq" = (
@@ -54697,6 +54698,7 @@
 /obj/item/melee/sledgehammer,
 /obj/item/storage/bag/trash,
 /obj/item/broom,
+/mob/living/simple_animal/parrot/shipbreaking_hawk,
 /turf/open/floor/plasteel,
 /area/escapepodbay)
 "wNb" = (

_maps/map_files/GaxStation/GaxStation.dmm

@@ -11818,6 +11818,18 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/storage/eva)
+"fzv" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/rack,
+/obj/item/tank/internals/oxygen,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/bag/sheetsnatcher,
+/obj/item/melee/sledgehammer,
+/obj/item/storage/bag/trash,
+/obj/item/broom,
+/mob/living/simple_animal/parrot/shipbreaking_hawk,
+/turf/open/floor/plasteel/dark,
+/area/escapepodbay)
 "fzA" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engine Room"
@@ -33349,6 +33361,7 @@
 "qcV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small,
+/obj/effect/spawner/backrooms_portal,
 /turf/open/floor/plasteel,
 /area/quartermaster/warehouse)
 "qcW" = (
@@ -96144,7 +96157,7 @@ mfB
 vTL
 tkQ
 faP
-xRw
+fzv
 iLQ
 dYL
 dYL

_maps/map_files/IceMeta/IceMeta.dmm

@@ -44533,6 +44533,7 @@
 	pixel_x = 24;
 	pixel_y = -1
 	},
+/mob/living/simple_animal/parrot/shipbreaking_hawk,
 /turf/open/floor/plasteel/dark,
 /area/escapepodbay)
 "mQz" = (
@@ -71140,6 +71141,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/backrooms_portal,
 /turf/open/floor/plasteel,
 /area/quartermaster/warehouse)
 "ute" = (

_maps/map_files/YogStation/YogStation.dmm

@@ -10112,6 +10112,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "bAj" = (
+/mob/living/simple_animal/parrot/shipbreaking_hawk,
 /turf/open/floor/plasteel/dark,
 /area/escapepodbay)
 "bAo" = (
@@ -57194,6 +57195,11 @@
 /obj/machinery/teleport/station,
 /turf/open/floor/plating,
 /area/teleporter)
+"rGx" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/backrooms_portal,
+/turf/open/floor/plasteel,
+/area/quartermaster/warehouse)
 "rHf" = (
 /turf/open/floor/engine/vacuum,
 /area/engine/atmos/mix)
@@ -96590,7 +96596,7 @@ aTD
 aPG
 bbq
 gjl
-baS
+rGx
 hFo
 baS
 baS

_maps/map_files/generic/CentCom.dmm

@@ -18388,7 +18388,7 @@
 	dir = 8
 	},
 /obj/item/gun/energy/gravity_gun,
-/obj/item/gun/energy/laser/captain/scattershot{
+/obj/item/gun/energy/laser/scattershot{
 	pixel_y = 8
 	},
 /obj/item/gun/energy/wormhole_projector{

code/__DEFINES/atom_hud.dm

@@ -40,10 +40,12 @@
 #define AI_DETECT_HUD	"19"
 #define NANITE_HUD "20"
 #define DIAG_NANITE_FULL_HUD "21"
+/// Shows mech overheating status.
+#define DIAG_OVERHEAT_HUD "22"
 /// Displays launchpads' targeting reticle
-#define DIAG_LAUNCHPAD_HUD "22"
+#define DIAG_LAUNCHPAD_HUD "23"
 //for antag huds. these are used at the /mob level
-#define ANTAG_HUD		"23"
+#define ANTAG_HUD		"24"
 
 //by default everything in the hud_list of an atom is an image
 //a value in hud_list with one of these will change that behavior