Merge remote-tracking branch 'upstream/master'

code/defines/obj.dm

@@ -144,7 +144,7 @@ var/global/list/PDA_Manifest = list()
 
 	for(var/mob/living/silicon/robot/robot in mob_list)
 		// No combat/syndicate cyborgs, no drones.
-		if(!robot.scrambledcodes && !(robot.module && robot.module.hide_on_manifest))
+		if(robot.scrambledcodes || (robot.module && robot.module.hide_on_manifest))
 			continue
 
 		bot[++bot.len] = list("name" = robot.real_name, "rank" = "[robot.modtype] [robot.braintype]", "active" = "Active")

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -353,17 +353,20 @@
 		sols[initial(sol.name)] = sol
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal.
 
-/datum/gear/head/surgical
+/datum/gear/head/surgery
 	display_name = "surgical cap selection"
+	description = "Choose from a number of rings of different caps."
 	path = /obj/item/clothing/head/surgery
 
-/datum/gear/head/surgical/New()
+/datum/gear/head/surgery/New()
 	..()
-	var/list/caps = list()
-	for(var/surgery in typesof(/obj/item/clothing/head/surgery))
-		var/obj/item/clothing/head/surgery/cap_type = caps
-		caps[initial(cap_type.name)] = cap_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(caps))
+	var/cap_type = list()
+	cap_type["Purple cap"] = /obj/item/clothing/head/surgery/purple
+	cap_type["Blue cap"] = /obj/item/clothing/head/surgery/blue
+	cap_type["Green cap"] = /obj/item/clothing/head/surgery/green
+	cap_type["Black cap"] = /obj/item/clothing/head/surgery/black
+	cap_type["Navy cap"] = /obj/item/clothing/head/surgery/navyblue
+	gear_tweaks += new/datum/gear_tweak/path(cap_type)
 
 /datum/gear/head/circuitry
 	display_name = "headwear, circuitry (empty)"

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -10,6 +10,7 @@
 	path = /obj/item/clothing/under/blazer/skirt
 
 /datum/gear/uniform/cheongsam
+	description = "Various color variations of an old earth dress style. They are pretty close fitting around the waist."
 	display_name = "cheongsam selection"
 
 /datum/gear/uniform/cheongsam/New()
@@ -21,6 +22,7 @@
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cheongasms))
 
 /datum/gear/uniform/croptop
+	description = "Light shirts which shows the midsection of the wearer."
 	display_name = "croptop selection"
 
 /datum/gear/uniform/croptop/New()

code/modules/clothing/under/accessories/accessory.dm

@@ -155,21 +155,7 @@
 	return 1
 
 /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
-	if(isliving(user))
-		//Vorestation edit start
-		var/message_holder	//Holds pervy message
-		var/message_holder2	//Hods the nutrition related message.
-		var/beat_size = ""	//Small prey = quiet
-		for(var/belly in M.vore_organs) //Pervy edit.
-			var/obj/belly/B = belly
-			for(var/mob/living/carbon/human/H in B)
-				if(H.size_multiplier < 0.5)
-					beat_size = pick("quiet ", "hushed " ,"low " ,"hushed ")
-				message_holder = pick("You can hear disparate heartbeats as well.", "You can hear a different [beat_size]heartbeat too.", "It sounds like there is more than one heartbeat." ,"You can pick up a [beat_size]heatbeat along with everything else.")
-		if(M.nutrition > 900)	//dead
-			message_holder2 = pick("Your listening is troubled by the occasional deep groan of their body.", "There is some moderate bubbling in the background.", "They seem to have a healthy metabolism as well.")
-		//Vorestation edit end
-
+	if(ishuman(M) && isliving(user))
 		if(user.a_intent == I_HELP)
 			var/body_part = parse_zone(user.zone_sel.selecting)
 			if(body_part)
@@ -196,7 +182,7 @@
 								if(heart.is_bruised() || M.getOxyLoss() > 50)
 									sound = "[pick("odd noises in","weak")] heartbeat"
 								else
-									sound = "a healthy heartbeat" //Vorestation edit
+									sound = "healthy heartbeat"
 
 							var/obj/item/organ/internal/heart/L = M.internal_organs_by_name[O_LUNGS]
 							if(!L || M.losebreath)
@@ -213,9 +199,8 @@
 								sound_strength = "hear a weak"
 								sound = "pulse"
 
-				user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder][message_holder2]") //Vorestation edit. ([message holder] & [message_holder2])
+				user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound].")
 				return
-
 	return ..(M,user)
 
 //Medals

code/modules/clothing/under/accessories/clothing.dm

@@ -257,31 +257,38 @@
 /obj/item/clothing/accessory/wcoat/red
 	name = "red waistcoat"
 	icon_state = "red_waistcoat"
+	item_state = "red_waistcoat"
 
 /obj/item/clothing/accessory/wcoat/grey
 	name = "grey waistcoat"
 	icon_state = "grey_waistcoat"
+	item_state = "grey_waistcoat"
 
 /obj/item/clothing/accessory/wcoat/brown
 	name = "brown waistcoat"
 	icon_state = "brown_waistcoat"
+	item_state = "brown_waistcoat"
 
 /obj/item/clothing/accessory/wcoat/gentleman
 	name = "elegant waistcoat"
 	icon_state = "elegant_waistcoat"
+	item_state = "elegant_waistcoat"
 
 /obj/item/clothing/accessory/wcoat/swvest
 	name = "black sweatervest"
 	desc = "A sleeveless sweater. Wear this if you don't want your arms to be warm, or if you're a nerd."
 	icon_state = "sweatervest"
+	item_state = "sweatervest"
 
 /obj/item/clothing/accessory/wcoat/swvest/blue
 	name = "blue sweatervest"
 	icon_state = "sweatervest_blue"
+	item_state = "sweatervest_blue"
 
 /obj/item/clothing/accessory/wcoat/swvest/red
 	name = "red sweatervest"
 	icon_state = "sweatervest_red"
+	item_state = "sweatervest_red"
 
 //Sweaters.
 

code/modules/food/kitchen/cooking_machines/_cooker.dm

@@ -130,6 +130,7 @@
 	if(istype(cooking_obj, /obj/item/weapon/holder))
 		for(var/mob/living/M in cooking_obj.contents)
 			M.death()
+			qdel(M)
 
 	// Cook the food.
 	var/cook_path

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -34,7 +34,7 @@
 		new /datum/data/mining_equipment("Fulton Pack",					/obj/item/extraction_pack,											1200),
 		new /datum/data/mining_equipment("Silver Pickaxe",				/obj/item/weapon/pickaxe/silver,									1200),
 		//new /datum/data/mining_equipment("Mining Conscription Kit",	/obj/item/storage/backpack/duffelbag/mining_conscript,				1000),
-		new /datum/data/mining_equipment("Space Cash",					/obj/item/weapon/spacecash/c1000,									2000),
+		new /datum/data/mining_equipment("Space Cash",					/obj/item/weapon/spacecash/c100,									1000),
 		new /datum/data/mining_equipment("Industrial Hardsuit - Control Module",	/obj/item/weapon/rig/industrial,						2000),
 		new /datum/data/mining_equipment("Industrial Hardsuit - Plasma Cutter",		/obj/item/rig_module/device/plasmacutter,				800),
 		new /datum/data/mining_equipment("Industrial Hardsuit - Drill",				/obj/item/rig_module/device/drill,						2000),

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

@@ -4,6 +4,7 @@
 	tt_desc = "Homo felinus"
 	icon = 'icons/mob/vore.dmi'
 	icon_state = "catgirl"
+	intelligence_level = SA_HUMANOID
 
 	speed = 5
 

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

@@ -7,6 +7,7 @@
 	icon_dead = "badboi-dead"
 	icon_rest = "badboi_rest"
 	faction = "corrupt"
+	intelligence_level = SA_ROBOTIC
 
 	maxHealth = 200
 	health = 200

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

@@ -6,6 +6,7 @@
 	icon_living = "map_example"
 	faction = "shadekin"
 	ui_icons = 'icons/mob/shadekin_hud.dmi'
+	intelligence_level = SA_HUMANOID
 
 	maxHealth = 200
 	health = 200

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

@@ -6,6 +6,7 @@
 	icon_state = "wolfgirl"
 	icon_living = "wolfgirl"
 	icon_dead = "wolfgirl-dead"
+	intelligence_level = SA_HUMANOID
 
 	faction = "wolfgirl"
 	maxHealth = 30