Merge remote-tracking branch 'upstream/master'

_maps/map_files/generic/CentCom.dmm

@@ -17669,6 +17669,23 @@
 /obj/item/toy/tennis/green,
 /obj/item/radio/headset/headset_cent,
 /obj/item/clothing/under/rank/centcom_officer,
+/obj/item/clothing/suit/hooded/wintercoat/centcom,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/pda/lieutenant{
+	hidden = 0
+	},
+/obj/item/melee/classic_baton/telescopic,
+/obj/item/storage/box/survival,
+/obj/item/crowbar/red,
+/obj/item/card/id/ert{
+	assignment = "Off-Duty Intelligence Officer";
+	desc = "An ID straight from Central Command.";
+	name = "Kenshin Midori's ID Card (Off-Duty Intelligence Officer)";
+	registered_name = "Kenshin Midori"
+	},
+/obj/item/encryptionkey/heads/captain,
+/obj/item/flashlight/seclite,
+/obj/item/gun/energy/e_gun/dragnet/snare,
 /turf/open/floor/wood,
 /area/centcom/ferry)
 "Ms" = (
@@ -17837,6 +17854,7 @@
 /area/centcom/ferry)
 "MY" = (
 /obj/structure/table/reinforced,
+/obj/item/reagent_containers/glass/bowl,
 /turf/open/floor/plasteel/cafeteria,
 /area/centcom/ferry)
 "Nc" = (
@@ -19923,9 +19941,6 @@
 /area/centcom/holding)
 "Vn" = (
 /obj/structure/table/wood/fancy,
-/obj/item/candle/infinite{
-	pixel_y = 6
-	},
 /obj/effect/turf_decal/loading_area{
 	dir = 1;
 	icon_state = "drain";
@@ -19941,6 +19956,10 @@
 	pixel_x = 7;
 	pixel_y = 5
 	},
+/obj/item/candle{
+	pixel_x = 1;
+	pixel_y = 6
+	},
 /turf/open/floor/wood,
 /area/centcom/control)
 "Vo" = (
@@ -20253,12 +20272,20 @@
 	},
 /area/centcom/control)
 "Wm" = (
-/obj/machinery/door/airlock/centcom{
-	name = "CentCom";
-	opacity = 1
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
 	},
-/turf/open/space/basic,
-/area/centcom/ferry)
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/recharger,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/dark,
+/area/centcom/control)
 "Wn" = (
 /obj/effect/turf_decal/loading_area{
 	dir = 6;
@@ -20694,9 +20721,9 @@
 /obj/item/reagent_containers/food/snacks/meatballspaghetti{
 	pixel_y = 14
 	},
-/obj/item/candle/infinite{
+/obj/item/candle{
 	pixel_x = 1;
-	pixel_y = 3
+	pixel_y = 6
 	},
 /turf/open/floor/wood,
 /area/centcom/control)
@@ -21235,6 +21262,8 @@
 	dir = 1
 	},
 /obj/structure/closet/crate/secure{
+	anchored = 1;
+	name = "secure gear crate";
 	req_access_txt = "101"
 	},
 /obj/item/clothing/suit/space/officer,
@@ -21243,7 +21272,6 @@
 /obj/item/clothing/gloves/combat,
 /obj/item/implanter/cqc,
 /obj/item/gun/energy/e_gun/stun,
-/obj/item/gun/energy/e_gun/dragnet/snare,
 /obj/item/radio/headset/headset_cent/commander,
 /obj/item/clothing/glasses/thermal,
 /obj/item/clothing/under/syndicate{
@@ -21251,9 +21279,18 @@
 	},
 /obj/item/card/id/ert{
 	assignment = "Intelligence Officer";
+	desc = "An ID straight from Central Command.";
 	name = "Kenshin Midori's ID Card (Intelligence Officer)";
 	registered_name = "Kenshin Midori"
 	},
+/obj/item/book{
+	damtype = "stamina";
+	desc = "An old and dusty book, the pages look faded from time while looking at the pages alone makes you tired.";
+	force = 80;
+	hitsound = punch;
+	name = "very heavy book";
+	throwforce = 160
+	},
 /turf/open/floor/wood,
 /area/centcom/ferry)
 "Zz" = (
@@ -54984,7 +55021,7 @@ oe
 mD
 mD
 qR
-Wm
+ZT
 mD
 mD
 mD
@@ -63197,7 +63234,7 @@ iu
 io
 rN
 CX
-iC
+Wm
 DF
 DT
 io
@@ -66005,7 +66042,7 @@ nM
 nM
 io
 mQ
-iu
+io
 rK
 iu
 tN