Merge pull request #1885 from caelaislinn/bs12_with_tgport

remaining map updates, plus misc

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/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)
+	if(!immune_to_ssd && sleeping < 2 && mind.active)
-			sleeping = 2
+		sleeping = 2