Merge branch 'master' into vlaady

Signed-off-by: CampinKiller24 <[email protected]>
CampinKiller24 · Jan 12, 2024 · 46c89b2 · 46c89b2
2 parents c43dcf3 + 2d39b48
commit 46c89b2
Show file tree

Hide file tree

Showing 155 changed files with 146,854 additions and 397 deletions.
diff --git a/.tgs.yml b/.tgs.yml
@@ -3,7 +3,7 @@
 version: 1
 # The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
 # Must be interpreted as a string, keep quoted
-byond: "515.1621"
+byond: "515.1623"
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static

diff --git a/aurorastation.dme b/aurorastation.dme
@@ -1034,6 +1034,7 @@
 #include "code\game\objects\items\devices\magnetic_lock.dm"
 #include "code\game\objects\items\devices\megaphone.dm"
 #include "code\game\objects\items\devices\memorywiper.dm"
+#include "code\game\objects\items\devices\minedetector.dm"
 #include "code\game\objects\items\devices\modkit.dm"
 #include "code\game\objects\items\devices\multitool.dm"
 #include "code\game\objects\items\devices\oxycandle.dm"
@@ -1053,6 +1054,7 @@
 #include "code\game\objects\items\devices\taperecorder.dm"
 #include "code\game\objects\items\devices\traitordevices.dm"
 #include "code\game\objects\items\devices\transfer_valve.dm"
+#include "code\game\objects\items\devices\tvcamera.dm"
 #include "code\game\objects\items\devices\uplink.dm"
 #include "code\game\objects\items\devices\uplink_random_lists.dm"
 #include "code\game\objects\items\devices\versebook.dm"
@@ -3606,6 +3608,11 @@
 #include "maps\away\away_site\unathi_pirate\tarwa\unathi_pirate_tarwa_areas.dm"
 #include "maps\away\away_site\unathi_pirate\tarwa\unathi_pirate_tarwa_ghostroles.dm"
 #include "maps\away\away_site\wrecked_nt_ship\wrecked_nt_ship.dm"
+#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette.dm"
+#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_areas.dm"
+#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_ghostroles.dm"
+#include "maps\away\ships\biesel\tcfl_patrol\tcfl_peacekeeper_ship.dm"
+#include "maps\away\ships\biesel\tcfl_patrol\tcfl_peacekeeper_ship_ghostroles.dm"
 #include "maps\away\ships\casino\casino.dm"
 #include "maps\away\ships\casino\casino_areas.dm"
 #include "maps\away\ships\coc\coc_ranger\coc_ship.dm"
@@ -3662,6 +3669,10 @@
 #include "maps\away\ships\heph\heph_security\heph_security_ghostroles.dm"
 #include "maps\away\ships\iac\iac_rescue_ship.dm"
 #include "maps\away\ships\iac\iac_rescue_ship_ghostroles.dm"
+#include "maps\away\ships\idris\idris_cruiser.dm"
+#include "maps\away\ships\idris\idris_cruiser_areas.dm"
+#include "maps\away\ships\idris\idris_cruiser_ghostroles.dm"
+#include "maps\away\ships\idris\idris_cruiser_landmarks.dm"
 #include "maps\away\ships\kataphracts\kataphract_areas.dm"
 #include "maps\away\ships\kataphracts\kataphract_ship.dm"
 #include "maps\away\ships\kataphracts\kataphract_ship_ghostroles.dm"
@@ -3709,8 +3720,6 @@
 #include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler.dm"
 #include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler_areas.dm"
 #include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler_ghostroles.dm"
-#include "maps\away\ships\tcfl_patrol\tcfl_peacekeeper_ship.dm"
-#include "maps\away\ships\tcfl_patrol\tcfl_peacekeeper_ship_ghostroles.dm"
 #include "maps\away\ships\tirakqi_smuggler\tirakqi_smuggler.dm"
 #include "maps\away\ships\tirakqi_smuggler\tirakqi_smuggler_areas.dm"
 #include "maps\away\ships\tirakqi_smuggler\tirakqi_smuggler_ghostroles.dm"
@@ -3781,13 +3790,20 @@
 #include "maps\random_ruins\exoplanets\delivery\delivery_site.dm"
 #include "maps\random_ruins\exoplanets\desert\desert.dm"
 #include "maps\random_ruins\exoplanets\grove\grove.dm"
+#include "maps\random_ruins\exoplanets\konyang\fireoutpost.dm"
 #include "maps\random_ruins\exoplanets\konyang\hivebot_burrows_1.dm"
 #include "maps\random_ruins\exoplanets\konyang\hivebot_burrows_2.dm"
+#include "maps\random_ruins\exoplanets\konyang\homestead.dm"
 #include "maps\random_ruins\exoplanets\konyang\jeweler_nest.dm"
 #include "maps\random_ruins\exoplanets\konyang\landing_zone.dm"
 #include "maps\random_ruins\exoplanets\konyang\pirate_moonshine.dm"
 #include "maps\random_ruins\exoplanets\konyang\pirate_outpost.dm"
+#include "maps\random_ruins\exoplanets\konyang\swamp_1.dm"
+#include "maps\random_ruins\exoplanets\konyang\swamp_2.dm"
+#include "maps\random_ruins\exoplanets\konyang\swamp_3.dm"
+#include "maps\random_ruins\exoplanets\konyang\swamp_4.dm"
 #include "maps\random_ruins\exoplanets\konyang\telecomms_outpost.dm"
+#include "maps\random_ruins\exoplanets\konyang\tribute.dm"
 #include "maps\random_ruins\exoplanets\konyang\village.dm"
 #include "maps\random_ruins\exoplanets\lava\lava.dm"
 #include "maps\random_ruins\exoplanets\raskara\pra_exploration_drone.dm"

diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
@@ -605,9 +605,9 @@
 	id = ACCESS_SOL_SHIPS
 	access_type = ACCESS_TYPE_CENTCOM
 
-#define ACCESS_TCFL_PEACEKEEPER_SHIP 204
+#define ACCESS_TCAF_SHIPS 204
 /datum/access/tcfl_peacekeeper_ship
-	id = ACCESS_TCFL_PEACEKEEPER_SHIP
+	id = ACCESS_TCAF_SHIPS
 	access_type = ACCESS_TYPE_CENTCOM
 
 #define ACCESS_EE_SPY_SHIP 205
@@ -688,7 +688,7 @@
 #define ACCESS_IDRIS 220
 /datum/access/idris
 	id = ACCESS_IDRIS
-	desc = "Idris Vault Ship"
+	desc = "Idris Ship Crew Member"
 	access_type = ACCESS_TYPE_CENTCOM
 
 #define ACCESS_COALITION 221
@@ -719,4 +719,71 @@
 #define ACCESS_HOUSE_VOLVALAAD_SHIP 226
 /datum/access/house_volvalaad_ship
 	id = ACCESS_HOUSE_VOLVALAAD_SHIP
+  access_type = ACCESS_TYPE_CENTCOM
+
+//guest rooms - for any ship/event that requires hotel-esque rooms
+
+#define ACCESS_GUEST_ROOMS 230 //use with req_one_access
+/datum/access/guest_rooms
+	id = ACCESS_GUEST_ROOMS
+	desc = "Guest Rooms - All"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_1 231
+/datum/access/guest_room_1
+	id = ACCESS_GUEST_ROOM_1
+	desc = "Guest Room 1"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_2 232
+/datum/access/guest_room_2
+	id = ACCESS_GUEST_ROOM_2
+	desc = "Guest Room 2"
 	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_3 233
+/datum/access/guest_room_3
+	id = ACCESS_GUEST_ROOM_3
+	desc = "Guest Room 3"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_4 234
+/datum/access/guest_room_4
+	id = ACCESS_GUEST_ROOM_4
+	desc = "Guest Room 4"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_5 235
+/datum/access/guest_room_5
+	id = ACCESS_GUEST_ROOM_5
+	desc = "Guest Room 5"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_6 236
+/datum/access/guest_room_6
+	id = ACCESS_GUEST_ROOM_6
+	desc = "Guest Room 6"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_7 237
+/datum/access/guest_room_7
+	id = ACCESS_GUEST_ROOM_7
+	desc = "Guest Room 7"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_8 238
+/datum/access/guest_room_8
+	id = ACCESS_GUEST_ROOM_8
+	desc = "Guest Room 8"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_9 239
+/datum/access/guest_room_9
+	id = ACCESS_GUEST_ROOM_9
+	desc = "Guest Room 9"
+	access_type = ACCESS_TYPE_CENTCOM
+
+#define ACCESS_GUEST_ROOM_10 240
+/datum/access/guest_room_10
+	id = ACCESS_GUEST_ROOM_10
+	desc = "Guest Room 10"
diff --git a/code/__DEFINES/machinery.dm b/code/__DEFINES/machinery.dm
@@ -82,6 +82,7 @@
 #define NETWORK_THIRD_DECK "Third Deck"
 #define NETWORK_INTREPID "Intrepid"
 #define NETWORK_CANARY "Canary"
+#define NETWORK_NEWS "News"
 
 
 // Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them.

diff --git a/code/__DEFINES/space_sectors.dm b/code/__DEFINES/space_sectors.dm
@@ -41,4 +41,7 @@
 //For sectors where corporate entities can or should appear. Corporate ships having this tag can be seen more reliably
 #define ALL_CORPORATE_SECTORS	list(ALL_TAU_CETI_SECTORS, SECTOR_SRANDMARR, SECTOR_UUEOAESA, ALL_COALITION_SECTORS, ALL_GENERIC_SECTORS, SECTOR_GAKAL, SECTOR_NRRAHRAHUL, SECTOR_BADLANDS)//Currently excludes Elyran sectors and Light's Edge
 
+//For highly dangerous sectors with high piracy. Civilian and leisure ships should be less common or not found here.
+#define ALL_DANGEROUS_SECTORS	list(SECTOR_BADLANDS, ALL_VOID_SECTORS)
+
 #define ALL_POSSIBLE_SECTORS	list(ALL_TAU_CETI_SECTORS, ALL_BADLAND_SECTORS, ALL_COALITION_SECTORS, ALL_VOID_SECTORS, ALL_GENERIC_SECTORS, ALL_CORPORATE_SECTORS)
diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm
@@ -31,6 +31,11 @@
 	path = /obj/item/ammo_magazine/submachinemag
 	desc = "Contains twenty rounds of .45 bullets, for use with the vintage submachine gun."
 
+/datum/uplink_item/item/ammo/submachinegunmag/assassin
+	name = "Submachine Gun Magazine (6mm)"
+	path = /obj/item/ammo_magazine/submachinemag/assassin
+	desc = "Contains thirty rounds of 6mm caseless ammo. Used by the integrally suppressed machine pistol."
+
 /datum/uplink_item/item/ammo/a357
 	name = ".357 Speedloader"
 	path = /obj/item/ammo_magazine/a357

diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm
@@ -191,3 +191,14 @@
 	desc = "A crate containing gear for a single individual."
 	path = /obj/structure/closet/crate/secure/gear_loadout/imperial_army/single
 	telecrystal_cost = 15
+
+/datum/uplink_item/item/gear_loadout/tcaf
+	name = "Tau Ceti Armed Forces Assets (Group)"
+	desc = "A crate containing gear for a group."
+	path = /obj/structure/closet/crate/secure/gear_loadout/tcaf
+
+/datum/uplink_item/item/gear_loadout/tcaf_single
+	name = "Tau Ceti Armed Forces Assets (Single)"
+	desc = "A crate containing gear for a single individual."
+	path = /obj/structure/closet/crate/secure/gear_loadout/tcaf/single
+	telecrystal_cost = 10
diff --git a/code/datums/uplink/highly visible and dangerous weapons.dm b/code/datums/uplink/highly visible and dangerous weapons.dm
@@ -52,6 +52,11 @@
 	telecrystal_cost = 8
 	path = /obj/item/gun/projectile/automatic/tommygun
 
+/datum/uplink_item/item/visible_weapons/submachinegun/assassin
+	name = "Suppressed Machine Pistol"
+	telecrystal_cost = 8
+	path = /obj/item/gun/projectile/automatic/tommygun/assassin
+
 /datum/uplink_item/item/visible_weapons/landmine
 	name = "Land Mine"
 	telecrystal_cost = 3

diff --git a/code/datums/uplink/stealthy and inconspicuous weapons.dm b/code/datums/uplink/stealthy and inconspicuous weapons.dm
@@ -67,3 +67,9 @@
 	desc = "A box with 5 claymore miners, relative detonators (signalers), and a spare one for you to trigger them all."
 	telecrystal_cost = 8
 	path = /obj/item/storage/box/landmines/claymore
+
+/datum/uplink_item/item/stealthy_weapons/cameragun
+	name = "9mm Camera Gun"
+	desc = "A 9mm pistol concealed within the shell of a camera, which has to be deployed before it can be fired. Closer inspection will reveal its true nature, but when in its concealed form it will look totally harmless."
+	telecrystal_cost = 3
+	path = /obj/item/gun/projectile/shotgun/foldable/cameragun
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
@@ -100,11 +100,11 @@
 	// Format currently matches that of newscaster feeds: Registered Name (Assigned Rank)
 	return I.assignment ? "[I.registered_name], [I.assignment]" : I.registered_name
 
-/proc/level_seven_announcement()
-	command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/level_7_biohazard.ogg')
+/proc/level_seven_announcement(var/list/affecting_z = current_map.station_levels)
+	command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/level_7_biohazard.ogg', zlevels = affecting_z)
 
-/proc/ion_storm_announcement()
-	command_announcement.Announce("It has come to our attention that the ship has passed through an ion storm.  Please monitor all electronic equipment for malfunctions.", "Anomaly Alert")
+/proc/ion_storm_announcement(var/list/affecting_z = current_map.station_levels)
+	command_announcement.Announce("It has come to our attention that the ship has passed through an ion storm.  Please monitor all electronic equipment for malfunctions.", "Anomaly Alert", zlevels = affecting_z)
 
 /proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
 	if(SSticker.current_state == GAME_STATE_PLAYING)

diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
@@ -238,7 +238,8 @@
 	messengerbag_faction = /obj/item/storage/backpack/messenger/nt
 
 	backpack_contents = list(
-		/obj/item/clothing/accessory/badge/press = 1
+		/obj/item/clothing/accessory/badge/press = 1,
+		/obj/item/device/tvcamera = 1
 	)
 
 /datum/outfit/job/journalistf
@@ -253,7 +254,8 @@
 	tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian
 
 	backpack_contents = list(
-		/obj/item/clothing/accessory/badge/press/independent = 1
+		/obj/item/clothing/accessory/badge/press/independent = 1,
+		/obj/item/device/tvcamera = 1
 	)
 
 

diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
@@ -77,6 +77,9 @@ var/global/list/engineering_networks = list(
 /obj/machinery/camera/network/thunder
 	network = list(NETWORK_THUNDER)
 
+/obj/machinery/camera/network/news
+	network = list(NETWORK_NEWS)
+
 // EMP
 
 /obj/machinery/camera/emp_proof/Initialize()

diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
@@ -256,7 +256,7 @@ Deployable Kits
 	desc = "A deployable barrier, bearing the marks of the Tau Ceti Foreign Legion. Swipe your ID card to lock/unlock it."
 	icon_state = "barrier_legion"
 	req_access = null
-	req_one_access = list(ACCESS_TCFL_PEACEKEEPER_SHIP, ACCESS_LEGION)
+	req_one_access = list(ACCESS_TCAF_SHIPS, ACCESS_LEGION)
 
 /obj/item/deployable_kit
 	name = "Emergency Floodlight Kit"

diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm
@@ -36,7 +36,7 @@
 /obj/effect/decal/cleanable/blood/oil
 	name = "motor oil"
 	desc = "It's black and greasy. Looks like Beepsky made another mess."
-	basecolor="#030303"
+	basecolor = "#030303"
 	dries = FALSE
 
 /obj/effect/decal/cleanable/blood/oil/streak
@@ -46,3 +46,5 @@
 /obj/effect/decal/cleanable/blood/drip/oil
 	name = "drips of motor oil"
 	desc = "It's black and greasy."
+	basecolor = "#030303"
+	dries = FALSE
diff --git a/code/game/objects/items/devices/magnetic_lock.dm b/code/game/objects/items/devices/magnetic_lock.dm
@@ -43,7 +43,7 @@
 /obj/item/device/magnetic_lock/security/legion
 	name = "legion magnetic door lock"
 	req_access = null
-	req_one_access = list(ACCESS_LEGION, ACCESS_TCFL_PEACEKEEPER_SHIP)
+	req_one_access = list(ACCESS_LEGION, ACCESS_TCAF_SHIPS)
 	w_class = ITEMSIZE_SMALL
 
 /obj/item/device/magnetic_lock/security/legion/Initialize()