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

wonderinghost · Sep 21, 2024 · a8b1798 · a8b1798
2 parents 8fae2c2 + 4a64881
commit a8b1798
Show file tree

Hide file tree

Showing 111 changed files with 1,371 additions and 574 deletions.
diff --git a/.github/guides/DOWNLOADING.md b/.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:
 

diff --git a/.github/workflows/turdis.yml b/.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

diff --git a/_maps/RandomZLevels/caves.dmm b/_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"
 	},

diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_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

diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_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" = (

diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_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

diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_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" = (

diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_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

diff --git a/_maps/map_files/generic/CentCom.dmm b/_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{

diff --git a/code/__DEFINES/atom_hud.dm b/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

diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm
@@ -84,3 +84,5 @@
 #define COMSIG_STARLIGHT_COLOR_CHANGED "!starlight_color_changed"
 /// Global signal sent when darkspawns ascend: (No arguments)
 #define COMSIG_DARKSPAWN_ASCENSION "!darkspawn_ascension"
+/// Global signal sent when the backrooms finishes initailizing: (No arguments)
+#define COMSIG_BACKROOMS_INITIALIZE "!backrooms_initialize"
diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm
@@ -19,6 +19,7 @@
 #define SEAFOOD		(1<<18)
 #define MICE		(1<<19) //disliked/liked by anything that dislikes/likes any of RAW, MEAT, or GROSS, except felinids
 #define NUTS 		(1<<20)
+#define COFFEE 		(1<<21)
 
 /// A list of food type names, in order of their flags
 #define FOOD_FLAGS list( \

diff --git a/code/__DEFINES/mecha.dm b/code/__DEFINES/mecha.dm
@@ -0,0 +1,36 @@
+#define MECHA_INT_FIRE			(1<<0)
+#define MECHA_INT_TEMP_CONTROL	(1<<1)
+#define MECHA_INT_SHORT_CIRCUIT	(1<<2)
+#define MECHA_INT_TANK_BREACH	(1<<3)
+#define MECHA_INT_CONTROL_LOST	(1<<4)
+
+#define MECHA_MELEE (1<<0)
+#define MECHA_RANGED (1<<1)
+
+#define FRONT_ARMOUR 1
+#define SIDE_ARMOUR 2
+#define BACK_ARMOUR 3
+
+#define MECHA_MAX_COOLDOWN 30 // Prevents long cooldown equipment from messing up combat
+
+/// Minimum overheat to show an alert to the pilot
+#define OVERHEAT_WARNING 50
+/// Minimum overheat required to cause slowdown
+#define OVERHEAT_THRESHOLD 100
+/// Maximum overheat caused by EMPs, prevents permanent lockdown from ion rifles
+#define OVERHEAT_EMP_MAX 130
+/// Maximum overheat level possible, causes total immobilization
+#define OVERHEAT_MAXIMUM 150
+/// Amount of overheat reduced every process
+#define PASSIVE_COOLING -5
+/// Amount of cooling per decisecond-tick while stationary
+#define STATIONARY_COOLING -0.1
+/// Maximum cooling per second-tick from being stationary
+#define STATIONARY_COOLING_MAXIMUM -10
+/// Maximum heating from being in a hot environment
+#define ENVIRONMENT_HEATING 5
+/// Overheating per tile moved when overload is active
+#define OVERLOAD_HEAT_COST 4
+
+/// This trait is caused by overheating
+#define OVERHEAT_TRAIT "overheating"
diff --git a/code/__DEFINES/projectiles.dm b/code/__DEFINES/projectiles.dm
@@ -7,4 +7,5 @@
 
 // Penetration flags
 #define PENETRATE_OBJECTS (1<<0)
-#define PENETRATE_MOBS (1<<1)
+#define PENETRATE_WALLS	(1<<1)
+#define PENETRATE_MOBS (1<<2)
diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
@@ -244,10 +244,10 @@
 #define set_derpspeech(duration) set_timed_status_effect(duration, /datum/status_effect/speech/stutter/derpspeech)
 #define set_derpspeech_if_lower(duration) set_timed_status_effect(duration, /datum/status_effect/speech/stutter/derpspeech, TRUE)
 
-#define adjust_slurring(duration) adjust_timed_status_effect(duration, /datum/status_effect/speech/slurring/drunk)
-#define adjust_slurring_up_to(duration, up_to) adjust_timed_status_effect(duration, /datum/status_effect/speech/slurring/drunk, up_to)
-#define set_slurring(duration) set_timed_status_effect(duration, /datum/status_effect/speech/slurring/drunk)
-#define set_slurring_if_lower(duration) set_timed_status_effect(duration, /datum/status_effect/speech/slurring/drunk, TRUE)
+#define adjust_slurring(duration) adjust_timed_status_effect(duration, /datum/status_effect/speech/slurring/generic)
+#define adjust_slurring_up_to(duration, up_to) adjust_timed_status_effect(duration, /datum/status_effect/speech/slurring/generic, up_to)
+#define set_slurring(duration) set_timed_status_effect(duration, /datum/status_effect/speech/slurring/generic)
+#define set_slurring_if_lower(duration) set_timed_status_effect(duration, /datum/status_effect/speech/slurring/generic, TRUE)
 
 #define adjust_dizzy(duration) adjust_timed_status_effect(duration, /datum/status_effect/dizziness)
 #define adjust_dizzy_up_to(duration, up_to) adjust_timed_status_effect(duration, /datum/status_effect/dizziness, up_to)

diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
@@ -200,6 +200,7 @@
 #define FIRE_PRIORITY_FIELDS		30
 #define FIRE_PRIORITY_SMOOTHING 	35
 #define FIRE_PRIORITY_OBJ			40
+#define FIRE_PRIORITY_MECHA			40
 #define FIRE_PRIORITY_ACID			40
 #define FIRE_PRIORITY_BURNING		40
 #define FIRE_PRIORITY_DEFAULT		50

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -129,4 +129,4 @@
  * 
  * THAT FILE IS FOUND INSIDE THE TRAITS FOLDER 
  */
-/////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
@@ -52,6 +52,8 @@
 #define TRAIT_ALIEN_SNEAK "sneaking_alien"
 ///This mob can't use vehicles
 #define TRAIT_NOVEHICLE	"no_vehicle"
+/// This mech is fully disabled
+#define TRAIT_MECH_DISABLED "mech_disabled"
 /// You can't see color!
 #define TRAIT_COLORBLIND "color_blind"
 /// This person is crying

diff --git a/code/__DEFINES/{yogs_defines}/mobs.dm b/code/__DEFINES/{yogs_defines}/mobs.dm
@@ -16,3 +16,27 @@
 #define SPECIES_VOX "vox"
 
 #define BUTT_SPRITE_VOX "vox"
+
+
+GLOBAL_REAL_VAR(list/voice_type2sound = list(
+	"1" = list(
+		"1" = sound('goon/sound/speak_1.ogg'),
+		"!" = sound('goon/sound/speak_1_exclaim.ogg'),
+		"?" = sound('goon/sound/speak_1_ask.ogg')
+	),
+	"2" = list(
+		"2" = sound('goon/sound/speak_2.ogg'),
+		"!" = sound('goon/sound/speak_2_exclaim.ogg'),
+		"?" = sound('goon/sound/speak_2_ask.ogg')
+	),
+	"3" = list(
+		"3" = sound('goon/sound/speak_3.ogg'),
+		"!" = sound('goon/sound/speak_3_exclaim.ogg'),
+		"?" = sound('goon/sound/speak_3_ask.ogg')
+	),
+	"4" = list(
+		"4" = sound('goon/sound/speak_4.ogg'),
+		"!" = sound('goon/sound/speak_4_exclaim.ogg'),
+		"?" = sound('goon/sound/speak_4_ask.ogg')
+	),
+))
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
@@ -605,6 +605,11 @@ so as to remain in compliance with the most up-to-date laws."
 	desc = "Mech integrity is low."
 	icon_state = "low_mech_integrity"
 
+/atom/movable/screen/alert/overheating
+	name = "Mech Overheating"
+	desc = "Mech internal temperature is high."
+	icon_state = "overheat"
+
 
 //GHOSTS
 //TODO: expand this system to replace the pollCandidates/CheckAntagonist/"choose quickly"/etc Yes/No messages