Merge pull request #8528 from KillianKirilenko/kk-suits

Mk7 ERT-J

code/modules/clothing/spacesuits/void/ert.dm

@@ -44,6 +44,18 @@
 	..()
 	helmet = new /obj/item/clothing/head/helmet/space/void/responseteam/security //autoinstall the helmet
 
+/obj/item/clothing/suit/space/void/responseteam/janitor
+	name = "Mark VII-J Emergency Cleanup Response Suit"
+	icon_state = "ertsuit_j"
+	item_state = "ertsuit_j"
+	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 100, rad = 100) //awful armor
+	slowdown = 0 //light armor means no slowdown
+	item_flags = NOSLIP //INBUILT NANOGALOSHES
+
+/obj/item/clothing/suit/space/void/responseteam/janitor/Initialize()
+	..()
+	helmet = new /obj/item/clothing/head/helmet/space/void/responseteam/janitor //autoinstall the helmet
+
 /obj/item/clothing/suit/space/void/responseteam
 	sprite_sheets = list(
 		SPECIES_HUMAN			= 'icons/mob/spacesuit_vr.dmi',
@@ -137,6 +149,11 @@
 	icon_state = "erthelmet_s"
 	item_state = "erthelmet_s"
 
+/obj/item/clothing/head/helmet/space/void/responseteam/janitor
+	name = "Mark VII-J Emergency Cleanup Response Helmet"
+	icon_state = "erthelmet_j"
+	item_state = "erthelmet_j"
+
 /obj/item/clothing/head/helmet/space/void/responseteam
 	sprite_sheets = list(
 		SPECIES_HUMAN			= 'icons/mob/head_vr.dmi',

maps/tether/submaps/admin_use/ert.dmm

@@ -1305,6 +1305,18 @@
 /obj/machinery/light,
 /obj/structure/table/standard,
 /obj/item/weapon/soap,
+/obj/item/weapon/soap,
+/obj/item/weapon/soap,
+/obj/item/weapon/soap,
+/obj/item/weapon/towel{
+	color = "#0000FF"
+	},
+/obj/item/weapon/towel{
+	color = "#0000FF"
+	},
+/obj/item/weapon/towel{
+	color = "#0000FF"
+	},
 /obj/item/weapon/towel{
 	color = "#0000FF"
 	},
@@ -1315,16 +1327,22 @@
 	name = "custodial"
 	},
 /obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/item/weapon/reagent_containers/glass/bucket,
 /obj/item/weapon/reagent_containers/glass/bucket,
 /obj/item/weapon/mop,
+/obj/item/weapon/mop,
+/obj/item/weapon/mop,
+/obj/item/weapon/mop,
 /obj/item/weapon/rig/ert/janitor,
-/turf/simulated/shuttle/floor/black,
-/area/shuttle/specops/centcom)
-"cG" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 2;
-	req_access = list(103)
-	},
+/obj/item/device/lightreplacer,
+/obj/item/device/lightreplacer,
+/obj/item/weapon/storage/box/lights/mixed,
+/obj/item/weapon/storage/box/lights/mixed,
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/specops/centcom)
 "cH" = (
@@ -2114,6 +2132,12 @@
 /obj/item/device/suit_cooling_unit,
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/specops/centcom)
+"zV" = (
+/obj/machinery/door/airlock/glass_command{
+	req_one_access = list(103)
+	},
+/turf/simulated/shuttle/floor/black,
+/area/shuttle/specops/centcom)
 "HG" = (
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_y = -32
@@ -2133,6 +2157,18 @@
 /obj/item/clothing/suit/space/void/responseteam/security,
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/specops/centcom)
+"WJ" = (
+/obj/structure/table/rack/steel,
+/obj/item/clothing/suit/space/void/responseteam/janitor,
+/obj/item/clothing/suit/space/void/responseteam/janitor,
+/obj/item/clothing/suit/space/void/responseteam/janitor,
+/obj/item/clothing/suit/space/void/responseteam/janitor,
+/obj/item/weapon/storage/belt/janitor,
+/obj/item/weapon/storage/belt/janitor,
+/obj/item/weapon/storage/belt/janitor,
+/obj/item/weapon/storage/belt/janitor,
+/turf/simulated/shuttle/floor/black,
+/area/shuttle/specops/centcom)
 
 (1,1,1) = {"
 aa
@@ -2800,7 +2836,7 @@ ap
 am
 bZ
 aH
-aH
+WJ
 ap
 ap
 ap
@@ -2837,8 +2873,8 @@ ap
 ap
 ap
 ap
-aH
-cG
+zV
+ap
 am
 ap
 da