[TESTMERGE ONLY] Endeavour port from EP5

.github/workflows/test.yml

@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        map_path: [example, tradeship, nexus, exodus, ministation, away_sites_testing, modpack_testing, torch]
+        map_path: [example, tradeship, nexus, exodus, ministation, away_sites_testing, modpack_testing, torch, endeavour]
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Setup Cache

code/_global_vars/lists/flavor.dm

@@ -83,7 +83,7 @@ var/global/list/music_tracks = list(
 	"Absconditus" = /decl/music_track/absconditus,
 	"lasers rip apart the bulkhead" = /decl/music_track/lasers,
 	"Maschine Klash" = /decl/music_track/digit_one,
-	"Comet Halley" = /decl/music_track/comet_haley,
+	"Comet Halley" = /decl/music_track/comet_halley,
 	"Please Come Back Any Time" = /decl/music_track/elevator,
 	"Human" = /decl/music_track/human,
 	"Memories of Lysendraa" = /decl/music_track/lysendraa,

code/datums/music_tracks/comet_haley.dm → code/datums/music_tracks/comet_halley.dm

@@ -1,7 +1,7 @@
-/decl/music_track/comet_haley
+/decl/music_track/comet_halley
 	artist = "Stellardrone"
 	title = "Comet Halley"
 	album = "Light Years"
-	song = 'sound/music/comet_haley.ogg'
+	song = 'sound/music/comet_halley.ogg'
 	license = /decl/license/cc_by_3_0
 	url = "http://freemusicarchive.org/music/Stellardrone/Light_Years_1227/07_Comet_Halley"

code/datums/security_state.dm

@@ -184,8 +184,8 @@
 /decl/security_level/default
 	icon = 'icons/misc/security_state.dmi'
 
-	var/static/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 1, new_sound = sound('maps/torch/sounds/minor_alert.ogg'))
-	var/static/datum/announcement/priority/security/security_announcement_down = new(do_log = 0, do_newscast = 1, new_sound = sound('maps/torch/sounds/minor_alert.ogg'))
+	var/static/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 1, new_sound = sound('mods/content/hearth_maps/sounds/minor_alert.ogg'))
+	var/static/datum/announcement/priority/security/security_announcement_down = new(do_log = 0, do_newscast = 1, new_sound = sound('mods/content/hearth_maps/sounds/minor_alert.ogg'))
 
 /decl/security_level/default/switching_up_to()
 	if(up_description)

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -32,6 +32,24 @@
 	. += new/datum/atom_creator/simple(/obj/item/oxycandle, 75)
 	. += new/datum/atom_creator/simple(/obj/item/storage/firstaid/regular, 25)
 
+/*
+ * Wall-Mounted Emergency Closet
+ */
+/obj/structure/closet/walllocker/emerglocker
+	name = "emergency locker"
+	desc = "A wall mounted locker with emergency supplies."
+	closet_appearance = /decl/closet_appearance/wall/emergency
+
+/obj/structure/closet/walllocker/emerglocker/WillContain()
+	//Guaranteed kit - two tanks, two masks, two O2 pouches, and a softsuit
+	. = list(/obj/item/tank/emergency/oxygen/engi = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/storage/med_pouch/oxyloss = 2)
+
+	. += new/datum/atom_creator/simple(list(/obj/item/storage/toolbox/emergency, /obj/item/inflatable/wall = 2), 75)
+	. += new/datum/atom_creator/simple(/obj/item/oxycandle, 75)
+	. += new/datum/atom_creator/simple(/obj/item/storage/firstaid/regular, 25)
+
 /*
  * Fire Closet
  */

code/modules/reagents/heat_sources/_heat_source.dm

@@ -10,8 +10,8 @@
 	icon = 'icons/obj/machines/heat_sources.dmi'
 	icon_state = "hotplate"
 	atom_flags = ATOM_FLAG_CLIMBABLE
-	density =    TRUE
-	anchored =   TRUE
+	density = FALSE
+	anchored = TRUE
 	idle_power_usage = 0
 	active_power_usage = 1.2 KILOWATTS
 	construct_state = /decl/machine_construction/default/panel_closed

code/modules/reagents/reagent_containers/condiment.dm

@@ -98,11 +98,13 @@
 		var/obj/item/chems/condiment/special_bottle = special_bottles[reagent]
 		name = initial(special_bottle.name)
 		desc = initial(special_bottle.desc)
+		icon = initial(special_bottle.icon)
 		icon_state = initial(special_bottle.icon_state)
 		center_of_mass = initial(special_bottle.center_of_mass)
 	else
 		name = initial(name)
 		desc = initial(desc)
+		icon = initial(icon)
 		center_of_mass = initial(center_of_mass)
 		if(LAZYLEN(reagents.reagent_volumes))
 			icon_state = "mixedcondiments"

code/unit_tests/map_tests.dm

@@ -27,21 +27,25 @@
 			log_bad("[bad_msg] lacks an APC.")
 			area_good = 0
 		else if(A.apc && (exemptions & global.using_map.NO_APC))
-			log_bad("[bad_msg] is not supposed to have an APC.")
+			log_bad("[bad_msg] is not supposed to have an APC, but has one: [log_info_line(A.apc)].")
 			area_good = 0
 
 		if(!A.air_scrub_names.len && !(exemptions & global.using_map.NO_SCRUBBER))
 			log_bad("[bad_msg] lacks an air scrubber.")
 			area_good = 0
 		else if(A.air_scrub_names.len && (exemptions & global.using_map.NO_SCRUBBER))
-			log_bad("[bad_msg] is not supposed to have an air scrubber.")
+			log_bad("[bad_msg] is not supposed to have an air scrubber, but has [A.air_scrub_names.len]:")
+			for(var/obj/machinery/atmospherics/unary/vent_scrubber/scrubber in A)
+				log_bad("\t[log_info_line(scrubber)]")
 			area_good = 0
 
 		if(!A.air_vent_names.len && !(exemptions & global.using_map.NO_VENT))
 			log_bad("[bad_msg] lacks an air vent.[ascii_reset]")
 			area_good = 0
 		else if(A.air_vent_names.len && (exemptions & global.using_map.NO_VENT))
 			log_bad("[bad_msg] is not supposed to have an air vent.")
+			for(var/obj/machinery/atmospherics/unary/vent_pump/vent in A)
+				log_bad("\t[log_info_line(vent)]")
 			area_good = 0
 
 		if(!area_good)

maps/endeavour/decals/floor_decals.dm

@@ -0,0 +1,8 @@
+/obj/effect/floor_decal/hull_marking
+	icon = 'maps/endeavour/icons/hull_markings.dmi'
+
+/obj/effect/floor_decal/hull_marking/endeavour
+	icon_state = "ship_name"
+
+/obj/effect/floor_decal/hull_marking/designation
+	icon_state = "designation"