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

code/game/machinery/doors/firedoor.dm

@@ -198,7 +198,7 @@
 					nextstate = CLOSED
 
 
-	latetoggle()
+	proc/latetoggle()
 		if(operating || stat & NOPOWER || !nextstate)
 			return
 		switch(nextstate)
@@ -285,4 +285,4 @@
 
 /obj/machinery/door/firedoor/multi_tile
 	icon = 'icons/obj/doors/DoorHazard2x1.dmi'
-	width = 2
+	width = 2

code/game/objects/items/weapons/storage/fancy.dm

@@ -27,6 +27,7 @@
 /obj/item/weapon/storage/fancy/examine()
 	set src in oview(1)
 
+	..()
 	if(contents.len <= 0)
 		usr << "There are no [src.icon_type]s left in the box."
 	else if(contents.len == 1)

code/modules/clothing/clothing.dm

@@ -313,9 +313,6 @@ BLIND     // can't see anything
 	if(usr.stat) return
 
 	if(hastie)
-		usr.put_in_hands(hastie)
-		hastie = null
-
 		if (istype(hastie,/obj/item/clothing/tie/holster))
 			verbs -= /obj/item/clothing/under/proc/holster
 
@@ -323,7 +320,10 @@ BLIND     // can't see anything
 			verbs -= /obj/item/clothing/under/proc/storage
 			var/obj/item/clothing/tie/storage/W = hastie
 			if (W.hold)
-				W.hold.loc = hastie
+				W.hold.close(usr)
+
+		usr.put_in_hands(hastie)
+		hastie = null
 
 		if(istype(loc, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = loc

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

@@ -93,7 +93,7 @@
 	set desc = "Take a blood sample from a suitable donor."
 
 	var/list/choices = list()
-	for(var/mob/living/C in view(1,src))
+	for(var/mob/living/carbon/C in view(1,src))
 		if(C.real_name != real_name)
 			choices += C
 

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

@@ -39,7 +39,7 @@
 	reagents = R
 	R.my_atom = src
 
-	if(name == "monkey" || name == "farwa" || name == "stok" || name == "neara" || name == "diona nymph") //Hideous but necessary to stop Pun-Pun becoming generic.
+	if(name == initial(name)) //To stop Pun-Pun becoming generic.
 		name = "[name] ([rand(1, 1000)])"
 		real_name = name
 

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

@@ -39,6 +39,7 @@
 
 /datum/species/human
 	name = "Human"
+	language = "Sol Common"
 	primitive = /mob/living/carbon/monkey
 
 	flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR

code/modules/paperwork/paper.dm

@@ -16,7 +16,7 @@
 	pressure_resistance = 1
 	slot_flags = SLOT_HEAD
 	body_parts_covered = HEAD
-	attack_verb = list("")
+	attack_verb = list("bapped")
 
 	var/info		//What's actually written on the paper.
 	var/info_links	//A different version of the paper which includes html links at fields and EOF

code/modules/surgery/braincore.dm

@@ -122,8 +122,8 @@
 		return ..() && target.brain_op_stage == 2
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		user.visible_message("[user] starts taking out bone chips and out of [target]'s brain with \the [tool].", \
-		"You start taking out bone chips and out of [target]'s brain with \the [tool].")
+		user.visible_message("[user] starts taking out bone chips out of [target]'s brain with \the [tool].", \
+		"You start taking out bone chips out of [target]'s brain with \the [tool].")
 		..()
 
 	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)