Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

code/game/objects/structures/inflatable.dm

@@ -146,6 +146,9 @@
 		set category = "Object"
 		set src in oview(1)
 
+		if(isobserver(usr)) //to stop ghosts from deflating
+			return
+
 		deflate()
 
 /obj/item/inflatable/door/

code/game/objects/structures/transit_tubes.dm

@@ -117,12 +117,14 @@ obj/structure/ex_act(severity)
 /obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj)
 	if(!pod_moving && icon_state == "open" && istype(AM, /mob))
 		for(var/obj/structure/transit_tube_pod/pod in loc)
-			if(!pod.moving && pod.dir in directions())
+			if(pod.contents.len)
+				AM << "<span class=The pod is already occupied.</span>"
+				return
+			else if(!pod.moving && pod.dir in directions())
 				AM.loc = pod
 				return
-
-
-
+			
+			
 /obj/structure/transit_tube/station/attack_hand(mob/user as mob)
 	if(!pod_moving)
 		for(var/obj/structure/transit_tube_pod/pod in loc)