Merge pull request #2912 from Segrain/master

Meteor showers, engineering tapes, pill bottles.

code/WorkInProgress/Ported/policetape.dm

@@ -95,7 +95,7 @@
 	//is_blocked_turf(var/turf/T)
 		usr << "\blue You finish placing the [src]."	//Git Test
 
-/obj/item/taperoll/police/afterattack(var/atom/A, mob/user as mob)
+/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob)
 	if (istype(A, /obj/machinery/door/airlock))
 		var/turf/T = get_turf(A)
 		var/obj/item/tape/P = new tape_type(T.x,T.y,T.z)

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

code/modules/events/meteors.dm

@@ -21,7 +21,7 @@
 
 //
 /datum/event/meteor_shower
-	startWhen		= 6
+	startWhen		= 5
 	endWhen 		= 7
 	var/next_meteor = 6
 	var/waves = 1

html/changelog.html

@@ -67,6 +67,16 @@ should be listed in the changelog upon commit though. Thanks. -->
 	</ul>
 </div>
 
+<div class="commit sansserif">
+	<h2 class="date">30.05.2013</h2>
+	<h3 class="author">Segrain updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Meteor showers actually spawn meteors now.</li>
+		<li class="tweak">Engineering tape fits into toolbelt and can be placed on doors.</li>
+		<li class="rscadd">Pill bottles can hold paper.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">28th May 2013</h2>
 	<h3 class="author">Erthilo updated:</h3>