Merge branch 'master' into 91-files-changed-fml

code/modules/mob/dead/new_player/new_player.dm

@@ -392,6 +392,8 @@
 
 		character.update_parallax_teleport()
 
+	job.standard_assign_skills(character.mind)
+
 	SSticker.minds += character.mind
 
 	var/mob/living/carbon/human/humanc

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

@@ -38,7 +38,7 @@
 			adjustCloneLoss(damage_amount, forced = forced)
 		if(STAMINA)
 			if(BP)
-				if(damage > 0 ? BP.receive_damage(0, 0, damage_amount) : BP.heal_damage(0, 0, abs(damage_amount)))
+				if(damage > 0 ? BP.receive_damage(0, 0, damage_amount) : BP.heal_damage(0, 0, abs(damage_amount), FALSE, FALSE))
 					update_damage_overlays()
 			else
 				adjustStaminaLoss(damage_amount, forced = forced)

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -91,4 +91,9 @@
 	if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail_lizard"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines
 		C.dna.features["tail_lizard"] = "Smooth"
 		C.update_body()
+	if(C.dna.features["legs"] != "digitigrade")
+		C.dna.features["legs"] = "digitigrade"
+		for(var/obj/item/bodypart/leggie in C.bodyparts)
+			if(leggie.body_zone == BODY_ZONE_L_LEG || leggie.body_zone == BODY_ZONE_R_LEG)
+				leggie.update_limb(FALSE, C)
 	return ..()

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

@@ -19,6 +19,11 @@
 	path_image_color = "#993299"
 	weather_immunities = list("lava","ash")
 
+	var/clean_time = 50 //How long do we take to clean?
+	var/broom = FALSE //Do we have an speed buff from a broom?
+	var/adv_mop = FALSE //Do we have a cleaning buff from a better mop?
+
+
 	var/blood = 1
 	var/trash = 0
 	var/pests = 0
@@ -75,6 +80,26 @@
 				to_chat(user, "<span class='warning'>Please close the access panel before locking it.</span>")
 			else
 				to_chat(user, "<span class='notice'>\The [src] doesn't seem to respect your authority.</span>")
+
+	if(istype(W, /obj/item/mop/advanced))
+		if(bot_core.allowed(user) && open && adv_mop == TRUE)
+			to_chat(user, "<span class='notice'>You replace \the [src] old mop with a new better one!</span>")
+			adv_mop = TRUE
+			clean_time = 20 //2.5 the speed!
+			window_name = "Automatic Station Cleaner v2.1 BETA" //New!
+			qdel(W)
+		else
+			to_chat(user, "<span class='notice'>\the [src] already has this mop!</span>")
+
+	if(istype(W, /obj/item/twohanded/broom))
+		if(bot_core.allowed(user) && open && broom == TRUE)
+			to_chat(user, "<span class='notice'>You add to \the [src] a broom speeding it up!</span>")
+			broom = TRUE
+			base_speed = 1 //2x faster!
+			qdel(W)
+		else
+			to_chat(user, "<span class='notice'>\the [src] already has a broom!</span>")
+
 	else
 		return ..()
 
@@ -221,7 +246,7 @@
 		icon_state = "cleanbot-c"
 		visible_message("<span class='notice'>[src] begins to clean up [A].</span>")
 		mode = BOT_CLEANING
-		spawn(50)
+		spawn(clean_time)
 			if(mode == BOT_CLEANING)
 				if(A && isturf(A.loc))
 					var/atom/movable/AM = A