Merge remote-tracking branch 'citadel/master' into mobility_flags

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

@@ -76,7 +76,7 @@
 	new /obj/item/door_remote/chief_medical_officer(src)
 	new /obj/item/clothing/neck/petcollar(src)
 	new /obj/item/pet_carrier(src)
-	new /obj/item/storage/belt/medical/surgery_belt_adv(src)
+	new /obj/item/storage/belt/medical/surgery_belt_adv/cmo(src)
 	new /obj/item/wallframe/defib_mount(src)
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
 	new /obj/item/storage/photo_album/CMO(src)

code/game/objects/structures/janicart.dm

@@ -6,11 +6,11 @@
 	anchored = FALSE
 	density = TRUE
 	//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/mop/mymop = null
-	var/obj/item/reagent_containers/spray/cleaner/myspray = null
-	var/obj/item/lightreplacer/myreplacer = null
+	var/obj/item/storage/bag/trash/mybag
+	var/obj/item/mop/mymop
+	var/obj/item/twohanded/broom/mybroom
+	var/obj/item/reagent_containers/spray/cleaner/myspray
+	var/obj/item/lightreplacer/myreplacer
 	var/signs = 0
 	var/const/max_signs = 4
 
@@ -49,7 +49,12 @@
 			m.janicart_insert(user, src)
 		else
 			to_chat(user, fail_msg)
-
+	else if(istype(I, /obj/item/twohanded/broom))
+		if(!mybroom)
+			var/obj/item/twohanded/broom/b=I
+			b.janicart_insert(user,src)
+		else
+			to_chat(user, fail_msg)
 	else if(istype(I, /obj/item/storage/bag/trash))
 		if(!mybag)
 			var/obj/item/storage/bag/trash/t=I
@@ -97,6 +102,8 @@
 		dat += "<a href='?src=[REF(src)];garbage=1'>[mybag.name]</a><br>"
 	if(mymop)
 		dat += "<a href='?src=[REF(src)];mop=1'>[mymop.name]</a><br>"
+	if(mybroom)
+		dat += "<a href='?src=[REF(src)];broom=1'>[mybroom.name]</a><br>"
 	if(myspray)
 		dat += "<a href='?src=[REF(src)];spray=1'>[myspray.name]</a><br>"
 	if(myreplacer)
@@ -124,6 +131,11 @@
 			user.put_in_hands(mymop)
 			to_chat(user, "<span class='notice'>You take [mymop] from [src].</span>")
 			mymop = null
+	if(href_list["broom"])
+		if(mybroom)
+			user.put_in_hands(mybroom)
+			to_chat(user, "<span class='notice'>You take [mybroom] from [src].</span>")
+			mybroom = null
 	if(href_list["spray"])
 		if(myspray)
 			user.put_in_hands(myspray)
@@ -155,6 +167,8 @@
 		add_overlay("cart_garbage")
 	if(mymop)
 		add_overlay("cart_mop")
+	if(mybroom)
+		add_overlay("cart_broom")
 	if(myspray)
 		add_overlay("cart_spray")
 	if(myreplacer)

code/game/objects/structures/watercloset.dm

@@ -528,7 +528,7 @@
 		if(B.cell)
 			if(B.cell.charge > 0 && B.status == 1)
 				flick("baton_active", src)
-				var/stunforce = B.stunforce
+				var/stunforce = B.stamforce
 				user.DefaultCombatKnockdown(stunforce)
 				user.stuttering = stunforce/20
 				B.deductcharge(B.hitcost)