Hard upstream sync (#6951)

* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath

code/modules/jobs/job_types/captain.dm

@@ -50,6 +50,8 @@ Captain
 	implants = list(/obj/item/implant/mindshield)
 	accessory = /obj/item/clothing/accessory/medal/gold/captain
 
+	chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain)
+
 /*
 Head of Personnel
 */
@@ -98,3 +100,5 @@ Head of Personnel
 	head = /obj/item/clothing/head/hopcap
 	backpack_contents = list(/obj/item/storage/box/ids=1,\
 		/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
+
+	chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/hop)

code/modules/jobs/job_types/cargo_service.dm

@@ -28,6 +28,8 @@ Quartermaster
 	glasses = /obj/item/clothing/glasses/sunglasses
 	l_hand = /obj/item/clipboard
 
+	chameleon_extras = /obj/item/stamp/qm
+
 /*
 Cargo Technician
 */
@@ -97,6 +99,8 @@ Shaft Miner
 	duffelbag = /obj/item/storage/backpack/duffelbag
 	box = /obj/item/storage/box/survival_mining
 
+	chameleon_extras = /obj/item/gun/energy/kinetic_accelerator
+
 /datum/outfit/job/miner/asteroid
 	name = "Shaft Miner (Asteroid)"
 	uniform = /obj/item/clothing/under/rank/miner

code/modules/jobs/job_types/civilian.dm

@@ -44,6 +44,8 @@ Clown
 
 	box = /obj/item/storage/box/hug/survival
 
+	chameleon_extras = /obj/item/stamp/clown
+
 
 /datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
@@ -137,7 +139,7 @@ Curator
 	l_hand = /obj/item/storage/bag/books
 	r_pocket = /obj/item/key/displaycase
 	l_pocket = /obj/item/laser_pointer
-	//CITADEL EDIT removes runtimes from this pocket protector
+	accessory = /obj/item/clothing/accessory/pocketprotector/full
 	backpack_contents = list(
 		/obj/item/melee/curator_whip = 1,
 		/obj/item/soapstone = 1,
@@ -186,6 +188,8 @@ Lawyer
 	l_pocket = /obj/item/laser_pointer
 	r_pocket = /obj/item/clothing/accessory/lawyers_badge
 
+	chameleon_extras = /obj/item/stamp/law
+
 
 /datum/outfit/job/lawyer/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()

code/modules/jobs/job_types/engineering.dm

@@ -48,6 +48,7 @@ Chief Engineer
 	duffelbag = /obj/item/storage/backpack/duffelbag/engineering
 	box = /obj/item/storage/box/engineer
 	pda_slot = SLOT_L_STORE
+	chameleon_extras = /obj/item/stamp/ce
 
 /datum/outfit/job/ce/rig
 	name = "Chief Engineer (Hardsuit)"

code/modules/jobs/job_types/job.dm

@@ -198,3 +198,11 @@
 		PDA.owner = H.real_name
 		PDA.ownjob = J.title
 		PDA.update_label()
+
+/datum/outfit/job/get_chameleon_disguise_info()
+	var/list/types = ..()
+	types -= /obj/item/storage/backpack //otherwise this will override the actual backpacks
+	types += backpack
+	types += satchel
+	types += duffelbag
+	return types

code/modules/jobs/job_types/medical.dm

@@ -46,6 +46,8 @@ Chief Medical Officer
 	satchel = /obj/item/storage/backpack/satchel/med
 	duffelbag = /obj/item/storage/backpack/duffelbag/med
 
+	chameleon_extras = list(/obj/item/gun/syringe, /obj/item/stamp/cmo)
+
 /*
 Medical Doctor
 */
@@ -81,6 +83,8 @@ Medical Doctor
 	satchel = /obj/item/storage/backpack/satchel/med
 	duffelbag = /obj/item/storage/backpack/duffelbag/med
 
+	chameleon_extras = /obj/item/gun/syringe
+
 /*
 Chemist
 */
@@ -116,6 +120,8 @@ Chemist
 	satchel = /obj/item/storage/backpack/satchel/chem
 	duffelbag = /obj/item/storage/backpack/duffelbag/med
 
+	chameleon_extras = /obj/item/gun/syringe
+
 /*
 Geneticist
 */

code/modules/jobs/job_types/science.dm

@@ -48,6 +48,8 @@ Research Director
 	backpack = /obj/item/storage/backpack/science
 	satchel = /obj/item/storage/backpack/satchel/tox
 
+	chameleon_extras = /obj/item/stamp/rd
+
 /datum/outfit/job/rd/rig
 	name = "Research Director (Hardsuit)"
 

code/modules/jobs/job_types/security.dm

@@ -60,6 +60,8 @@ Head of Security
 
 	implants = list(/obj/item/implant/mindshield)
 
+	chameleon_extras = list(/obj/item/gun/energy/e_gun/hos, /obj/item/stamp/hos)
+
 /*
 Warden
 */
@@ -111,6 +113,7 @@ Warden
 
 	implants = list(/obj/item/implant/mindshield)
 
+	chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
 
 /*
 Detective
@@ -154,6 +157,8 @@ Detective
 
 	implants = list(/obj/item/implant/mindshield)
 
+	chameleon_extras = list(/obj/item/gun/ballistic/revolver/detective, /obj/item/clothing/glasses/sunglasses)
+
 /datum/outfit/job/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
 	var/obj/item/clothing/mask/cigarette/cig = H.wear_mask
@@ -293,6 +298,9 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
 
 	implants = list(/obj/item/implant/mindshield)
 
+	chameleon_extras = list(/obj/item/gun/energy/e_gun/advtaser, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet)
+	//The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state
+
 
 /obj/item/radio/headset/headset_sec/alt/department/Initialize()
 	. = ..()