janitor buff yippy

code/game/objects/items/devices/lightreplacer.dm

@@ -184,6 +184,12 @@
 	else
 		return 0
 
+/obj/item/device/lightreplacer/rig
+
+/obj/item/device/lightreplacer/rig/Use(var/mob/user)
+	playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+	return 1
+
 #undef LIGHT_OK
 #undef LIGHT_EMPTY
 #undef LIGHT_BROKEN

code/game/objects/random/closet.dm

@@ -20,7 +20,7 @@
 				/obj/structure/closet/lasertag/blue = 1,
 				/obj/structure/closet/toolcloset = 8,
 				/obj/structure/closet/gimmick/russian = 0.5,
-				/obj/structure/closet/jcloset = 1,
+				//obj/structure/closet/jcloset = 1, Do to having headset + rig + accually good gear
 				/obj/structure/closet/malf/suits =  0.5,
 				/obj/structure/closet/syndicate/personal = 0.1,
 				/obj/structure/closet/bombcloset = 0.5,

code/game/objects/random/rig.dm

@@ -125,6 +125,9 @@
 	/obj/item/rig_module/modular_injector/medical = 0.5, //Like normal but can be used on other people as well as yourself
 	/obj/item/rig_module/voice = 3,
 	/obj/item/rig_module/maneuvering_jets = 8, //Useful but common
+	/obj/item/rig_module/device/soap = 0.5, //Dud 99% of the time
+	/obj/item/rig_module/device/light_replacer = 0.1, //Almost always a dud
+	/obj/item/rig_module/device/paperfiller = 0.01, //Is a dud
 
 	//Vision
 	/obj/item/rig_module/vision/multi = 0.1, //Every vision mod in one, very powerful

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -96,6 +96,8 @@
 	new /obj/item/clothing/accessory/job/cape/service(src) // Boobles! - Seb
 	new /obj/item/tool/pickaxe(src) //helps with burrows! decent enough for minor pest control as well
 	new /obj/item/tool/hammer(src) //cracks! To go along side that pickaxe
+	new /obj/item/rig/light/ultra_light/janitor/equipped(src) //Fast but no armor rig
+
 
 /obj/structure/closet/custodial
 	name = "church custodial closet"

code/modules/clothing/spacesuits/rig/modules/utility.dm

@@ -16,6 +16,7 @@
  * /obj/item/rig_module/device/paperdispenser
  * /obj/item/rig_module/device/pen
  * /obj/item/rig_module/device/stamp
+ * /obj/item/rig_module/device/soap
  */
 
 /obj/item/rig_module/device
@@ -82,7 +83,6 @@
 
 	price_tag = 850
 
-
 /obj/item/rig_module/device/rcd
 	name = "RCD mount"
 	desc = "A cell-powered rapid construction device for a hardsuit."
@@ -620,3 +620,40 @@
 	last_use = world.time
 	if(ismob(target))
 		cooldown_time = 10 SECONDS //10x longer cooldown on hooking people, so you can't grapplelock them as easily
+
+/obj/item/rig_module/device/soap
+	name = "scrubber module"
+	desc = "A retractable scrubbing soap module."
+	icon_state = "scanner"
+	interface_name = "scrubber module"
+	interface_desc = "Used to clean messes and floor tiles, needs to be wetted from time to time."
+	engage_string = "Start Scrubbers"
+	selectable = 1
+	device_type = /obj/item/soap/syndie //faster and more uses
+
+	price_tag = 250
+
+/obj/item/rig_module/device/light_replacer
+	name = "light swapper module"
+	desc = "A retractable light replacer module."
+	icon_state = "scanner"
+	interface_name = "light replacer module"
+	interface_desc = "Used to swap broken or burnt out lights in a flash."
+	engage_string = "Start Replacing"
+	selectable = 1
+	device_type = /obj/item/device/lightreplacer/rig //faster and more uses
+
+	use_power_cost = 20 //We are fabbing a new light make it cost something
+	price_tag = 250
+
+/obj/item/rig_module/device/paperfiller
+	name = "newspaper restocking module"
+	desc = "A compressed stack of newspaper and claw to refill newscasters."
+	icon_state = "scanner"
+	interface_name = "newspaper restocking module"
+	interface_desc = "Used on newscasters to replenish printing paper."
+	engage_string = "Start Refilling"
+	selectable = 1
+	device_type = /obj/item/newspaper_stack //faster and more uses
+
+	price_tag = 150

code/modules/clothing/spacesuits/rig/suits/light.dm

@@ -74,6 +74,45 @@
 	flags_inv = 0
 	camera_networks = list(NETWORK_RESEARCH)
 
+/obj/item/rig/light/ultra_light/janitor
+	name = "SI 'Clean Spacer' control module"
+	desc = "An ultra light, unarmoured rig suit. Commissioned for cleaners and janitors due to its enhanced speed and helping with protecting against biohazards. \
+	Not as fast as the base Spacer Rig due to supportive magboots having galoshes helping janitors not slip."
+	icon_state = "hacker_rig"
+	suit_type = "SI 'Cleaner"
+	boot_type =  /obj/item/clothing/shoes/magboots/rig/light/ultra_light/janitor
+	slowdown = -0.1  //The cost of a no slip flag
+
+/obj/item/clothing/shoes/magboots/rig/light/ultra_light/janitor
+	item_flags = COVER_PREVENT_MANIPULATION | NOSLIP
+
+/obj/item/clothing/shoes/magboots/rig/light/ultra_light/janitor/attack_self(mob/user)
+	if(magpulse)
+		magpulse = 0
+		set_slowdown()
+		force = WEAPON_FORCE_WEAK
+		if(icon_base) icon_state = "[icon_base]0"
+		to_chat(user, "You disable the mag-pulse traction system.")
+	else
+		magpulse = 1
+		set_slowdown()
+		force = WEAPON_FORCE_PAINFUL
+		if(icon_base) icon_state = "[icon_base]1"
+		to_chat(user, "You enable the mag-pulse traction system.")
+	user.update_inv_shoes()	//so our mob-over-lays update
+	user.update_action_buttons()
+	user.update_floating()
+
+
+/obj/item/rig/light/ultra_light/janitor/equipped
+	initial_modules = list(
+		/obj/item/rig_module/device/flash,
+		/obj/item/rig_module/device/soap,
+		/obj/item/rig_module/device/light_replacer,
+		/obj/item/rig_module/device/paperfiller,
+		/obj/item/rig_module/storage
+		)
+
 /obj/item/rig/light/hacker/steward
 	name = "SI 'Retainer' control module"
 	desc = "A Soteria Institute modification of the traditional light rig built for equal parts utility and defense."