Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

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

@@ -81,7 +81,7 @@
 /mob/living/carbon/monkey/proc/pickup_and_wear(obj/item/I)
 	if(QDELETED(I) || I.loc != src)
 		return
-	equip_to_appropriate_slot(I)
+	equip_to_appropriate_slot(I, TRUE)
 
 /mob/living/carbon/monkey/resist_restraints()
 	var/obj/item/I = null

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

@@ -1,4 +1,9 @@
-/mob/living/carbon/monkey/can_equip(obj/item/I, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
+/mob/living/carbon/monkey/can_equip(obj/item/I, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE, clothing_check = FALSE, list/return_warning)
+	if(clothing_check && (slot in check_obscured_slots()))
+		if(return_warning)
+			return_warning[1] = "<span class='warning'>You are unable to equip that with your current garments in the way!</span>"
+		return FALSE
+
 	switch(slot)
 		if(SLOT_HANDS)
 			if(get_empty_held_indexes())

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

@@ -3,30 +3,26 @@
 /mob/living/carbon/monkey
 
 
-/mob/living/carbon/monkey/Life()
-	set invisibility = 0
-
-	if (notransform)
+/mob/living/carbon/monkey/BiologicalLife(seconds, times_fired)
+	if(!(. = ..()))
 		return
-
-	if(..())
-
-		if(!client)
-			if(stat == CONSCIOUS)
-				if(on_fire || buckled || restrained() || (!CHECK_MOBILITY(src, MOBILITY_STAND) && CHECK_MOBILITY(src, MOBILITY_MOVE))) //CIT CHANGE - makes it so monkeys attempt to resist if they're resting)
-					if(!resisting && prob(MONKEY_RESIST_PROB))
-						resisting = TRUE
-						walk_to(src,0)
-						resist()
-				else if(resisting)
-					resisting = FALSE
-				else if((mode == MONKEY_IDLE && !pickupTarget && !prob(MONKEY_SHENANIGAN_PROB)) || !handle_combat())
-					if(prob(25) && CHECK_MOBILITY(src, MOBILITY_MOVE) && isturf(loc) && !pulledby)
-						step(src, pick(GLOB.cardinals))
-					else if(prob(1))
-						emote(pick("scratch","jump","roll","tail"))
-			else
+	if(client)
+		return
+	if(stat == CONSCIOUS)
+		if(on_fire || buckled || restrained() || (!CHECK_MOBILITY(src, MOBILITY_STAND) && CHECK_MOBILITY(src, MOBILITY_MOVE))) //CIT CHANGE - makes it so monkeys attempt to resist if they're resting)
+			if(!resisting && prob(MONKEY_RESIST_PROB))
+				resisting = TRUE
 				walk_to(src,0)
+				resist()
+		else if(resisting)
+			resisting = FALSE
+		else if((mode == MONKEY_IDLE && !pickupTarget && !prob(MONKEY_SHENANIGAN_PROB)) || !handle_combat())
+			if(prob(25) && CHECK_MOBILITY(src, MOBILITY_MOVE) && isturf(loc) && !pulledby)
+				step(src, pick(GLOB.cardinals))
+			else if(prob(1))
+				emote(pick("scratch","jump","roll","tail"))
+	else
+		walk_to(src,0)
 
 /mob/living/carbon/monkey/handle_mutations_and_radiation()
 	if(radiation)

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

@@ -45,6 +45,7 @@
 /mob/living/carbon/monkey/ComponentInitialize()
 	. = ..()
 	AddElement(/datum/element/mob_holder, worn_state = "monkey", inv_slots = ITEM_SLOT_HEAD)
+	AddComponent(/datum/component/footstep, FOOTSTEP_MOB_BAREFOOT, 1, 2)
 
 
 /mob/living/carbon/monkey/Destroy()

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

@@ -141,7 +141,7 @@
 /mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M)
 	. = ..()
 	if(.)
-		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+		var/damage = .
 		var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
 		if(!dam_zone) //Dismemberment successful
 			return TRUE

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

@@ -31,11 +31,12 @@
 	if(relic_mask)
 		equip_to_slot_or_del(new relic_mask, SLOT_WEAR_MASK)
 
-/mob/living/carbon/monkey/punpun/Life()
+/mob/living/carbon/monkey/punpun/BiologicalLife(seconds, times_fired)
+	if(!(. = ..()))
+		return
 	if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
 		Write_Memory(FALSE, FALSE)
 		memory_saved = TRUE
-	..()
 
 /mob/living/carbon/monkey/punpun/death(gibbed)
 	if(!memory_saved)