Merge pull request #9838 from mwerezak/stunrevolver

Assorted small dev-freeze tweaks, stunrevolver fix

code/game/turfs/simulated/wall_icon.dm

@@ -129,6 +129,6 @@
 	return
 
 /turf/simulated/wall/proc/can_join_with(var/turf/simulated/wall/W)
-	if(material && W.material && material.name == W.material.name)
+	if(material && W.material && material.icon_base == W.material.icon_base)
 		return 1
 	return 0

code/modules/mob/living/carbon/human/update_icons.dm

@@ -926,7 +926,7 @@ var/global/list/damage_icon_parts = list()
 	
 	tail_overlay = set_tail_state(t_state)
 	if(tail_overlay)
-		spawn(15)
+		spawn(20)
 			//check that the animation hasn't changed in the meantime
 			if(overlays_standing[TAIL_LAYER] == tail_overlay && tail_overlay.icon_state == t_state)
 				animate_tail_stop()

code/modules/mob/living/carbon/resist.dm

@@ -3,14 +3,14 @@
 
 	//drop && roll
 	if(on_fire)
-		fire_stacks -= 2
+		fire_stacks -= 1.2
-		Weaken(5)
+		Weaken(3)
-		spin(52,2)
+		spin(32,2)
 		visible_message(
 			"<span class='danger'>[src] rolls on the floor, trying to put themselves out!</span>",
 			"<span class='notice'>You stop, drop, and roll!</span>"
 			)
-		sleep(50)
+		sleep(30)
 		if(fire_stacks <= 0)
 			visible_message(
 				"<span class='danger'>[src] has successfully extinguished themselves!</span>",

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -108,7 +108,7 @@
 	icon_state = "syndicateranged"
 	icon_living = "syndicateranged"
 	casingtype = /obj/item/ammo_casing/a12mm
-	projectilesound = 'sound/weapons/Gunshot_smg.ogg'
+	projectilesound = 'sound/weapons/Gunshot_light.ogg'
 	projectiletype = /obj/item/projectile/bullet/pistol/medium
 
 	weapon1 = /obj/item/weapon/gun/projectile/automatic/c20r

code/modules/projectiles/guns/energy/stun.dm

@@ -25,7 +25,7 @@
 	item_state = "stunrevolver"
 	fire_sound = 'sound/weapons/Gunshot.ogg'
 	origin_tech = "combat=3;materials=3;powerstorage=2"
-	projectile_type = /obj/item/projectile/energy/electrode/stunshot
+	projectile_type = /obj/item/projectile/energy/electrode
 	max_shots = 8
 
 

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

@@ -38,7 +38,7 @@
 	caliber = "12mm"
 	origin_tech = "combat=5;materials=2;syndicate=8"
 	slot_flags = SLOT_BELT|SLOT_BACK
-	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/a12mm
 	auto_eject = 1
@@ -86,7 +86,7 @@
 	origin_tech = "combat=5;materials=2"
 	slot_flags = SLOT_BELT
 	ammo_type = "/obj/item/ammo_casing/c9mmr"
-	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/mc9mmt/rubber
 
@@ -182,7 +182,7 @@
 	origin_tech = "combat=6;materials=1;syndicate=2"
 	slot_flags = SLOT_BACK
 	ammo_type = "/obj/item/ammo_casing/a762"
-	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/a762
 	

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

@@ -5,6 +5,7 @@
 	icon_state = "colt"
 	caliber = ".45"
 	origin_tech = "combat=2;materials=2"
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
 
 /obj/item/weapon/gun/projectile/colt/detective
@@ -36,6 +37,7 @@
 	magazine_type = /obj/item/ammo_magazine/c45m/rubber
 	caliber = ".45"
 	origin_tech = "combat=2;materials=2"
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
 
 /obj/item/weapon/gun/projectile/sec/flash
@@ -112,6 +114,7 @@
 	caliber = "9mm"
 	silenced = 0
 	origin_tech = "combat=2;materials=2;syndicate=2"
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/mc9mm
 

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

@@ -22,6 +22,7 @@
 	max_shells = 6
 	caliber = "38"
 	origin_tech = "combat=2;materials=2"
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	ammo_type = /obj/item/ammo_casing/c38
 
 /obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun()

code/modules/projectiles/projectile/energy.dm

@@ -44,11 +44,6 @@
 	name = "electrode"
 	icon_state = "spark"
 	nodamage = 1
-	/*
-	stun = 10
-	weaken = 10
-	stutter = 10
-	*/
 	taser_effect = 1
 	agony = 40
 	damage_type = HALLOSS