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

code/modules/client/preference_setup/general/03_body.dm

@@ -135,7 +135,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				R = all_robolimbs[pref.rlimb_data[name]]
 			else
 				R = basic_robolimb
-			. += "\t[R.company] [organ_name] prothesis"
+			. += "\t[R.company] [organ_name] prosthesis"
 		else if(status == "amputated")
 			++ind
 			if(ind > 1)
@@ -374,7 +374,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		var/third_limb = null  // if you try to unchange the hand, the arm should also change
 
 		// Do not let them amputate their entire body, ty.
-		var/list/choice_options = list("Normal","Amputated","Prothesis")
+		var/list/choice_options = list("Normal","Amputated","Prosthesis")
 		switch(organ_tag)
 			if("Left Leg")
 				limb =        BP_L_LEG
@@ -402,11 +402,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				third_limb =  BP_R_ARM
 			if("Head")
 				limb =        BP_HEAD
-				choice_options = list("Prothesis")
+				choice_options = list("Prosthesis")
 			if("Full Body")
 				limb =        BP_TORSO
 				third_limb =  BP_GROIN
-				choice_options = list("Normal","Prothesis")
+				choice_options = list("Normal","Prosthesis")
 
 		var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in choice_options
 		if(!new_state && !CanUseTopic(user)) return TOPIC_NOACTION
@@ -433,7 +433,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 					pref.organ_data[second_limb] = "amputated"
 					pref.rlimb_data[second_limb] = null
 
-			if("Prothesis")
+			if("Prosthesis")
 				var/tmp_species = pref.species ? pref.species : "Human"
 				var/list/usable_manufacturers = list()
 				for(var/company in chargen_robolimbs)

code/modules/hydroponics/beekeeping/beehive.dm

@@ -89,7 +89,7 @@
 			bee_count = 20
 			B.empty()
 		else
-			user.visible_message("<span class='notice'>[user] puts bees and larvae from \the [src] into \the [I].</span>", "<span class='notice'>You put puts bees and larvae from \the [src] into \the [I].</span>")
+			user.visible_message("<span class='notice'>[user] puts bees and larvae from \the [src] into \the [I].</span>", "<span class='notice'>You put bees and larvae from \the [src] into \the [I].</span>")
 			bee_count /= 2
 			B.fill()
 		update_icon()

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

@@ -155,9 +155,6 @@
 	return ..()
 
 /mob/living/carbon/escape_buckle()
-	if(!canClick())
-		return
-
 	setClickCooldown(100)
 	if(!buckled) return
 

code/modules/mob/living/living.dm

@@ -580,7 +580,7 @@ default behaviour is:
 	set name = "Resist"
 	set category = "IC"
 
-	if(!(stat || next_move > world.time))
+	if(!stat && canClick())
 		setClickCooldown(20)
 		resist_grab()
 		if(!weakened)

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

@@ -54,6 +54,14 @@
 		else if(prob(5))
 			audible_emote("snuffles.")
 
+/mob/living/simple_animal/mouse/lay_down() //Simply turns sprite into sleeping and back upon using "Rest".
+	set name = "Rest"
+	set category = "IC"
+
+	resting = !resting
+	icon_state = resting ? "mouse_[body_color]_sleep" : "mouse_[body_color]"
+	src << "<span class='notice'>You are now [resting ? "resting" : "getting up"]</span>"
+
 /mob/living/simple_animal/mouse/New()
 	..()