Merge pull request #10102 from PsiOmegaDelta/dev-freeze

Dev freeze

code/modules/mining/mine_turfs.dm

@@ -342,8 +342,8 @@
 				R.amount = rand(5,25)
 
 			if(2)
-				var/obj/item/stack/tile/R = new(src)
-				R.amount = rand(1,5)
+				var/obj/item/stack/material/plasteel/R = new(src)
+				R.amount = rand(5,25)
 
 			if(3)
 				var/obj/item/stack/material/steel/R = new(src)

code/modules/recycling/conveyor2.dm

@@ -95,8 +95,9 @@
 // attack with item, place item on conveyor
 /obj/machinery/conveyor/attackby(var/obj/item/I, mob/user)
 	if(isrobot(user))	return //Carn: fix for borgs dropping their modules on conveyor belts
-	user.drop_item()
-	if(I && I.loc)	I.loc = src.loc
+	if(I.loc != user)	return // This should stop mounted modules ending up outside the module.
+		
+	user.drop_item(src)
 	return
 
 // attack with hand, move pulled object onto conveyor

html/changelog.html

@@ -56,6 +56,18 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">11 July 2015</h2>
+			<h3 class="author">HarpyEagle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Added inhand sprites for flashes, flashbangs, emp and other grenades.</li>
+			</ul>
+			<h3 class="author">Loganbacca updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Turrets no longer burn holes through the AI.</li>
+				<li class="tweak">Projectiles now have a chance of hitting mobs riding cargo trains.</li>
+				<li class="bugfix">Fixed visual bugs with projectile effects.</li>
+			</ul>
+
 			<h2 class="date">10 July 2015</h2>
 			<h3 class="author">Zuhayr updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -1961,3 +1961,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2015-07-10:
   Zuhayr:
   - rscadd: Ninja now spawns on a little pod on Z2 and can teleport to the main level.
+2015-07-11:
+  HarpyEagle:
+  - imageadd: Added inhand sprites for flashes, flashbangs, emp and other grenades.
+  Loganbacca:
+  - bugfix: Turrets no longer burn holes through the AI.
+  - tweak: Projectiles now have a chance of hitting mobs riding cargo trains.
+  - bugfix: Fixed visual bugs with projectile effects.

html/changelogs/HarpyEagle-dev-freeze.yml

@@ -1,4 +1,3 @@
 author: HarpyEagle
-changes:
-  - imageadd: "Added inhand sprites for flashes, flashbangs, emp and other grenades."
+changes: []
 delete-after: false

html/changelogs/Loganbacca-fixes.yml

@@ -1,5 +0,0 @@
-author: Loganbacca
-delete-after: True
-changes: 
-  - bugfix: "Turrets no longer burn holes through the AI."
-  - tweak: "Projectiles now have a chance of hitting mobs riding cargo trains."

html/changelogs/Loganbacca-projectilefixes.yml

@@ -1,4 +0,0 @@
-author: Loganbacca
-delete-after: True
-changes: 
-  - bugfix: "Fixed visual bugs with projectile effects."