Merge branch 'master' of https://github.com/ZomgPonies/Paradise

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

@@ -1684,6 +1684,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 		if(decaytime > 18000 && decaytime <= 27000)//45 minutes for decaylevel4 -- skeleton
 			decaylevel = 3
+			
 		if(decaytime > 27000)
 			decaylevel = 4
 			makeSkeleton()
@@ -1693,9 +1694,11 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		for(var/mob/living/carbon/human/H in range(decaylevel, src))
 			if(prob(5))
 				if(airborne_can_reach(get_turf(src), get_turf(H)))
-					if(istype(loc,/obj/item/bodybag)) return
-					if(H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/surgical)) return
-					if(H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/breath/medical)) return
+					if(istype(loc,/obj/item/bodybag)) 
+						return
+					var/obj/item/clothing/mask/M = H.wear_mask
+					if(M && (M.flags & MASKCOVERSMOUTH))
+						return
 					H << "<spawn class='warning'>You smell something foul..."
 					H.vomit()
 

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

@@ -20,7 +20,7 @@
 	if (src.stat == 2)
 		return src.say_dead(message)
 
-	if (src.stat && said_last_words) // TIME TO WHISPER WHILE IN CRIT
+	if (src.stat)
 		return
 
 	var/alt_name = ""
@@ -31,9 +31,6 @@
 	if (src.sdisabilities & MUTE)
 		return
 
-	if(M_WHISPER in src.mutations)
-		src.say(message)
-
 	if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
 		return
 
@@ -52,12 +49,12 @@
 				temp_message[H] = ninjaspeak(temp_message[H])
 				pick_list -= H
 			message = list2text(temp_message, " ")
-			message = replacetext(message, "o", "¤")
-			message = replacetext(message, "p", "þ")
-			message = replacetext(message, "l", "£")
-			message = replacetext(message, "s", "§")
-			message = replacetext(message, "u", "µ")
-			message = replacetext(message, "b", "ß")
+			message = replacetext(message, "o", "?")
+			message = replacetext(message, "p", "?")
+			message = replacetext(message, "l", "?")
+			message = replacetext(message, "s", "?")
+			message = replacetext(message, "u", "?")
+			message = replacetext(message, "b", "?")
 
 	if (src.stuttering)
 		message = stutter(message)
@@ -87,11 +84,6 @@
 
 	var/list/heard_a = list() // understood us
 	var/list/heard_b = list() // didn't understand us
-	var/and_passes_on=""
-	if(!said_last_words && src.isInCrit())
-		and_passes_on=" - and passes on"
-	said_last_words=src.stat
-
 
 	for (var/mob/M in listening)
 		if (M.say_understands(src))
@@ -103,9 +95,9 @@
 
 	for (var/mob/M in watching)
 		if (M.say_understands(src))
-			rendered = "<span class='game say'><span class='name'>[src.name]</span> whispers something[and_passes_on].</span>"
+			rendered = "<span class='game say'><span class='name'>[src.name]</span> whispers something.</span>"
 		else
-			rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers something[and_passes_on].</span>"
+			rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers something.</span>"
 		M.show_message(rendered, 2)
 
 	if (length(heard_a))
@@ -114,7 +106,8 @@
 		if (italics)
 			message_a = "<i>[message_a]</i>"
 		//This appears copied from carbon/living say.dm so the istype check for mob is probably not needed. Appending for src is also not needed as the game will check that automatically.
-		rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] whispers, <span class='message'>\"[message_a]\"</span>[and_passes_on]</span>"
+		rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] whispers, <span class='message'>\"[message_a]\"</span></span>"
+
 		for (var/mob/M in heard_a)
 			M.show_message(rendered, 2)
 
@@ -126,7 +119,7 @@
 		if (italics)
 			message_b = "<i>[message_b]</i>"
 
-		rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers, <span class='message'>\"[message_b]\"</span>[and_passes_on]</span>"
+		rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers, <span class='message'>\"[message_b]\"</span></span>"
 
 		for (var/mob/M in heard_b)
 			M.show_message(rendered, 2)
@@ -135,23 +128,18 @@
 		if (M.say_understands(src))
 			var/message_c
 			message_c = stars(message)
-			rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] whispers, <span class='message'>\"[message_c]\"</span>[and_passes_on]</span>"
+			rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] whispers, <span class='message'>\"[message_c]\"</span></span>"
 			M.show_message(rendered, 2)
 		else
-			rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers something[and_passes_on].</span>"
+			rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers something.</span>"
 			M.show_message(rendered, 2)
 
 	if (italics)
 		message = "<i>[message]</i>"
-	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] whispers, <span class='message'>\"[message]\"</span>[and_passes_on]</span>"
+	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] whispers, <span class='message'>\"[message]\"</span></span>"
 
 	for (var/mob/M in dead_mob_list)
 		if (!(M.client))
 			continue
 		if (M.stat > 1 && !(M in heard_a) && (M.client.prefs.toggles & CHAT_GHOSTEARS))
 			M.show_message(rendered, 2)
-	if(said_last_words)
-		src.stat = 2
-		src.death(0)
-		src.regenerate_icons()
-

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -84,5 +84,6 @@
 	icon_living = "Syndicat"
 	icon_dead = "Syndicat_dead"
 	gender = FEMALE
+	flags = IS_SYNTHETIC|NO_BREATHE
 	var/turns_since_scan = 0
 	var/mob/living/simple_animal/mouse/movement_target

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

@@ -153,6 +153,6 @@
 	for(counter=0, counter<=powerlevel, counter++)
 		var/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
 		S.reagents.add_reagent("mushroomhallucinogen", powerlevel)
-		S.reagents.add_reagent("alchdranine", powerlevel)
+		S.reagents.add_reagent("doctorsdelight", powerlevel)
 		S.reagents.add_reagent("synaptizine", powerlevel)
 	del(src)

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

@@ -161,7 +161,7 @@
 
 			if( abs(Environment.temperature - bodytemperature) > 40 )
 				bodytemperature += ((Environment.temperature - bodytemperature) / 5)
-
+			
 			if(min_oxy)
 				if(Environment.oxygen < min_oxy)
 					atmos_suitable = 0
@@ -186,7 +186,9 @@
 			if(max_co2)
 				if(Environment.carbon_dioxide > max_co2)
 					atmos_suitable = 0
-
+			if(flags & NO_BREATHE || flags & IS_SYNTHETIC)
+				atmos_suitable = 1
+				
 	//Atmos effect
 	if(bodytemperature < minbodytemp)
 		adjustBruteLoss(cold_damage_per_tick)

code/modules/mob/mob.dm

@@ -196,6 +196,8 @@ var/list/slot_equipment_priority = list( \
 	if(!istype(W)) return 0
 
 	for(var/slot in slot_equipment_priority)
+		if(istype(W,/obj/item/weapon/storage/) && slot == slot_head) // Storage items should be put on the belt before the head
+			continue
 		if(equip_to_slot_if_possible(W, slot, 0, 1, 1)) //del_on_fail = 0; disable_warning = 0; redraw_mob = 1
 			return 1
 

code/modules/mob/new_player/preferences_setup.dm

@@ -529,6 +529,27 @@ datum/preferences
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
 						if(4)
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(PSYCHIATRIST)
+					clothes_s = new /icon(uniform_dmi, "psych_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(PARAMEDIC)
+					clothes_s = new /icon(uniform_dmi, "paramedic_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigoff"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "bluesoft"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
 				if(ROBOTICIST)
 					clothes_s = new /icon(uniform_dmi, "robotics_s")
 					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
@@ -676,7 +697,98 @@ datum/preferences
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
 					else if(backbag == 3 || backbag == 4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
+		else if(job_karma_high)
+			switch(job_karma_high)
+				if(MECHANIC)
+					clothes_s = new /icon(uniform_dmi, "mechanic_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CUSTOMS)
+					clothes_s = new /icon(uniform_dmi, "milohachert_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "customshelm"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(PILOT)
+					clothes_s = new /icon(uniform_dmi, "secred_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(BRIGDOC)
+					clothes_s = new /icon(uniform_dmi, "medical_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(NANO)
+					clothes_s = new /icon(uniform_dmi, "officer_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(NANOREC)
+					clothes_s = new /icon(uniform_dmi, "officer_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(BLUESHIELD)
+					clothes_s = new /icon(uniform_dmi, "officer_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "deus_blueshield"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(JUDGE)
+					clothes_s = new /icon(uniform_dmi, "really_black_suit_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "mercy_hood"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+							
 		if(disabilities & NEARSIGHTED)
 			preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)