Roundstart equipment adjustments for command (#4956)

* AAAAAA

* This is why we test the code lol

code/game/machinery/suit_storage_unit.dm

@@ -101,7 +101,6 @@
 	suit_type = /obj/item/clothing/suit/space/hardsuit/sec //monkestation edit
 	storage_type = /obj/item/tank/jetpack/oxygen/security //monkestation edit
 
-
 /obj/machinery/suit_storage_unit/hos
 	mask_type = /obj/item/clothing/mask/gas/sechailer
 	storage_type = /obj/item/tank/internals/oxygen

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

@@ -75,20 +75,16 @@
 /obj/structure/closet/secure_closet/chief_medical/PopulateContents()
 	..()
 
-	new /obj/item/clothing/suit/bio_suit/cmo(src)
-	new /obj/item/clothing/head/bio_hood/cmo(src)
 	new /obj/item/storage/bag/garment/chief_medical(src)
 	new /obj/item/computer_disk/command/cmo(src)
 	new /obj/item/radio/headset/heads/cmo(src)
 	new /obj/item/megaphone/command(src)
 	new /obj/item/defibrillator/compact/loaded(src)
-	new /obj/item/healthanalyzer/advanced(src)
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/autosurgeon/medical_hud(src)
 	new /obj/item/door_remote/chief_medical_officer(src)
 	new /obj/item/clothing/neck/petcollar(src)
 	new /obj/item/pet_carrier(src)
-	new /obj/item/wallframe/defib_mount(src)
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
 	new /obj/item/storage/photo_album/cmo(src)
 	new /obj/item/storage/lockbox/medal/med(src)

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

@@ -6,8 +6,6 @@
 /obj/structure/closet/secure_closet/research_director/PopulateContents()
 	..()
 
-	new /obj/item/clothing/suit/bio_suit/scientist(src)
-	new /obj/item/clothing/head/bio_hood/scientist(src)
 	new /obj/item/storage/bag/garment/research_director(src)
 	new /obj/item/computer_disk/command/rd(src)
 	new /obj/item/radio/headset/heads/rd(src)

code/modules/jobs/job_types/chief_medical_officer.dm

@@ -68,7 +68,7 @@
 	shoes = /obj/item/clothing/shoes/sneakers/blue
 	l_pocket = /obj/item/laser_pointer/blue
 	r_pocket = /obj/item/pinpointer/crew
-	l_hand = /obj/item/storage/medkit/surgery
+	l_hand = /obj/item/storage/medkit/surgery/cmo
 
 	backpack = /obj/item/storage/backpack/medic
 	satchel = /obj/item/storage/backpack/satchel/med

monkestation/code/datums/id_trim/jobs.dm

@@ -69,3 +69,57 @@
 		ACCESS_HOP,
 		)
 	job = /datum/job/shaft_miner
+
+/datum/id_trim/job/nanotrasen_representative
+	assignment = "Nanotrasen Representative"
+	trim_state = "trim_centcom"
+	department_color = COLOR_CENTCOM_BLUE
+	subdepartment_color = COLOR_CENTCOM_BLUE
+	sechud_icon_state = SECHUD_CENTCOM
+	minimal_access = list(
+		ACCESS_BRIG_ENTRANCE,
+		ACCESS_COMMAND,
+		ACCESS_MAINT_TUNNELS,
+		ACCESS_WEAPONS,
+		ACCESS_NT_REPRESENTATVE,
+		)
+	extra_access = list(
+		ACCESS_BAR,
+		)
+	template_access = list(
+		)
+	job = /datum/job/nanotrasen_representative
+
+/datum/id_trim/job/blueshield
+	assignment = "Blueshield"
+	trim_state = "trim_blueshield"
+	department_color = COLOR_COMMAND_BLUE
+	subdepartment_color = COLOR_SECURITY_RED
+	sechud_icon_state = SECHUD_BLUESHIELD
+	extra_access = list(
+		ACCESS_BRIG,
+		ACCESS_CARGO,
+		ACCESS_COURT,
+		ACCESS_GATEWAY,
+	)
+	minimal_access = list(
+		ACCESS_SECURITY,
+		ACCESS_ALL_PERSONAL_LOCKERS,
+		ACCESS_BRIG_ENTRANCE,
+		ACCESS_BLUESHIELD,
+		ACCESS_COMMAND,
+		ACCESS_CONSTRUCTION,
+		ACCESS_ENGINEERING,
+		ACCESS_EVA,
+		ACCESS_MAINT_TUNNELS,
+		ACCESS_MEDICAL,
+		ACCESS_MINERAL_STOREROOM,
+		ACCESS_SCIENCE,
+		ACCESS_TELEPORTER,
+		ACCESS_WEAPONS,
+	)
+	template_access = list(
+		ACCESS_CAPTAIN,
+		ACCESS_CHANGE_IDS
+		)
+	job = /datum/job/blueshield

monkestation/code/game/machinery/suit_storage_unit.dm

@@ -6,3 +6,11 @@
 	suit_type = /obj/item/clothing/suit/space/hardsuit/atmos
 
 */
+
+/obj/machinery/suit_storage_unit/cmo
+	suit_type = /obj/item/clothing/suit/bio_suit/cmo
+	helmet_type = /obj/item/clothing/head/bio_hood/cmo
+
+/obj/machinery/suit_storage_unit/rd
+	suit_type = /obj/item/clothing/suit/bio_suit/scientist
+	helmet_type = /obj/item/clothing/head/bio_hood/scientist

monkestation/code/game/objects/effects/landmark.dm

@@ -136,3 +136,11 @@
 	name = "Brig Physician"
 	icon = 'monkestation/icons/mob/landmarks.dmi'
 	icon_state = "Brig Physician"
+
+/obj/effect/landmark/start/nanotrasen_representative
+	name = "Nanotrasen Representative"
+	icon_state = "Nanotrasen Representative"
+
+/obj/effect/landmark/start/blueshield
+	name = "Blueshield"
+	icon_state = "Blueshield"

monkestation/code/game/objects/items/storage/medkit.dm

@@ -0,0 +1,15 @@
+/obj/item/storage/medkit/surgery/cmo/PopulateContents()
+	if(empty)
+		return
+	var/static/items_inside = list(
+		/obj/item/healthanalyzer/advanced = 1,
+		/obj/item/stack/medical/gauze/twelve = 1,
+		/obj/item/stack/medical/suture = 2,
+		/obj/item/stack/medical/mesh = 2,
+		/obj/item/reagent_containers/hypospray/medipen = 1,
+		/obj/item/surgical_drapes = 1,
+		/obj/item/scalpel = 1,
+		/obj/item/hemostat = 1,
+		/obj/item/cautery = 1,
+	)
+	generate_items_inside(items_inside,src)

monkestation/code/game/objects/structures/crates_lockers/closets/secure/blueshield.dm

@@ -0,0 +1,17 @@
+/obj/structure/closet/secure_closet/blueshield
+	name = "blueshield's locker"
+	icon_state = "bs"
+	icon = 'monkestation/code/modules/blueshift/icons/obj/closet.dmi'
+	req_access = list(ACCESS_BLUESHIELD)
+
+/obj/structure/closet/secure_closet/blueshield/New()
+	..()
+	new /obj/item/storage/briefcase/secure(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
+	new /obj/item/storage/medkit/frontier/stocked(src)
+	new /obj/item/storage/bag/garment/blueshield(src)
+	new /obj/item/mod/control/pre_equipped/blueshield(src)
+	new /obj/item/sensor_device/blueshield(src)
+	new /obj/item/radio/headset/headset_bs(src)
+	new /obj/item/radio/headset/headset_bs/alt(src)
+	new /obj/item/storage/photo_album/blueshield(src)

monkestation/code/modules/NTrep/NTrep_locker.dm → monkestation/code/game/objects/structures/crates_lockers/closets/secure/nanotrasen_rep.dm

@@ -13,3 +13,4 @@
 	new /obj/item/bedsheet/centcom(src)
 	new /obj/item/storage/bag/garment/nanotrasen_representative(src)
 	new /obj/item/circuitboard/machine/fax(src)
+	new /obj/item/storage/photo_album/nt_rep(src)

monkestation/code/modules/blueshield/closet.dm

@@ -19,20 +19,3 @@
 		new /obj/item/assembly/flash/handheld(src)
 		new /obj/item/reagent_containers/spray/pepper(src)
 		new /obj/item/restraints/handcuffs(src)
-
-/obj/structure/closet/secure_closet/blueshield
-	name = "blueshield's locker"
-	icon_state = "bs"
-	icon = 'monkestation/code/modules/blueshift/icons/obj/closet.dmi'
-	req_access = list(ACCESS_BLUESHIELD)
-
-/obj/structure/closet/secure_closet/blueshield/New()
-	..()
-	new /obj/item/storage/briefcase/secure(src)
-	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
-	new /obj/item/storage/medkit/frontier/stocked(src)
-	new /obj/item/storage/bag/garment/blueshield(src)
-	new /obj/item/mod/control/pre_equipped/blueshield(src)
-	new /obj/item/sensor_device/blueshield(src)
-	new /obj/item/radio/headset/headset_bs(src)
-	new /obj/item/radio/headset/headset_bs/alt(src)

monkestation/code/modules/blueshield/landmarks.dm

@@ -1,3 +0,0 @@
-/obj/effect/landmark/start/blueshield
-	name = "Blueshield"
-	icon_state = "Blueshield"

monkestation/code/modules/NTrep/NTrep.dm → monkestation/code/modules/jobs/job_types/nanotrasen_representative.dm

@@ -73,8 +73,7 @@
 	)
 	belt = /obj/item/gun/energy/laser/plasmacore
 	shoes = /obj/item/clothing/shoes/laceup
-	l_pocket = /obj/item/pen/fountain
-	r_pocket = /obj/item/modular_computer/pda/heads
+	r_pocket = /obj/item/modular_computer/pda/heads/ntrep
 	l_hand = /obj/item/storage/secure/briefcase/cash
 	glasses = /obj/item/clothing/glasses/sunglasses
 	ears = /obj/item/radio/headset/headset_cent
@@ -92,23 +91,4 @@
 		/obj/item/skillchip/disk_verifier,
 	)
 
-/datum/id_trim/job/nanotrasen_representative
-	assignment = "Nanotrasen Representative"
-	trim_state = "trim_centcom"
-	department_color = COLOR_CENTCOM_BLUE
-	subdepartment_color = COLOR_CENTCOM_BLUE
-	sechud_icon_state = SECHUD_CENTCOM
-	minimal_access = list(
-		ACCESS_BRIG_ENTRANCE,
-		ACCESS_COMMAND,
-		ACCESS_MAINT_TUNNELS,
-		ACCESS_WEAPONS,
-		ACCESS_NT_REPRESENTATVE,
-		)
-	extra_access = list(
-		ACCESS_BAR,
-		)
-	template_access = list(
-		)
-	job = /datum/job/nanotrasen_representative
 

monkestation/code/modules/modular_computers/computers/item/role_tablet_presets.dm

@@ -56,3 +56,7 @@
 	name = "barber PDA"
 	greyscale_colors = "#933ea8#235AB2"
 	starting_programs = list()
+
+/obj/item/modular_computer/pda/heads/ntrep
+	name = "Nanotransen Representative's PDA"
+	inserted_item = /obj/item/pen/fountain

monkestation/code/modules/photography/photo/album.dm

@@ -0,0 +1,9 @@
+/obj/item/storage/photo_album/blueshield
+	name = "photo album (Blueshield)"
+	icon_state = "album_blue"
+	persistence_id = "BS"
+
+/obj/item/storage/photo_album/nt_rep
+	name = "photo album (Nanotrasen Representative)"
+	icon_state = "album_blue"
+	persistence_id = "NTREP"

tgstation.dme

@@ -6165,6 +6165,7 @@
 #include "monkestation\code\game\objects\items\storage\crate.dm"
 #include "monkestation\code\game\objects\items\storage\fancy.dm"
 #include "monkestation\code\game\objects\items\storage\garment.dm"
+#include "monkestation\code\game\objects\items\storage\medkit.dm"
 #include "monkestation\code\game\objects\items\storage\toolbox.dm"
 #include "monkestation\code\game\objects\items\storage\uplink_kits.dm"
 #include "monkestation\code\game\objects\items\storage\boxes\boxes.dm"
@@ -6178,7 +6179,9 @@
 #include "monkestation\code\game\objects\structures\beds_chairs\chair.dm"
 #include "monkestation\code\game\objects\structures\crates_lockers\closets.dm"
 #include "monkestation\code\game\objects\structures\crates_lockers\crates.dm"
+#include "monkestation\code\game\objects\structures\crates_lockers\closets\secure\blueshield.dm"
 #include "monkestation\code\game\objects\structures\crates_lockers\closets\secure\brig_physician.dm"
+#include "monkestation\code\game\objects\structures\crates_lockers\closets\secure\nanotrasen_rep.dm"
 #include "monkestation\code\game\objects\structures\crates_lockers\closets\secure\security.dm"
 #include "monkestation\code\game\objects\structures\crates_lockers\crates\secure.dm"
 #include "monkestation\code\game\turfs\open\water.dm"
@@ -6708,7 +6711,6 @@
 #include "monkestation\code\modules\blueshield\clothing.dm"
 #include "monkestation\code\modules\blueshield\gun.dm"
 #include "monkestation\code\modules\blueshield\landmarks.dm"
-#include "monkestation\code\modules\blueshield\trim.dm"
 #include "monkestation\code\modules\blueshield\devices\crew_monitor.dm"
 #include "monkestation\code\modules\blueshield\devices\sensor.dm"
 #include "monkestation\code\modules\blueshield\modsuit\suit.dm"
@@ -7420,6 +7422,7 @@
 #include "monkestation\code\modules\jobs\job_types\godzilla.dm"
 #include "monkestation\code\modules\jobs\job_types\gorilla.dm"
 #include "monkestation\code\modules\jobs\job_types\head_of_security.dm"
+#include "monkestation\code\modules\jobs\job_types\nanotrasen_representative.dm"
 #include "monkestation\code\modules\jobs\job_types\psychologist.dm"
 #include "monkestation\code\modules\jobs\job_types\security_assistant.dm"
 #include "monkestation\code\modules\jobs\job_types\shaft_miner.dm"
@@ -7772,9 +7775,6 @@
 #include "monkestation\code\modules\modular_guns\components\gun_stat_modifiers.dm"
 #include "monkestation\code\modules\modular_guns\crafting\part_recipes.dm"
 #include "monkestation\code\modules\modular_guns\makeshift_effects\__base_effect.dm"
-#include "monkestation\code\modules\NTrep\NTrep.dm"
-#include "monkestation\code\modules\NTrep\NTrep_locker.dm"
-#include "monkestation\code\modules\NTrep\NTrep_spawn.dm"
 #include "monkestation\code\modules\NTrep\clothing\NTrep_clothing.dm"
 #include "monkestation\code\modules\NTrep\coolgun\plasmacore.dm"
 #include "monkestation\code\modules\NTSL\code\achievements.dm"
@@ -7852,6 +7852,7 @@
 #include "monkestation\code\modules\paperwork\fax.dm"
 #include "monkestation\code\modules\paperwork\filingcabinet.dm"
 #include "monkestation\code\modules\patches_if_they_were_cool\_base_patch_changes.dm"
+#include "monkestation\code\modules\photography\photo\album.dm"
 #include "monkestation\code\modules\physics\atom_movables.dm"
 #include "monkestation\code\modules\physics\physics_component.dm"
 #include "monkestation\code\modules\physics\physics_SS.dm"