Colorable Chairs, Stools, and other phoney baloney (#12797)

code/modules/mob/abstract/new_player/new_player.dm

@@ -274,7 +274,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
 
 	character.lastarea = get_area(loc)
 	// Moving wheelchair if they have one
-	if(character.buckled_to && istype(character.buckled_to, /obj/structure/bed/chair/wheelchair))
+	if(character.buckled_to && istype(character.buckled_to, /obj/structure/bed/stool/chair/wheelchair))
 		character.buckled_to.forceMove(character.loc)
 		character.buckled_to.set_dir(character.dir)
 

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

@@ -355,7 +355,7 @@
 /mob/living/carbon/can_use_hands()
 	if(handcuffed)
 		return 0
-	if(buckled_to && ! istype(buckled_to, /obj/structure/bed/chair)) // buckling does not restrict hands
+	if(buckled_to && ! istype(buckled_to, /obj/structure/bed/stool/chair)) // buckling does not restrict hands
 		return 0
 	return 1
 
@@ -501,4 +501,4 @@
 	return (drowsiness >= 5)
 
 /mob/living/carbon/proc/should_have_limb(var/organ_check)
-	return FALSE
+	return FALSE

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

@@ -733,7 +733,7 @@
 
 /datum/species/proc/handle_movement_tally(var/mob/living/carbon/human/H)
 	var/tally = 0
-	if(istype(H.buckled_to, /obj/structure/bed/chair/wheelchair))
+	if(istype(H.buckled_to, /obj/structure/bed/stool/chair/wheelchair))
 		for(var/organ_name in list(BP_L_HAND,BP_R_HAND,BP_L_ARM,BP_R_ARM))
 			var/obj/item/organ/external/E = H.get_organ(organ_name)
 			if(!E || E.is_stump())

code/modules/mob/living/carbon/human/species/station/golem.dm

@@ -908,7 +908,7 @@ var/global/list/golem_types = list(SPECIES_GOLEM_COAL,
 
 /datum/species/golem/technomancer/handle_movement_tally(var/mob/living/carbon/human/H)
 	var/tally = 0
-	if(istype(H.buckled_to, /obj/structure/bed/chair/wheelchair))
+	if(istype(H.buckled_to, /obj/structure/bed/stool/chair/wheelchair))
 		for(var/organ_name in list(BP_L_HAND,BP_R_HAND,BP_L_ARM,BP_R_ARM))
 			var/obj/item/organ/external/E = H.get_organ(organ_name)
 			if(!E || E.is_stump())

code/modules/mob/living/carbon/human/update_icons.dm

@@ -246,6 +246,20 @@ There are several things that need to be remembered:
 	if(update_icons)
 		update_icon()
 
+//Overlays for the worn overlay so you can overlay while you overlay
+//eg: ammo counters, primed grenade flashing, etc.
+//"icon_file" is used automatically for inhands etc. to make sure it gets the correct inhand file
+/obj/item/proc/worn_overlays(icon_file)
+	. = null
+	. = list()
+	var/mutable_appearance/M = null
+	if(build_from_parts)
+		M = mutable_appearance(icon_file, "[item_state]_[worn_overlay]")
+		M.appearance_flags = RESET_COLOR|RESET_ALPHA
+		if(worn_overlay_color)
+			M.color = worn_overlay_color
+		. += M
+		
 /proc/slot_str_to_contained_flag(var/slot_str)
 	switch(slot_str)
 		if(slot_back_str)

code/modules/mob/living/simple_animal/hostile/hivebots/hivebot_harvester.dm

@@ -159,8 +159,8 @@
 				update_icon()
 				return
 
-		if(istype(O, /obj/item/stool))
-			var/obj/item/stool/S = O
+		if(istype(O, /obj/structure/bed/stool))
+			var/obj/structure/bed/stool/S = O
 			src.visible_message(SPAN_NOTICE("[src] starts to dismantle \the [S]."))
 			busy = 2
 			update_icon()

code/modules/mob/mob_helpers.dm

@@ -1166,7 +1166,7 @@ proc/is_blind(A)
 	return species.handle_stance_damage(src, TRUE) >= 4
 
 /mob/living/carbon/human/proc/equip_wheelchair()
-	var/obj/structure/bed/chair/wheelchair/W = new(get_turf(src))
+	var/obj/structure/bed/stool/chair/wheelchair/W = new(get_turf(src))
 	if(isturf(loc))
 		buckled_to = W
 		update_canmove()

code/modules/mob/mob_movement.dm

@@ -280,7 +280,7 @@
 
 			//TODO: Fuck wheelchairs.
 			//Toss away all this snowflake code here, and rewrite wheelchairs as a vehicle.
-			else if(istype(mob.buckled_to, /obj/structure/bed/chair/wheelchair))
+			else if(istype(mob.buckled_to, /obj/structure/bed/stool/chair/wheelchair))
 				var/min_move_delay = 0
 				if(ishuman(mob.buckled_to))
 					var/mob/living/carbon/human/driver = mob.buckled_to
@@ -325,7 +325,7 @@
 
 		//Wheelchair pushing goes here for now.
 		//TODO: Fuck wheelchairs.
-		if(istype(mob.pulledby, /obj/structure/bed/chair/wheelchair) || istype(mob.pulledby, /obj/structure/janitorialcart))
+		if(istype(mob.pulledby, /obj/structure/bed/stool/chair/wheelchair) || istype(mob.pulledby, /obj/structure/janitorialcart))
 			move_delay += 1
 			return mob.pulledby.relaymove(mob, direct)