the media office returns, death to the journalist office (#23114)

linking because i dont wanna have to do the description again

https://github.com/Aurorastation/Aurora.3/pull/23100

code/__DEFINES/access.dm

@@ -455,7 +455,7 @@
 #define ACCESS_JOURNALIST 70
 /datum/access/journalist
 	id = ACCESS_JOURNALIST
-	desc = "Journalist Office"
+	desc = "Media Office"
 	region = ACCESS_REGION_GENERAL
 
 /// Allows some unique interactions with devices

code/game/jobs/job/outsider/representative.dm

@@ -37,8 +37,8 @@
 	name = "Corporate Reporter"
 	jobtype = /datum/job/journalist
 
-	uniform = /obj/item/clothing/under/suit_jacket/red
-	shoes = /obj/item/clothing/shoes/sneakers/black
+	uniform = /obj/item/clothing/under/librarian
+	shoes = /obj/item/clothing/shoes/laceup/brown
 
 	tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian
 	wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian
@@ -65,7 +65,7 @@
 	jobtype = /datum/job/journalist
 
 	uniform = /obj/item/clothing/under/suit_jacket/red
-	shoes = /obj/item/clothing/shoes/sneakers/black
+	shoes = /obj/item/clothing/shoes/laceup/brown
 
 	tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian
 	wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian

code/game/objects/items/weapons/storage/wallets.dm

@@ -195,6 +195,28 @@
 	wear_over_suit = !wear_over_suit
 	mob_icon_update()
 
+// Journalist's Lanyard
+/obj/item/storage/wallet/lanyard/press
+	name = "press lanyard"
+	desc = "A large, blue lanyard with \"PRESS\" prominently displayed along the cord in white."
+	color = "#46698c"
+	storage_slots = 5
+	w_class = WEIGHT_CLASS_SMALL
+	max_w_class = WEIGHT_CLASS_SMALL
+	can_hold = list(
+		/obj/item/card,
+		/obj/item/clothing/accessory/badge,
+		/obj/item/disk,
+		/obj/item/paper,
+		/obj/item/paper_bundle,
+		/obj/item/pen,
+		/obj/item/photo,
+		/obj/item/paicard,
+		/obj/item/encryptionkey,
+		/obj/item/storage/business_card_holder,
+		/obj/item/key,
+	)
+
 // wallet subtypes
 
 /obj/item/storage/wallet/random/fill()

code/game/objects/structures/crates_lockers/closets/secure/service.dm

@@ -55,18 +55,33 @@
 	new /obj/item/storage/box/mousetraps(src)
 
 // Journalist's Locker
-/obj/structure/closet/secure_closet/journalist
-	name = "journalist's closet"
-	desc = "It's a storage unit for a journalist's gear."
-	req_access = list(ACCESS_JOURNALIST)
-
 /obj/structure/closet/secure_closet/journalist/fill()
+	// Clothing
+	new /obj/item/radio(src)
+	new /obj/item/radio/headset/headset_service(src)
+	new /obj/item/radio/headset/wrist/service(src)
+	new /obj/item/radio/headset/wrist/clip/service(src)
+	new /obj/item/storage/backpack/satchel/leather(src)
+	new /obj/item/storage/briefcase/black(src)
+	new /obj/item/storage/secure/briefcase(src)
+	new /obj/item/clothing/head/helmet/security/press(src)
+	new /obj/item/clothing/suit/armor/carrier/press(src)
+	new /obj/item/storage/wallet/lanyard/press(src)
+	// Supply
 	new /obj/item/storage/photo_album(src)
 	new /obj/item/camera_film(src)
-	new /obj/item/camera(src)
+	new /obj/item/camera_film(src)
 	new /obj/item/paper_scanner(src)
-	new /obj/item/folder/white(src)
-	new /obj/item/storage/secure/briefcase(src)
-	new /obj/item/clipboard(src)
-	new /obj/item/folder/red(src)
+	new /obj/item/storage/slide_projector(src)
+	new /obj/item/storage/box/folders(src)
+	new /obj/item/stack/wrapping_paper(src)
+	new /obj/item/stack/packageWrap(src)
+	new /obj/item/portable_whiteboard(src)
+	new /obj/item/tape_roll(src)
+	// Tools
+	new /obj/item/radio/microphone(src)
+	new /obj/item/taperecorder(src)
 	new /obj/item/tvcamera(src)
+	new /obj/item/camera/detective/press(src)
+	new /obj/item/hand_labeler(src)
+	new /obj/item/destTagger(src)

code/game/objects/structures/machinery/controlhub.dm

@@ -258,6 +258,18 @@ ABSTRACT_TYPE(/obj/structure/machinery/controlhub)
 		"window tint" = list("type" = "windowtint", "id" = "bar_tint")
 	)
 
+/obj/structure/machinery/controlhub/media_office
+	name = "media office control hub"
+	icon_state = "holocontrol"
+	req_access = list(ACCESS_JOURNALIST)
+	controls = list(
+		"door control" = list("type" = "airlock", "id" = "media_office_door", "functions" = 1),
+		"door bolts" = list("type" = "airlock", "id" = "media_office_door", "functions" = 4),
+		"window shutters" = list("type" = "blast_door", "id" = "media_office_window_shutter"),
+		"office window tint" = list("type" = "windowtint", "id" = "media_office_public_tint"),
+		"dividing window tint" = list("type" = "windowtint", "id" = "media_office_private_tint")
+	)
+
 /obj/structure/machinery/controlhub/xo_office/private
 	name = "executive officers office control hub"
 	icon_state = "holocontrol"

code/modules/client/preference_setup/loadout/items/accessories.dm

@@ -313,6 +313,16 @@ ABSTRACT_TYPE(/datum/gear/accessory)
 	badge["badge, electronic"] = /obj/item/clothing/accessory/badge/idbadge/intel
 	gear_tweaks += new /datum/gear_tweak/path(badge)
 
+/datum/gear/accessory/pressbadge
+	display_name = "press badge, corporate"
+	path = /obj/item/clothing/accessory/badge/press
+	allowed_roles = list("Corporate Reporter")
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/pressbadge/independent
+	display_name = "press badge, independent"
+	path = /obj/item/clothing/accessory/badge/press/independent
+
 /datum/gear/accessory/namepin
 	display_name = "pins selection"
 	path = /obj/item/clothing/accessory/badge/namepin

code/modules/client/preference_setup/loadout/items/utility.dm

@@ -102,6 +102,12 @@
 	path = 	/obj/item/storage/wallet/lanyard
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
+/datum/gear/utility/press_lanyard
+	display_name = "press lanyard"
+	path = /obj/item/storage/wallet/lanyard/press
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+	allowed_roles = list("Corporate Reporter")
+
 /datum/gear/utility/recorder
 	display_name = "universal recorder"
 	path = /obj/item/taperecorder

code/modules/paperwork/photography.dm

@@ -254,6 +254,9 @@ GLOBAL_VAR_INIT(photo_count, 1)
 	desc = "A one use - polaroid camera."
 	pictures_left = 30
 
+/obj/item/camera/detective/press
+	name = "journalists camera"
+
 // Detective cameras have build in data recording, so no need for a skill check
 /obj/item/camera/detective/record_data(mob/living/user, obj/item/photo/pic)
 	pic.time_taken = worldtime2text()

html/changelogs/notagonk-media_office_again.yml

@@ -0,0 +1,8 @@
+author: notagonk
+
+delete-after: True
+
+changes:
+  - rscadd: "Remapped the journalist's office as the refurbished media office."
+  - rscadd: "Created a press lanyard subtype of the regular lanyard, no difference in sprite."
+  - rscadd: "Added the press badges and lanyard to the loadout."

maps/sccv_horizon/areas/horizon_areas_crew.dm

@@ -226,8 +226,8 @@
 	icon_state = "law_rep_b"
 
 /// Uncategorized/general
-/area/horizon/crew/journalistoffice
-	name = "Journalist's Office"
+/area/horizon/crew/media_office
+	name = "Media Office"
 	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 	horizon_deck = 3
 	lightswitch = FALSE