diff --git a/code/modules/clothing/spacesuits/void/ert.dm b/code/modules/clothing/spacesuits/void/ert.dm index a89ff26f074..b9fe70383da 100644 --- a/code/modules/clothing/spacesuits/void/ert.dm +++ b/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', diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi index da75092bd0f..8823243859d 100644 Binary files a/icons/mob/head_vr.dmi and b/icons/mob/head_vr.dmi differ diff --git a/icons/mob/spacesuit_vr.dmi b/icons/mob/spacesuit_vr.dmi index 4196b2055e9..836b3a623de 100644 Binary files a/icons/mob/spacesuit_vr.dmi and b/icons/mob/spacesuit_vr.dmi differ diff --git a/icons/mob/species/akula/suit_vr.dmi b/icons/mob/species/akula/suit_vr.dmi index 5298666e0a9..d8ff65f802f 100644 Binary files a/icons/mob/species/akula/suit_vr.dmi and b/icons/mob/species/akula/suit_vr.dmi differ diff --git a/icons/mob/species/sergal/suit_vr.dmi b/icons/mob/species/sergal/suit_vr.dmi index 4dcd6868734..03adea85fcb 100644 Binary files a/icons/mob/species/sergal/suit_vr.dmi and b/icons/mob/species/sergal/suit_vr.dmi differ diff --git a/icons/mob/species/skrell/helmet_vr.dmi b/icons/mob/species/skrell/helmet_vr.dmi index b9806b4a582..be0c1ce344f 100644 Binary files a/icons/mob/species/skrell/helmet_vr.dmi and b/icons/mob/species/skrell/helmet_vr.dmi differ diff --git a/icons/mob/species/skrell/suit_vr.dmi b/icons/mob/species/skrell/suit_vr.dmi index f6ca26a4288..ab071d50698 100644 Binary files a/icons/mob/species/skrell/suit_vr.dmi and b/icons/mob/species/skrell/suit_vr.dmi differ diff --git a/icons/mob/species/tajaran/helmet_vr.dmi b/icons/mob/species/tajaran/helmet_vr.dmi index c2092f4d203..49cbece23f4 100644 Binary files a/icons/mob/species/tajaran/helmet_vr.dmi and b/icons/mob/species/tajaran/helmet_vr.dmi differ diff --git a/icons/mob/species/tajaran/suit_vr.dmi b/icons/mob/species/tajaran/suit_vr.dmi index 738585d622a..c20178dacb8 100644 Binary files a/icons/mob/species/tajaran/suit_vr.dmi and b/icons/mob/species/tajaran/suit_vr.dmi differ diff --git a/icons/mob/species/unathi/helmet_vr.dmi b/icons/mob/species/unathi/helmet_vr.dmi index 1c26c6271c9..e10d5b31ae2 100644 Binary files a/icons/mob/species/unathi/helmet_vr.dmi and b/icons/mob/species/unathi/helmet_vr.dmi differ diff --git a/icons/mob/species/unathi/suit_vr.dmi b/icons/mob/species/unathi/suit_vr.dmi index 9cc3bc89d59..f1625306a74 100644 Binary files a/icons/mob/species/unathi/suit_vr.dmi and b/icons/mob/species/unathi/suit_vr.dmi differ diff --git a/icons/mob/species/vulpkanin/helmet_vr.dmi b/icons/mob/species/vulpkanin/helmet_vr.dmi index d0c2f42d324..7ccdf2a14cc 100644 Binary files a/icons/mob/species/vulpkanin/helmet_vr.dmi and b/icons/mob/species/vulpkanin/helmet_vr.dmi differ diff --git a/icons/mob/species/vulpkanin/suit_vr.dmi b/icons/mob/species/vulpkanin/suit_vr.dmi index 81229b4f403..e0c20b6092f 100644 Binary files a/icons/mob/species/vulpkanin/suit_vr.dmi and b/icons/mob/species/vulpkanin/suit_vr.dmi differ diff --git a/icons/obj/clothing/hats_vr.dmi b/icons/obj/clothing/hats_vr.dmi index 8a1d7143c6f..8f9ad629a71 100644 Binary files a/icons/obj/clothing/hats_vr.dmi and b/icons/obj/clothing/hats_vr.dmi differ diff --git a/icons/obj/clothing/suits_vr.dmi b/icons/obj/clothing/suits_vr.dmi index 6c685554d87..a02c4756df5 100644 Binary files a/icons/obj/clothing/suits_vr.dmi and b/icons/obj/clothing/suits_vr.dmi differ diff --git a/maps/tether/submaps/admin_use/ert.dmm b/maps/tether/submaps/admin_use/ert.dmm index b453af29306..6c095544288 100644 --- a/maps/tether/submaps/admin_use/ert.dmm +++ b/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