Custodial Oversight Fixes (#15041)

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

@@ -1,9 +1,9 @@
-// Custodian
+// Custodial Locker
 /obj/structure/closet/secure_closet/custodial
 	name = "custodial closet"
-	req_access = list(access_janitor)
 	desc = "It's a storage unit for a custodian's clothes and gear."
 	icon_state = "custodial"
+	req_access = list(access_janitor)
 
 /obj/structure/closet/secure_closet/custodial/fill()
 	new /obj/item/clothing/head/softcap/nt/custodian(src)
@@ -13,7 +13,8 @@
 	new /obj/item/clothing/under/rank/janitor/idris(src)
 	new /obj/item/storage/box/janitorgloves(src)
 	new /obj/item/storage/belt/custodial(src)
-	new /obj/item/clothing/accessory/holster/utility/custodial/armpit/brown(src)
+	new /obj/item/clothing/accessory/holster/utility/custodial/hip(src)
+	new /obj/item/clothing/accessory/holster/utility/custodial/armpit(src)
 	new /obj/item/clothing/shoes/galoshes(src)
 	new /obj/item/gun/energy/mousegun(src)
 	new /obj/item/device/flashlight(src)
@@ -28,27 +29,21 @@
 	new /obj/item/grenade/chem_grenade/cleaner(src)
 	new /obj/item/device/gps/janitor(src)
 	new /obj/item/taperoll/custodial(src)
-	new /obj/item/clothing/suit/caution(src)
-	new /obj/item/clothing/suit/caution(src)
-	new /obj/item/clothing/suit/caution(src)
-	new /obj/item/clothing/suit/caution(src)
 	new /obj/item/storage/box/lights/mixed(src)
 	new /obj/item/storage/box/mousetraps(src)
 
-obj/structure/closet/secure_closet/custodial/offship
+// Away Ship/Site Custodial Locker
+/obj/structure/closet/secure_closet/custodial/offship
 	req_access = null
 
 /obj/structure/closet/secure_closet/custodial/offship/fill()
 	new /obj/item/storage/box/janitorgloves(src)
 	new /obj/item/storage/belt/custodial(src)
-	new /obj/item/clothing/accessory/holster/utility/custodial/armpit/brown(src)
 	new /obj/item/clothing/shoes/galoshes(src)
-	new /obj/item/gun/energy/mousegun(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/reagent_containers/spray/cleaner(src)
-	new /obj/item/soap/nanotrasen(src)
+	new /obj/item/soap/red_soap(src)
 	new /obj/item/reagent_containers/glass/rag(src)
-	new /obj/item/reagent_containers/glass/rag/advanced(src)
 	new /obj/item/device/lightreplacer(src)
 	new /obj/item/storage/bag/trash(src)
 	new /obj/item/grenade/chem_grenade/cleaner(src)
@@ -60,4 +55,4 @@ obj/structure/closet/secure_closet/custodial/offship
 	new /obj/item/clothing/suit/caution(src)
 	new /obj/item/clothing/suit/caution(src)
 	new /obj/item/storage/box/lights/mixed(src)
-	new /obj/item/storage/box/mousetraps(src)
+	new /obj/item/storage/box/mousetraps(src)

code/game/objects/structures/janicart.dm

@@ -1,6 +1,6 @@
 /obj/structure/janitorialcart
-	name = "janitorial cart"
-	desc = "The ultimate in janitorial carts! Has space for water, mops, signs, trash bags, and more!"
+	name = "custodial cart"
+	desc = "The ultimate in custodial carts. Has space for water, mops, signs, trash bags, and more."
 	desc_info  = "Click and drag a mop bucket onto the cart to mount it\
 	</br>Alt+Click with a mop to put it away, a normal click will wet it in the bucket.\
 	</br>Alt+Click with a container, such as a bucket, to pour its contents into the mounted bucket. A normal click will toss it into the trash\
@@ -14,18 +14,33 @@
 	build_amt = 15
 	slowdown = 0
 
-	//copypaste sorry
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
-	var/obj/item/storage/bag/trash/mybag	= null
+	var/obj/item/storage/bag/trash/mybag = null
 	var/obj/item/mop/mymop = null
 	var/obj/item/reagent_containers/spray/myspray = null
 	var/obj/item/device/lightreplacer/myreplacer = null
 	var/obj/structure/mopbucket/mybucket = null
-	var/signs = 0	//maximum capacity hardcoded below
-	var/has_items = 0//This is set true whenever the cart has anything loaded/mounted on it
+	var/signs = 0 //maximum capacity hardcoded below
+	var/has_items = FALSE //This is set true whenever the cart has anything loaded/mounted on it
 	var/driving
 	var/mob/living/pulling
 
+// Regular Variant
+// No trashbag and no light replacer, this is inside the custodian's locker.
+/obj/structure/janitorialcart/Initialize()
+	. = ..()
+	mymop = new /obj/item/mop(src)
+	myspray = new /obj/item/reagent_containers/spray/cleaner(src)
+
+	mybucket = new /obj/structure/mopbucket(src)
+
+	for(signs, signs < 4, signs++)
+		new /obj/item/clothing/suit/caution(src)
+
+	update_icon()
+
+// Full Variant
+// Has everything.
 /obj/structure/janitorialcart/full/Initialize()
 	. = ..()
 	mybag = new /obj/item/storage/bag/trash(src)
@@ -40,6 +55,8 @@
 
 	update_icon()
 
+// Full with Water Variant
+// Has everything as well as water in the mop bucket.
 /obj/structure/janitorialcart/full/water/Initialize()
 	. = ..()
 	mybag = new /obj/item/storage/bag/trash(src)
@@ -407,4 +424,4 @@
 		if(istype(mover, /obj/item/projectile))
 			return prob(30)
 		else
-			return !density
+			return !density

code/modules/clothing/under/accessories/holster.dm

@@ -177,33 +177,48 @@
 	name = "brown thigh holster"
 	icon_state = "holster_brown_thigh"
 
-//
-// Utility Holsters
-//
+/********** Utility Holsters Start **********/
+// Utility Holster
 /obj/item/clothing/accessory/holster/utility
 	name = "utility holster"
 	desc = "A utility holster."
+	icon = 'icons/contained_items/clothing/accessories/utility_holsters.dmi'
+	contained_sprite = TRUE
+
 	var/list/allowed_items = list() // A list of allowed items.
 
 /obj/item/clothing/accessory/holster/utility/holster(var/obj/item/I, var/mob/living/user)
 	if(!is_type_in_list(I, allowed_items))
-		to_chat(user, "<span class='notice'>\The [I] won't fit in \the [src].</span>")
+		to_chat(user, SPAN_NOTICE("\The [I] won't fit in \the [src]."))
 		return
-
 	..()
 
 // Custodial Holster
-/obj/item/clothing/accessory/holster/utility/custodial/armpit/brown
-	name = "brown custodial armpit holster"
-	desc = "A brown utility holster which can't hold actual firearms. This particular one is designed for custodial personnel."
+/obj/item/clothing/accessory/holster/utility/custodial
+	name = "custodial holster"
+	desc = "A custodial holster."
 	desc_fluff = "In a universe where various utility firearms and tools have become more common for diverse applications, it is important that there are ways to store them where \
 		they are kept safe from wear and tear as well as from misuse. Thus as an alternative to regular firearm holsters, specialized utility firearm and tool holsters exist, which \
 		allow non-standard firearms to be stored inside, whilst at the same time keeping individuals from storing actual firearms in one."
-	icon_state = "holster_brown"
 	allowed_items = list(
 		/obj/item/gun/energy/mousegun,
 		/obj/item/gun/energy/mousegun/xenofauna,
 		/obj/item/gun/projectile/revolver/capgun,
 		/obj/item/toy/crossbow,
 		/obj/item/reagent_containers/food/snacks/grown/banana
-	)
+	)
+
+// Brown Custodial Armpit Holster
+/obj/item/clothing/accessory/holster/utility/custodial/armpit
+	name = "brown custodial armpit holster"
+	desc = "A brown utility holster which can't hold actual firearms. This particular one is designed for custodial personnel."
+	icon_state = "custodial_brown"
+	item_state = "custodial_brown"
+
+// Brown Custodial Hip Holster
+/obj/item/clothing/accessory/holster/utility/custodial/hip
+	name = "brown custodial hip holster"
+	desc = "A brown utility holster which can't hold actual firearms. This particular one is designed for custodial personnel."
+	icon_state = "custodial_brown_hip"
+	item_state = "custodial_brown_hip"
+/********** Utility Holsters End **********/

html/changelogs/custodiholster_tweak.yml

@@ -0,0 +1,7 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Adds a hip variant of the custodial holster. Removes superfluous items from the custodians' lockers. Removes superfluous items from the custodial cart."
+  - bugfix: "Turns the utility holsters into a contained sprite."

maps/sccv_horizon/sccv_horizon-1_deck_1.dmm

@@ -3278,11 +3278,11 @@
 /turf/simulated/floor/tiled,
 /area/medical/emergency_storage)
 "cxG" = (
-/obj/structure/janitorialcart/full,
 /obj/effect/floor_decal/corner/purple{
 	dir = 10
 	},
 /obj/effect/floor_decal/industrial/outline/custodial,
+/obj/structure/janitorialcart,
 /turf/simulated/floor/tiled,
 /area/janitor)
 "cya" = (
@@ -14600,7 +14600,7 @@
 	id_tag = "intrepid_cockpit";
 	name = "Close-in Weapons System Bay";
 	req_access = null;
-	req_one_access = list(73, 31)
+	req_one_access = list(73,31)
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
@@ -22188,7 +22188,6 @@
 /turf/simulated/floor/tiled,
 /area/operations/loading)
 "rpK" = (
-/obj/structure/janitorialcart/full,
 /obj/machinery/camera/network/service{
 	c_tag = "Custodial - Main Storage";
 	dir = 1
@@ -22197,6 +22196,7 @@
 	dir = 10
 	},
 /obj/effect/floor_decal/industrial/outline/custodial,
+/obj/structure/janitorialcart,
 /turf/simulated/floor/tiled,
 /area/janitor)
 "rqf" = (

maps/sccv_horizon/sccv_horizon-2_deck_2.dmm

@@ -3573,7 +3573,7 @@
 	name = "Primary Armament Exterior Bolts";
 	pixel_x = 22;
 	pixel_y = 22;
-	req_access = list(19, 11);
+	req_access = list(19,11);
 	specialfunctions = 4
 	},
 /obj/structure/cable{
@@ -17683,14 +17683,12 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/starboard)
 "iMo" = (
-/obj/structure/closet/crate/trashcart,
-/obj/effect/floor_decal/corner/purple/full{
-	dir = 1
-	},
 /obj/structure/sign/nosmoking_1{
 	pixel_y = 32
 	},
-/obj/effect/floor_decal/industrial/outline/custodial,
+/obj/effect/floor_decal/corner/green/full{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
 "iMG" = (
@@ -24103,7 +24101,7 @@
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/engine_room)
 "mep" = (
-/obj/effect/floor_decal/corner/purple{
+/obj/effect/floor_decal/corner/green{
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
@@ -25129,12 +25127,12 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/effect/floor_decal/corner/purple/full{
-	dir = 4
-	},
 /obj/structure/flora/pottedplant{
 	icon_state = "plant-33"
 	},
+/obj/effect/floor_decal/corner/green/full{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
 "mGr" = (
@@ -26439,12 +26437,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armory)
 "niM" = (
-/obj/effect/floor_decal/corner/purple{
-	dir = 6
-	},
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/effect/floor_decal/corner/green{
+	dir = 6
+	},
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
 "niR" = (