Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/game/objects/items/devices/PDA/cart.dm

@@ -436,7 +436,7 @@ Code:
 						menu += "No bots found.<BR>"
 
 					else
-						for(var/obj/machinery/bot/secbot/B in SC.botlist)
+						for(var/obj/machinery/bot/B in SC.botlist)
 							if (B)
 								menu += "<A href='byond://?src=\ref[SC];op=control;bot=\ref[B]'>[B] at [B.loc.loc]</A><BR>"
 

code/game/objects/items/weapons/cigs_lighters.dm

@@ -246,12 +246,6 @@ ZIPPO
 	icon_state = "cigarbutt"
 
 
-/obj/item/clothing/mask/cigarette/cigar/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/match))
-		..()
-	else
-		user << "<span class='notice'>\The [src] straight out REFUSES to be lit by such uncivilized means.</span>"
-
 /////////////////
 //SMOKING PIPES//
 /////////////////
@@ -305,12 +299,6 @@ ZIPPO
 		smoketime = initial(smoketime)
 	return
 
-/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/match))
-		..()
-	else
-		user << "<span class='notice'>\The [src] straight out REFUSES to be lit by such means.</span>"
-
 /obj/item/clothing/mask/cigarette/pipe/cobpipe
 	name = "corn cob pipe"
 	desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters."

code/game/objects/items/weapons/storage/belt.dm

@@ -104,7 +104,7 @@
 	desc = "Can hold security gear like handcuffs and flashes."
 	icon_state = "securitybelt"
 	item_state = "security"//Could likely use a better one.
-	storage_slots = 4
+	storage_slots = 7
 	can_hold = list(
 		"/obj/item/weapon/grenade/flashbang",
 		"/obj/item/weapon/reagent_containers/spray/pepper",
@@ -114,7 +114,9 @@
 		"/obj/item/ammo_casing/shotgun",
 		"/obj/item/ammo_magazine",
 		"/obj/item/weapon/reagent_containers/food/snacks/donut/normal",
-		"/obj/item/weapon/reagent_containers/food/snacks/donut/jelly"
+		"/obj/item/weapon/reagent_containers/food/snacks/donut/jelly",
+		"/obj/item/weapon/melee/baton",
+		"/obj/item/weapon/gun/energy/taser"
 		)
 
 /obj/item/weapon/storage/belt/soulstone

code/modules/mob/living/logout.dm

@@ -2,5 +2,5 @@
 	..()
 	if(!key && mind)	//key and mind have become seperated.
 		mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
-		if(!immune_to_ssd && sleeping < 2)
-			sleeping = 2
+	if(!immune_to_ssd && sleeping < 2 && mind.active)
+		sleeping = 2