Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme

code/modules/projectiles/projectile/beams.dm

@@ -1,6 +1,7 @@
 /obj/item/projectile/beam
 	name = "laser"
 	icon_state = "laser"
+	fire_sound = 'sound/weapons/Laser.ogg'
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	damage = 40
 	damage_type = BURN
@@ -21,7 +22,6 @@
 /obj/item/projectile/beam/practice
 	name = "laser"
 	icon_state = "laser"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	damage = 0
 	damage_type = BURN
 	check_armour = "laser"
@@ -32,6 +32,9 @@
 	icon_state = "laser"
 	damage = 15
 
+/obj/item/projectile/beam/smalllaser
+	damage = 25
+
 /obj/item/projectile/beam/burstlaser
 	damage = 30
 	armor_penetration = 10
@@ -44,6 +47,7 @@
 /obj/item/projectile/beam/heavylaser
 	name = "heavy laser"
 	icon_state = "heavylaser"
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 	damage = 60
 	armor_penetration = 30
 	light_range = 3
@@ -62,6 +66,7 @@
 /obj/item/projectile/beam/xray
 	name = "xray beam"
 	icon_state = "xray"
+	fire_sound = 'sound/weapons/eluger.ogg'
 	damage = 25
 	armor_penetration = 50
 	light_color = "#00CC33"
@@ -83,8 +88,9 @@
 /obj/item/projectile/beam/pulse
 	name = "pulse"
 	icon_state = "u_laser"
-	damage = 50
-	armor_penetration = 30
+	fire_sound='sound/weapons/pulse.ogg'
+	damage = 100	//Badmin toy, don't care
+	armor_penetration = 100
 	light_color = "#0066FF"
 
 	muzzle_type = /obj/effect/projectile/laser_pulse/muzzle
@@ -99,6 +105,7 @@
 /obj/item/projectile/beam/emitter
 	name = "emitter beam"
 	icon_state = "emitter"
+	fire_sound = 'sound/weapons/emitter.ogg'
 	damage = 0 // The actual damage is computed in /code/modules/power/singularity/emitter.dm
 	light_color = "#00CC33"
 
@@ -109,7 +116,6 @@
 /obj/item/projectile/beam/lastertag/blue
 	name = "lasertag beam"
 	icon_state = "bluelaser"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	damage = 0
 	no_attack_log = 1
 	damage_type = BURN
@@ -130,7 +136,6 @@
 /obj/item/projectile/beam/lastertag/red
 	name = "lasertag beam"
 	icon_state = "laser"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	damage = 0
 	no_attack_log = 1
 	damage_type = BURN
@@ -147,7 +152,6 @@
 /obj/item/projectile/beam/lastertag/omni//A laser tag bolt that stuns EVERYONE
 	name = "lasertag beam"
 	icon_state = "omnilaser"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	damage = 0
 	damage_type = BURN
 	check_armour = "laser"
@@ -167,6 +171,7 @@
 /obj/item/projectile/beam/sniper
 	name = "sniper beam"
 	icon_state = "xray"
+	fire_sound = 'sound/weapons/gauss_shoot.ogg'
 	damage = 50
 	armor_penetration = 10
 	light_color = "#00CC33"
@@ -178,6 +183,7 @@
 /obj/item/projectile/beam/stun
 	name = "stun beam"
 	icon_state = "stun"
+	fire_sound = 'sound/weapons/Taser.ogg'
 	nodamage = 1
 	taser_effect = 1
 	agony = 40

code/modules/projectiles/projectile/bullets.dm

@@ -1,6 +1,7 @@
 /obj/item/projectile/bullet
 	name = "bullet"
 	icon_state = "bullet"
+	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
 	damage = 60
 	damage_type = BRUTE
 	nodamage = 0
@@ -124,6 +125,7 @@
 /* short-casing projectiles, like the kind used in pistols or SMGs */
 
 /obj/item/projectile/bullet/pistol
+	fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
 	damage = 20
 
 /obj/item/projectile/bullet/pistol/ap
@@ -142,6 +144,7 @@
 	armor_penetration = -50
 
 /obj/item/projectile/bullet/pistol/strong //revolvers and matebas
+	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
 	damage = 60
 
 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
@@ -156,6 +159,7 @@
 
 /obj/item/projectile/bullet/shotgun
 	name = "slug"
+	fire_sound = 'sound/weapons/gunshot/shotgun.ogg'
 	damage = 50
 	armor_penetration = 15
 
@@ -171,6 +175,7 @@
 //Overall less damage than slugs in exchange for more damage at very close range and more embedding
 /obj/item/projectile/bullet/pellet/shotgun
 	name = "shrapnel"
+	fire_sound = 'sound/weapons/gunshot/shotgun.ogg'
 	damage = 13
 	pellets = 6
 	range_step = 1
@@ -180,6 +185,7 @@
 //EMP shotgun 'slug', it's basically a beanbag that pops a tiny emp when it hits. //Not currently used
 /obj/item/projectile/bullet/shotgun/ion
 	name = "ion slug"
+	fire_sound = 'sound/weapons/Laser.ogg'
 	damage = 15
 	embed_chance = 0
 	sharp = 0
@@ -194,10 +200,12 @@
 /* "Rifle" rounds */
 
 /obj/item/projectile/bullet/rifle
+	fire_sound = 'sound/weapons/gunshot/gunshot3.ogg'
 	armor_penetration = 15
 	penetrating = 1
 
 /obj/item/projectile/bullet/rifle/a762
+	fire_sound = 'sound/weapons/gunshot/gunshot2.ogg'
 	damage = 35
 
 /obj/item/projectile/bullet/rifle/a762/ap
@@ -232,6 +240,7 @@
 	SA_vulnerability = SA_ANIMAL
 
 /obj/item/projectile/bullet/rifle/a145
+	fire_sound = 'sound/weapons/gunshot/sniper.ogg'
 	damage = 80
 	stun = 3
 	weaken = 3
@@ -253,11 +262,12 @@
 
 /obj/item/projectile/bullet/burstbullet
 	name = "exploding bullet"
+	fire_sound = 'sound/effects/Explosion1.ogg'
 	damage = 20
 	embed_chance = 0
 	edge = 1
 
-/obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/burstbullet/on_hit(var/atom/target, var/blocked = 0)
 	if(isturf(target))
 		explosion(target, -1, 0, 2)
 	..()
@@ -309,6 +319,7 @@
 /obj/item/projectile/bullet/pistol/cap
 	name = "cap"
 	damage_type = HALLOSS
+	fire_sound = null
 	damage = 0
 	nodamage = 1
 	embed_chance = 0

code/modules/projectiles/projectile/energy.dm

@@ -10,6 +10,7 @@
 /obj/item/projectile/energy/flash
 	name = "chemical shell"
 	icon_state = "bullet"
+	fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
 	damage = 5
 	kill_count = 15 //if the shell hasn't hit anything after travelling this far it just explodes.
 	var/flash_range = 0
@@ -47,6 +48,7 @@
 
 //blinds people like the flash round, but can also be used for temporary illumination
 /obj/item/projectile/energy/flash/flare
+	fire_sound = 'sound/weapons/gunshot/shotgun.ogg'
 	damage = 10
 	flash_range = 1
 	brightness = 15
@@ -63,6 +65,7 @@
 /obj/item/projectile/energy/electrode
 	name = "electrode"
 	icon_state = "spark"
+	fire_sound = 'sound/weapons/Gunshot.ogg'
 	taser_effect = 1
 	agony = 40
 	light_range = 2
@@ -81,6 +84,7 @@
 /obj/item/projectile/energy/declone
 	name = "declone"
 	icon_state = "declone"
+	fire_sound = 'sound/weapons/pulse3.ogg'
 	nodamage = 1
 	damage_type = CLONE
 	irradiate = 40
@@ -106,7 +110,6 @@
 	agony = 40
 	stutter = 10
 
-
 /obj/item/projectile/energy/bolt/large
 	name = "largebolt"
 	damage = 20
@@ -138,6 +141,7 @@
 /obj/item/projectile/energy/phoron
 	name = "phoron bolt"
 	icon_state = "energy"
+	fire_sound = 'sound/effects/stealthoff.ogg'
 	damage = 20
 	damage_type = TOX
 	irradiate = 20
@@ -148,6 +152,7 @@
 /obj/item/projectile/energy/plasmastun
 	name = "plasma pulse"
 	icon_state = "plasma_stun"
+	fire_sound = 'sound/weapons/blaster.ogg'
 	armor_penetration = 10
 	kill_count = 4
 	damage = 5
@@ -187,6 +192,7 @@
 /obj/item/projectile/energy/blue_pellet
 	name = "suppressive pellet"
 	icon_state = "blue_pellet"
+	fire_sound = 'sound/weapons/Laser.ogg'
 	damage = 5
 	armor_penetration = 75
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE

code/modules/projectiles/projectile/magnetic.dm

@@ -2,6 +2,7 @@
 /obj/item/projectile/bullet/magnetic
 	name = "rod"
 	icon_state = "rod"
+	fire_sound = 'sound/weapons/railgun.ogg'
 	damage = 65
 	stun = 1
 	weaken = 1
@@ -17,6 +18,7 @@
 /obj/item/projectile/bullet/magnetic/flechette
 	name = "flechette"
 	icon_state = "flechette"
+	fire_sound = 'sound/weapons/rapidslice.ogg'
 	damage = 20
 	armor_penetration = 100
 

code/modules/projectiles/projectile/special.dm

@@ -1,6 +1,7 @@
 /obj/item/projectile/ion
 	name = "ion bolt"
 	icon_state = "ion"
+	fire_sound = 'sound/weapons/Laser.ogg'
 	damage = 0
 	damage_type = BURN
 	nodamage = 1
@@ -8,17 +9,26 @@
 	light_range = 2
 	light_power = 0.5
 	light_color = "#55AAFF"
-	//var/pulse_range = 1 vorestation removal
-
+	var/sev1_range = 0
+	var/sev2_range = 1
+	var/sev3_range = 1
+	var/sev4_range = 2
 
 /obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
-		empulse(target, sev1_range, sev2_range, sev3_range, sev4_range) // vorestation edit
+		empulse(target, sev1_range, sev2_range, sev3_range, sev4_range)
 		return 1
 
-/* vorestation removal - moved to vr file
 /obj/item/projectile/ion/small
-	pulse_range = 0
-*/
+	sev1_range = -1
+	sev2_range = 0
+	sev3_range = 0
+	sev4_range = 1
+
+/obj/item/projectile/ion/pistol
+	sev1_range = 0
+	sev2_range = 0
+	sev3_range = 0
+	sev4_range = 0
 
 /obj/item/projectile/bullet/gyro
 	name ="explosive bolt"
@@ -29,12 +39,13 @@
 	edge = 1
 
 /obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
-		explosion(target, -1, 0, 2)
-		return 1
+	explosion(target, -1, 0, 2)
+	..()
 
 /obj/item/projectile/temp
 	name = "freeze beam"
 	icon_state = "ice_2"
+	fire_sound = 'sound/weapons/pulse3.ogg'
 	damage = 0
 	damage_type = BURN
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
@@ -107,6 +118,7 @@
 /obj/item/projectile/energy/floramut
 	name = "alpha somatoray"
 	icon_state = "energy"
+	fire_sound = 'sound/effects/stealthoff.ogg'
 	damage = 0
 	damage_type = TOX
 	nodamage = 1
@@ -150,6 +162,7 @@
 /obj/item/projectile/energy/floramut/gene
 	name = "gamma somatoray"
 	icon_state = "energy2"
+	fire_sound = 'sound/effects/stealthoff.ogg'
 	damage = 0
 	damage_type = TOX
 	nodamage = 1
@@ -159,6 +172,7 @@
 /obj/item/projectile/energy/florayield
 	name = "beta somatoray"
 	icon_state = "energy2"
+	fire_sound = 'sound/effects/stealthoff.ogg'
 	damage = 0
 	damage_type = TOX
 	nodamage = 1

code/modules/projectiles/projectile/special_vr.dm

@@ -1,18 +0,0 @@
-/obj/item/projectile/ion
-	var/sev1_range = 0
-	var/sev2_range = 1
-	var/sev3_range = 1
-	var/sev4_range = 2
-
-/obj/item/projectile/ion/small
-	sev1_range = -1
-	sev2_range = 0
-	sev3_range = 0
-	sev4_range = 1
-
-/obj/item/projectile/ion/pistol
-	sev1_range = 0
-	sev2_range = 0
-	sev3_range = 0
-	sev4_range = 0
-