Merge pull request #2927 from Baystation12/master

Merging master to BEF

code/game/gamemodes/gameticker.dm

@@ -39,7 +39,8 @@ var/global/datum/controller/gameticker/ticker
 /datum/controller/gameticker/proc/pregame()
 	login_music = pick(\
 	'sound/music/space.ogg',\
-	'sound/music/traitor.ogg')
+	'sound/music/traitor.ogg',\
+	'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on?
 	do
 		pregame_timeleft = 180
 		world << "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>"

code/game/machinery/atmoalter/canister.dm

@@ -18,14 +18,6 @@
 	use_power = 0
 	var/release_log = ""
 
-/obj/machinery/portable_atmospherics/initialize()
-	. = ..()
-	spawn()
-		var/obj/machinery/atmospherics/portables_connector/connector = locate() in loc
-		if(connector)
-			connected_port = connector
-			update_icon()
-
 /obj/machinery/portable_atmospherics/canister/sleeping_agent
 	name = "Canister: \[N2O\]"
 	icon_state = "redws"

code/game/machinery/atmoalter/meter.dm

@@ -129,5 +129,5 @@
 	if (!target)
 		src.target = loc
 
-/obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	return
+/obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	return

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -19,6 +19,14 @@
 
 		return 1
 
+	initialize()
+		. = ..()
+		spawn()
+			var/obj/machinery/atmospherics/portables_connector/port = locate() in loc
+			if(port)
+				connect(port)
+				update_icon()
+	
 	process()
 		if(!connected_port) //only react when pipe_network will ont it do it for you
 			//Allow for reactions
@@ -135,4 +143,4 @@
 			user << "\blue Tank is empty!"
 		return
 
-	return
+	return

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

@@ -51,7 +51,8 @@
 		"/obj/item/device/flashlight",
 		"/obj/item/weapon/cable_coil",
 		"/obj/item/device/t_scanner",
-		"/obj/item/device/analyzer")
+		"/obj/item/device/analyzer",
+		"/obj/item/taperoll/engineering")
 
 
 /obj/item/weapon/storage/belt/utility/full/New()

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

@@ -103,7 +103,7 @@
 	icon = 'icons/obj/chemical.dmi'
 	item_state = "contsolid"
 	w_class = 2.0
-	can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice")
+	can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice","/obj/item/weapon/paper")
 	allow_quick_gather = 1
 	use_to_pickup = 1
 	storage_slots = 14