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/modules/projectiles/gun.dm

@@ -28,8 +28,8 @@
 	var/automatic = 0 //Used to determine if you can target multiple people.
 	var/tmp/mob/living/last_moved_mob //Used to fire faster at more than one person.
 	var/tmp/told_cant_shoot = 0 //So that it doesn't spam them with the fact they cannot hit them.
-	var/firerate = 1 	// 0 for one bullet after tarrget moves and aim is lowered,
-						//1 for keep shooting until aim is lowered
+	var/firerate = 0 	//0 for keep shooting until aim is lowered
+						// 1 for one bullet after tarrget moves and aim is lowered
 	var/fire_delay = 6
 	var/last_fired = 0
 

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -26,7 +26,7 @@
 
 	attack_self(mob/living/user as mob)
 		if(recentpump)	return
-		pump()
+		pump(user)
 		recentpump = 1
 		spawn(10)
 			recentpump = 0

code/modules/projectiles/projectile/bullets.dm

@@ -61,4 +61,5 @@
 	damage = 25
 
 /obj/item/projectile/bullet/chameleon
-	damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
+	damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
+	embed = 0 // nope