Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm

code/modules/clothing/suits/storage.dm

@@ -72,12 +72,12 @@
 
 		if(icon_state == icon_badge)
 			icon_state = icon_nobadge
-			usr << "You unclip the badge from the vest."
+			usr << "You conceal \the [src]'s badge."
 		else if(icon_state == icon_nobadge)
 			icon_state = icon_badge
-			usr << "You clip the badge to the vest."
+			usr << "You reveal \the [src]'s badge."
 		else
-			usr << "You can't find a badge for [src]."
+			usr << "\The [src] does not have a vest badge."
 			return
 		update_clothing_icon()
 

code/modules/economy/Accounts_DB.dm

@@ -6,6 +6,7 @@
 	icon_state = "aiupload"
 	density = 1
 	req_one_access = list(access_hop, access_captain, access_cent_captain)
+	anchored = 1
 	var/receipt_num
 	var/machine_id = ""
 	var/obj/item/weapon/card/id/held_card

code/modules/materials/materials.dm

@@ -255,6 +255,8 @@ var/list/name_to_material
 	stack_origin_tech = list(TECH_MATERIAL = 2, TECH_PHORON = 2)
 	door_icon_base = "stone"
 
+/*
+// Commenting this out while fires are so spectacularly lethal, as I can't seem to get this balanced appropriately.
 /material/phoron/combustion_effect(var/turf/T, var/temperature, var/effect_multiplier)
 	if(isnull(ignition_point))
 		return 0
@@ -268,6 +270,7 @@ var/list/name_to_material
 		spawn (0)
 			target_tile.hotspot_expose(temperature, 400)
 	return round(totalPhoron/100)
+*/
 
 /material/stone
 	name = "sandstone"

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

@@ -15,6 +15,7 @@
 	var/max_grown = 200
 	var/time_of_birth
 	var/language
+	var/death_msg = "lets out a waning guttural screech, green blood bubbling from its maw."
 
 /mob/living/carbon/alien/New()
 

code/modules/mob/living/carbon/alien/death.dm

@@ -1,4 +1,4 @@
 /mob/living/carbon/alien/death(gibbed)
 	if(!gibbed && dead_icon)
 		icon_state = dead_icon
-	return ..(gibbed,"lets out a waning guttural screech, green blood bubbling from its maw.")
+	return ..(gibbed,death_msg)

code/modules/mob/living/carbon/alien/diona/diona.dm

@@ -5,7 +5,7 @@
 	speak_emote = list("chirrups")
 	icon_state = "nymph"
 	language = "Rootspeak"
-
+	death_msg = "expires with a pitiful chirrup..."
 	universal_understand = 1
 	universal_speak = 0      // Dionaea do not need to speak to people other than other dionaea.
 	holder_type = /obj/item/weapon/holder/diona

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

@@ -948,6 +948,9 @@
 		if( (getOxyLoss() > 50) || (config.health_threshold_crit > health) )
 			Paralyse(3)
 
+		//UNCONSCIOUS. NO-ONE IS HOME
+		if((getOxyLoss() > 50) || (health <= config.health_threshold_crit))
+			Paralyse(3)
 		if(hallucination)
 			if(hallucination >= 20)
 				if(prob(3))

code/modules/mob/living/carbon/human/species/outsider/shadow.dm

@@ -18,7 +18,7 @@
 	remains_type = /obj/effect/decal/cleanable/ash
 	death_message = "dissolves into ash..."
 
-	flags = IS_RESTRICTED | NO_BLOOD | NO_POISON | NO_SCAN | NO_SLIP | NO_POISON
+	flags = IS_RESTRICTED | NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON
 
 /datum/species/shadow/handle_death(var/mob/living/carbon/human/H)
 	spawn(1)

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

@@ -929,7 +929,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
-		Weaken(5)
-		spin(52,2)
+		fire_stacks -= 1.2
+		Weaken(3)
+		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>",
@@ -19,13 +19,13 @@
 			ExtinguishMob()
 		return
 
+	..()
+	
 	if(handcuffed)
 		spawn() escape_handcuffs()
 	else if(legcuffed)
 		spawn() escape_legcuffs()
 
-	..()
-
 /mob/living/carbon/proc/escape_handcuffs()
 	if(!(last_special <= world.time)) return
 

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 = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 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 = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 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 = list(TECH_COMBAT = 5, TECH_MATERIAL = 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 = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 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 = list(TECH_COMBAT = 2, TECH_MATERIAL = 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 = list(TECH_COMBAT = 2, TECH_MATERIAL = 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 = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 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 = list(TECH_COMBAT = 2, TECH_MATERIAL = 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