Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to ghfsdhgh

.github/workflows/tgs_test.yml

@@ -35,7 +35,7 @@ env:
   PR_NUMBER: ${{ github.event.number }}
 jobs:
   test_tgs_docker:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Test TGS Docker
     runs-on: ubuntu-22.04
     concurrency:
@@ -47,7 +47,7 @@ jobs:
         env:
           Database__DatabaseType: Sqlite
           Database__ConnectionString: Data Source=TGS_TGTest.sqlite3;Mode=ReadWriteCreate
-          General__ConfigVersion: 4.1.0
+          General__ConfigVersion: 5.0.0
           General__ApiPort: ${{ env.TGS_API_PORT }}
           General__SetupWizardMode: Never
         ports:
@@ -56,7 +56,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Checkout Repository
         uses: actions/checkout@v3

.vscode/settings.json

@@ -17,14 +17,14 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.insertFinalNewline": true,
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"[python]": {
 		"gitlens.codeLens.symbolScopes": ["!Module"],
-		"editor.wordBasedSuggestions": false,
+		"editor.wordBasedSuggestions": "off",
 		"editor.insertSpaces": true,
 		"editor.tabSize": 4
 	},

_maps/configs/independent_shetland.json

@@ -22,11 +22,6 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Lieutenant": {
-			"outfit": "/datum/outfit/job/lieutenant",
-			"officer": true,
-			"slots": 1
-		},
 		"First Mate": {
 			"outfit": "/datum/outfit/job/head_of_personnel",
 			"officer": true,

_maps/shuttles/independent/independent_beluga.dmm

@@ -641,7 +641,6 @@
 /obj/item/clothing/head/beret/hop,
 /obj/item/radio/headset/heads/head_of_personnel,
 /obj/item/clothing/glasses/sunglasses/big,
-/obj/item/clothing/suit/toggle/lieutenant,
 /obj/item/clothing/suit/toggle/lawyer/burgundy,
 /obj/item/clothing/suit/toggle/lawyer/navy,
 /obj/item/clothing/head/hopcap,

_maps/shuttles/independent/independent_shetland.dmm

@@ -64,7 +64,6 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/effect/landmark/start/lieutenant,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "aG" = (
@@ -1240,18 +1239,21 @@
 /obj/machinery/button/door{
 	id = "amogusdoors";
 	name = "Blast Door Control";
-	pixel_x = 5;
-	pixel_y = 5
+	pixel_x = 6;
+	pixel_y = 7
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/button/door{
 	id = "amoguswindows";
 	name = "Window Lockdown";
-	pixel_x = -5;
-	pixel_y = -5
+	pixel_x = -7;
+	pixel_y = 7
 	},
 /obj/effect/turf_decal/corner/opaque/neutral/half,
 /obj/item/radio/intercom/directional/north,
+/obj/item/phone{
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "mG" = (
@@ -1395,16 +1397,22 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "oB" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/corner/opaque/neutral/three_quarters{
-	dir = 4
-	},
-/obj/item/phone,
-/obj/item/megaphone/command{
-	pixel_x = 10
-	},
 /obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/dark,
+/obj/structure/closet/secure_closet{
+	icon_state = "hop";
+	name = "\proper first officer's locker";
+	req_access_txt = "57"
+	},
+/obj/item/clothing/under/rank/command/head_of_personnel,
+/obj/item/clothing/under/rank/command/head_of_personnel/skirt,
+/obj/item/clothing/suit/armor/vest/hop,
+/obj/item/clothing/head/beret/hop,
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/clothing/shoes/laceup,
+/obj/item/radio/headset/headset_com/alt,
+/obj/item/storage/box/ids,
+/obj/item/storage/briefcase,
+/turf/open/floor/carpet/blue,
 /area/ship/bridge)
 "oC" = (
 /obj/structure/cable{
@@ -1615,15 +1623,18 @@
 "qE" = (
 /obj/machinery/light/small/directional/south,
 /obj/structure/table/reinforced,
-/obj/effect/turf_decal/corner/opaque/neutral/half{
-	dir = 1
-	},
 /obj/item/paper_bin,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
+/obj/item/megaphone/command{
+	pixel_x = 10
+	},
+/obj/effect/turf_decal/corner/opaque/neutral/three_quarters{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "qJ" = (
@@ -3621,11 +3632,22 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/closet/secure_closet/true_lieutenant,
 /obj/machinery/light_switch{
 	pixel_x = 11;
 	pixel_y = 23
 	},
+/obj/structure/closet/secure_closet{
+	icon_state = "cap";
+	name = "\proper captain's locker";
+	req_access_txt = "20"
+	},
+/obj/item/clothing/under/rank/command/captain/suit,
+/obj/item/clothing/under/rank/command/captain/skirt,
+/obj/item/storage/backpack/captain,
+/obj/item/radio/headset/heads/captain/alt,
+/obj/item/clothing/gloves/color/captain,
+/obj/item/gun/energy/e_gun,
+/obj/item/clothing/shoes/laceup,
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)
 "KN" = (
@@ -4063,12 +4085,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/ship/medical)
-"OD" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
 "OE" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -6769,9 +6785,9 @@ dl
 LL
 TY
 Ft
-OD
+aw
 Lr
-OD
+aw
 xq
 TY
 LL

_maps/shuttles/nanotrasen/nanotrasen_delta.dmm

@@ -1095,10 +1095,6 @@
 /obj/item/clothing/suit/hooded/wintercoat/captain,
 /obj/item/clothing/under/rank/command/captain/nt,
 /obj/item/clothing/under/rank/command/captain/nt/skirt,
-/obj/item/clothing/suit/toggle/lieutenant{
-	desc = "Threadbare and uncharacteristically casual for Nanotrasen. Probably rebadged surplus from some colonial militia.";
-	name = "tattered captain's jacket"
-	},
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/head/caphat/nt,
 /obj/item/stock_parts/cell/gun,

_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm

@@ -3391,10 +3391,6 @@
 /obj/item/clothing/under/rank/command/captain/nt,
 /obj/item/clothing/head/caphat/nt,
 /obj/item/clothing/shoes/laceup,
-/obj/item/clothing/suit/toggle/lieutenant{
-	desc = "Threadbare and uncharacteristically casual for Nanotrasen. Probably rebadged surplus from some colonial militia.";
-	name = "tattered captain's jacket"
-	},
 /obj/item/clothing/glasses/sunglasses,
 /obj/effect/turf_decal/borderfloor{
 	dir = 1

_maps/shuttles/nanotrasen/nanotrasen_heron.dmm

@@ -4337,7 +4337,6 @@
 /obj/item/clothing/under/rank/security/officer/military/eng,
 /obj/item/clothing/suit/jacket/leather/duster,
 /obj/item/clothing/suit/jacket/miljacket,
-/obj/item/clothing/head/beret/lt,
 /obj/item/clothing/mask/bandana/skull,
 /obj/item/clothing/suit/armor/vest/marine,
 /obj/item/instrument/piano_synth/headphones/spacepods{
@@ -9392,7 +9391,6 @@
 /obj/item/clothing/under/rank/security/officer/military/eng,
 /obj/item/clothing/suit/jacket/leather/duster,
 /obj/item/clothing/suit/jacket/miljacket,
-/obj/item/clothing/head/beret/lt,
 /obj/item/clothing/suit/armor/vest/marine,
 /obj/item/instrument/piano_synth/headphones/spacepods{
 	pixel_x = -5;

_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm

@@ -3009,7 +3009,6 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/suit/jacket/miljacket,
 /obj/item/clothing/suit/jacket/leather/duster/command,
-/obj/item/clothing/head/beret/lt,
 /obj/item/storage/backpack/messenger/com,
 /obj/item/storage/backpack/satchel/cap,
 /obj/item/storage/backpack/captain,

_maps/shuttles/syndicate/syndicate_aegis.dmm

@@ -46,9 +46,6 @@
 	},
 /obj/item/storage/belt/sabre,
 /obj/item/reagent_containers/glass/beaker/unholywater,
-/obj/item/clothing/suit/armor/hos/trenchcoat{
-	name = "syndicate jacket"
-	},
 /obj/item/clothing/mask/gas/syndicate,
 /turf/open/floor/wood/walnut,
 /area/ship/crew/dorm)

_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm

@@ -3146,9 +3146,6 @@
 	},
 /obj/item/clothing/under/syndicate/combat,
 /obj/item/clothing/under/syndicate/officer,
-/obj/item/clothing/suit/armor/vest/security/hos{
-	name = "Syndicate jacket"
-	},
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
 /obj/item/clothing/gloves/krav_maga/combatglovesplus,
 /obj/item/clothing/shoes/jackboots,

code/__DEFINES/misc.dm

@@ -474,3 +474,7 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define CUSTOM_HOLODECK_ONE (1<<1)
 #define CUSTOM_HOLODECK_TWO (1<<2)
 #define HOLODECK_DEBUG (1<<3)//you should never see this
+
+#define ROUND_END_NOT_DELAYED 0
+#define ROUND_END_DELAYED 1
+#define ROUND_END_TGS 2

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.7.0"
+#define TGS_DMAPI_VERSION "7.0.1"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
@@ -73,12 +73,12 @@
 #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3
 /// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path.
 #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4
-/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND.
-#define TGS_EVENT_BYOND_INSTALL_START 5
-/// When a BYOND install operation fails. Parameters: Error message
-#define TGS_EVENT_BYOND_INSTALL_FAIL 6
-/// When the active BYOND version changes.  Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND.
-#define TGS_EVENT_BYOND_ACTIVE_VERSION_CHANGE 7
+/// Before a engine install operation begins. Parameters: Version string of the installing engine.
+#define TGS_EVENT_ENGINE_INSTALL_START 5
+/// When a engine install operation fails. Parameters: Error message
+#define TGS_EVENT_ENGINE_INSTALL_FAIL 6
+/// When the active engine version changes. Parameters: (Nullable) Version string of the current engine, version string of the new engine.
+#define TGS_EVENT_ENGINE_ACTIVE_VERSION_CHANGE 7
 /// When the compiler starts running. Parameters: Game directory path, origin commit SHA.
 #define TGS_EVENT_COMPILE_START 8
 /// When a compile is cancelled. No parameters.
@@ -108,7 +108,7 @@
 // #define TGS_EVENT_DREAM_DAEMON_LAUNCH 22
 /// After a single submodule update is performed. Parameters: Updated submodule name.
 #define TGS_EVENT_REPO_SUBMODULE_UPDATE 23
-/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, byond version.
+/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, version string of the used engine.
 #define TGS_EVENT_PRE_DREAM_MAKER 24
 /// Whenever a deployment folder is deleted from disk. Parameters: Game directory path.
 #define TGS_EVENT_DEPLOYMENT_CLEANUP 25
@@ -122,6 +122,7 @@
 /// The watchdog will restart on reboot.
 #define TGS_REBOOT_MODE_RESTART 2
 
+// Note that security levels are currently meaningless in OpenDream
 /// DreamDaemon Trusted security level.
 #define TGS_SECURITY_TRUSTED 0
 /// DreamDaemon Safe security level.
@@ -136,6 +137,11 @@
 /// DreamDaemon invisible visibility level.
 #define TGS_VISIBILITY_INVISIBLE 2
 
+/// The Build Your Own Net Dream engine.
+#define TGS_ENGINE_TYPE_BYOND 0
+/// The OpenDream engine.
+#define TGS_ENGINE_TYPE_OPENDREAM 1
+
 //REQUIRED HOOKS
 
 /**
@@ -449,6 +455,10 @@
 /world/proc/TgsVersion()
 	return
 
+/// Returns the running engine type
+/world/proc/TgsEngine()
+	return
+
 /// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping!
 /world/proc/TgsApiVersion()
 	return

code/__HELPERS/chat.dm

@@ -47,18 +47,17 @@ In TGS3 it will always be sent to all connected designated game chats.
 
 	var/datum/tgs_version/version = world.TgsVersion()
 	if(channel_tag == "" || version.suite == 3)
-		world.TgsTargetedChatBroadcast(message, FALSE)
+		world.TgsTargetedChatBroadcast(new /datum/tgs_message_content(message), FALSE)
 		return
 
 	var/list/channels_to_use = list()
-	for(var/I in world.TgsChatChannelInfo())
-		var/datum/tgs_chat_channel/channel = I
+	for(var/datum/tgs_chat_channel/channel as anything in world.TgsChatChannelInfo())
 		var/list/applicable_tags = splittext(channel.custom_tag, ",")
 		if(channel_tag in applicable_tags)
 			channels_to_use += channel
 
-	if(channels_to_use.len)
-		world.TgsChatBroadcast(message, channels_to_use)
+	if(length(channels_to_use))
+		world.TgsChatBroadcast(new /datum/tgs_message_content(message), channels_to_use)
 
 /**
  * Sends a message to TGS admin chat channels.
@@ -69,4 +68,4 @@ In TGS3 it will always be sent to all connected designated game chats.
 /proc/send2adminchat(category, message)
 	category = replacetext(replacetext(category, "\proper", ""), "\improper", "")
 	message = replacetext(replacetext(message, "\proper", ""), "\improper", "")
-	world.TgsTargetedChatBroadcast("[category] | [message]", TRUE)
+	world.TgsTargetedChatBroadcast(new /datum/tgs_message_content("[category] | [message]"), TRUE)

code/controllers/subsystem/ping.dm

@@ -13,8 +13,8 @@ SUBSYSTEM_DEF(ping)
 
 	var/list/currentrun = list()
 
-/datum/controller/subsystem/ping/stat_entry()
-	..("P:[GLOB.clients.len]")
+/datum/controller/subsystem/ping/stat_entry(msg)
+	return ..("P:[GLOB.clients.len]")
 
 /datum/controller/subsystem/ping/fire(resumed = FALSE)
 	// Prepare the new batch of clients

code/datums/components/storage/concrete/pockets.dm

@@ -117,16 +117,6 @@
 	max_items = 2
 	max_w_class = WEIGHT_CLASS_BULKY
 
-/datum/component/storage/concrete/pockets/holster/lt/Initialize()
-	original_parent = parent
-	. = ..()
-	can_hold = typecacheof(list(
-		/obj/item/gun/energy/e_gun/adv_stopping,
-		/obj/item/gun/energy/e_gun/mini,
-		/obj/item/gun/energy/disabler,
-		/obj/item/stock_parts/cell/gun
-	))
-
 /datum/component/storage/concrete/pockets/holster/nukie/Initialize()
 	original_parent = parent
 	. = ..()