Merge branch 'master' of https://github.com/Bubberstation/Bubberstation…

… into upstream-merges

_maps/map_files/BoxStation/BoxStation.dmm

@@ -23879,6 +23879,7 @@
 	dir = 8
 	},
 /obj/structure/cable,
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "bOE" = (
@@ -24291,6 +24292,8 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "bQL" = (
@@ -25479,6 +25482,7 @@
 /obj/structure/chair/office{
 	dir = 8
 	},
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "bWu" = (
@@ -25490,6 +25494,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms,
 /obj/effect/landmark/navigate_destination/tcomms,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "bWv" = (
@@ -50185,6 +50190,7 @@
 	dir = 1
 	},
 /obj/structure/cable,
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/break_room)
 "pjU" = (

_maps/map_files/KiloStation/KiloStation.dmm

@@ -24574,6 +24574,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/engineering/lobby)
 "iai" = (
@@ -57050,6 +57051,7 @@
 /obj/structure/chair/office{
 	dir = 1
 	},
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/engine,
 /area/station/tcommsat/computer)
 "sJM" = (

_maps/map_files/LimaStation/LimaStation.dmm

@@ -44157,6 +44157,7 @@
 /obj/structure/chair/office{
 	dir = 1
 	},
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "qyF" = (
@@ -44506,6 +44507,16 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /turf/open/floor/iron/white,
 /area/station/medical/break_room)
+"qFc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/yellow/opposingcorners{
+	dir = 1
+	},
+/obj/effect/landmark/start/telecomms_specialist,
+/turf/open/floor/iron,
+/area/station/engineering/storage)
 "qFh" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/portable_atmospherics/canister/air,
@@ -52352,6 +52363,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/holopad/secure,
 /obj/effect/turf_decal/bot,
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "tvB" = (
@@ -147430,7 +147442,7 @@ wkl
 nFM
 kmL
 xSq
-uVR
+qFc
 iNm
 dKN
 gOW

_maps/map_files/NSVBlueshift/Blueshift.dmm

@@ -10224,6 +10224,7 @@
 "bXG" = (
 /obj/structure/chair/stool/directional/south,
 /obj/machinery/firealarm/directional/east,
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/engineering/break_room)
 "bXI" = (
@@ -81527,6 +81528,7 @@
 "pEp" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/structure/chair/office/light,
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "pEq" = (

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -14718,6 +14718,11 @@
 	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/command/bridge)
+"ekv" = (
+/obj/structure/chair/stool/directional/south,
+/obj/effect/landmark/start/telecomms_specialist,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/lobby)
 "ekG" = (
 /obj/structure/table,
 /turf/open/floor/iron/cafeteria,
@@ -17733,6 +17738,7 @@
 /obj/structure/chair/office{
 	dir = 8
 	},
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/engine,
 /area/station/tcommsat/computer)
 "fdP" = (
@@ -122172,7 +122178,7 @@ gwM
 rKH
 nwm
 efQ
-lVG
+ekv
 nDn
 hAj
 enY

_maps/map_files/biodome/biodome.dmm

@@ -9295,6 +9295,7 @@
 /obj/structure/chair/office{
 	dir = 1
 	},
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "dla" = (
@@ -14700,6 +14701,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/blue,
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/engineering/lobby)
 "fcL" = (
@@ -65176,6 +65178,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "wAi" = (
@@ -66219,6 +66222,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/yellow,
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron,
 /area/station/engineering/lobby)
 "wSH" = (

_maps/map_files/moonstation/moonstation.dmm

@@ -744,6 +744,7 @@
 /obj/structure/chair/office{
 	dir = 3
 	},
+/obj/effect/landmark/start/telecomms_specialist,
 /turf/open/floor/iron/grimy,
 /area/station/tcommsat/computer)
 "akB" = (
@@ -41660,6 +41661,10 @@
 "lIM" = (
 /turf/closed/wall/mineral/wood,
 /area/station/commons/vacant_room/commissary)
+"lIO" = (
+/obj/effect/landmark/start/telecomms_specialist,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage)
 "lIT" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -60251,8 +60256,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
 /obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
 /turf/open/floor/iron/dark,
 /area/station/tcommsat/computer)
 "qTR" = (
@@ -244127,7 +244133,7 @@ rPa
 oLm
 hLj
 mpE
-snQ
+lIO
 xEN
 kTl
 xmp

code/__DEFINES/jobs.dm

@@ -68,6 +68,7 @@
 #define JOB_STATION_ENGINEER "Station Engineer"
 #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
 #define JOB_ENGINEERING_GUARD "Engineering Guard" // SKYRAT EDIT ADDITION
+#define JOB_TELECOMMS_SPECIALIST "Telecomms Specialist" // SKYRAT EDIT ADDITION
 //Medical
 #define JOB_CORONER "Coroner"
 #define JOB_MEDICAL_DOCTOR "Medical Doctor"
@@ -195,6 +196,7 @@
 #define JOB_DISPLAY_ORDER_ENGINEER_GUARD 107 //SKYRAT EDIT ADDITION
 #define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 108 //SKYRAT EDIT ADDITION
 #define JOB_DISPLAY_ORDER_EXP_CORPS 109 //SKYRAT EDIT ADDITON
+#define JOB_DISPLAY_ORDER_TELECOMMS_SPECIALIST 51 //SKYRAT EDIT ADDITION
 
 #define DEPARTMENT_UNASSIGNED "No Department"
 

code/__DEFINES/~skyrat_defines/atom_hud.dm

@@ -28,3 +28,4 @@
 //SR Misc
 #define SECHUD_BARBER "hudbarber"
 #define SECHUD_SCRAMBLED "hudscrambled"
+#define SECHUD_TELECOMMS_SPECIALIST "hudtelecommsspecialist"

code/datums/station_traits/positive_traits.dm

@@ -246,6 +246,7 @@
 		/datum/job/customs_agent = /obj/item/organ/internal/cyberimp/eyes/hud/security,
 		/datum/job/bouncer = /obj/item/organ/internal/cyberimp/arm/muscle,
 		/datum/job/engineering_guard = /obj/item/organ/internal/cyberimp/arm/flash,
+		/datum/job/telecomms_specialist = /obj/item/organ/internal/ears/cybernetic/xray,
 		// SKYRAT EDIT END
 	)
 

code/game/machinery/computer/crew.dm

@@ -132,6 +132,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		JOB_STATION_ENGINEER = 41,
 		JOB_ATMOSPHERIC_TECHNICIAN = 42,
 		JOB_ENGINEERING_GUARD = 43, // SKYRAT EDIT ADDITION
+		JOB_TELECOMMS_SPECIALIST = 44, // SKYRAT EDIT ADDITION	
 		// 50-59: Cargo
 		JOB_QUARTERMASTER = 50,
 		JOB_SHAFT_MINER = 51,

html/changelogs/AutoChangeLog-pr-1714.yml

@@ -0,0 +1,4 @@
+author: "SciDragon"
+delete-after: True
+changes:
+  - rscadd: "Telecomms Specialist job, with a niche carved out of an underutilized engineering department."

html/changelogs/AutoChangeLog-pr-2757.yml

@@ -0,0 +1,4 @@
+author: "SciDragon"
+delete-after: True
+changes:
+  - rscadd: "Telecomms Specialist job, with a niche carved out of an underutilized engineering department."

html/changelogs/AutoChangeLog-pr-28516.yml

@@ -0,0 +1,4 @@
+author: "SciDragon"
+delete-after: True
+changes:
+  - rscadd: "Telecomms Specialist job, with a niche carved out of an underutilized engineering department."

modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm

@@ -81,3 +81,20 @@
 	armor_type = /datum/armor/clothing_under/atmos_adv
 	icon_state = "util_eng"
 	can_adjust = FALSE
+
+/*
+*	TELECOMMS SPECIALIST
+*/
+
+/obj/item/clothing/under/rank/engineering/engineer/skyrat/utility/telecomm
+	desc = "It's a jumpsuit worn by telecomms specialists. Made from fire resistant materials."
+	name = "telecomm jumpsuit"
+	icon_state = "telecomm"
+	can_adjust = TRUE
+
+/obj/item/clothing/under/rank/engineering/engineer/skyrat/utility/telecomm/skirt
+	desc = "It's a jumpskirt worn by telecomms specialists. Made from fire resistant materials."
+	name = "telecomm jumpskirt"
+	icon_state = "telecomm_skirt"
+	can_adjust = TRUE
+	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY

modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm

@@ -411,6 +411,16 @@
 		"Apprentice Engineer",
 	)
 
+/datum/job/telecomms_specialist
+	alt_titles = list(
+		"Telecomms Specialist",
+		"Wireless Operator",
+		"Network Engineer",
+		"Sysadmin",
+		"Tram Technician",
+	)
+
+
 /datum/job/warden
 	alt_titles = list(
 		"Warden",

modular_skyrat/modules/automapper/code/area_spawn_entries.dm

@@ -109,3 +109,11 @@
 /datum/area_spawn/corrections_officer_landmark
 	desired_atom = /obj/effect/landmark/start/corrections_officer
 	target_areas = list(/area/station/security/brig, /area/station/security/prison/)
+
+/datum/area_spawn/telecomms_specialist_landmark
+	target_areas = list(
+		/area/station/tcommsat/computer,
+		/area/station/engineering/lobby,
+		/area/station/engineering/break_room,
+	)
+	desired_atom = /obj/effect/landmark/start/telecomms_specialist

modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm

@@ -20,6 +20,22 @@
 	armor_type = /datum/armor/jacket_engi
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
 
+/obj/item/clothing/suit/toggle/jacket/tcomm
+	name = "telecomms jacket"
+	desc = "A comfortable jacket in engineering yellow with blue telecomms trim."
+	icon_state = "tcomm_dep_jacket"
+	armor_type = /datum/armor/jacket_engi
+	allowed = list(
+		/obj/item/flashlight,
+		/obj/item/tank/internals,
+		/obj/item/t_scanner,
+		/obj/item/construction/rcd,
+		/obj/item/pipe_dispenser,
+		/obj/item/toy,
+		/obj/item/storage/fancy/cigarettes,
+		/obj/item/lighter,
+	)
+
 /datum/armor/jacket_engi
 	fire = 30
 	acid = 45