Merge branch 'master' into upstream-mirror-25516

_maps/RandomRuins/SpaceRuins/oldstation.dmm

@@ -541,12 +541,12 @@
 	pixel_y = 2;
 	pixel_x = 6
 	},
-/mob/living/simple_animal/bot/cleanbot/autopatrol{
+/mob/living/basic/bot/cleanbot/autopatrol{
 	bot_mode_flags = 12;
 	name = "Ramboo";
 	pixel_x = -2;
 	pixel_y = 5;
-	bot_cover_flags = 0
+	bot_access_flags = 0
 	},
 /turf/open/floor/plating{
 	initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15"

_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm

@@ -1502,7 +1502,7 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/cobweb,
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hotel/custodial)
 "hL" = (

_maps/map_files/Birdshot/birdshot.dmm

@@ -12405,7 +12405,7 @@
 	pixel_x = 9;
 	pixel_y = 2
 	},
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /obj/machinery/ai_slipper{
 	uses = 10
 	},

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -52996,7 +52996,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat/service)
 "qhp" = (

_maps/map_files/KiloStation2/KiloStation2.dmm

@@ -14898,7 +14898,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
-/mob/living/simple_animal/bot/cleanbot/medbay,
+/mob/living/basic/bot/cleanbot/medbay,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
@@ -23948,7 +23948,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
-/mob/living/simple_animal/bot/cleanbot/medbay{
+/mob/living/basic/bot/cleanbot/medbay{
 	maints_access_required = list(22);
 	name = "Deacon Scrubsy"
 	},
@@ -60517,7 +60517,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/mob/living/simple_animal/bot/cleanbot/autopatrol,
+/mob/living/basic/bot/cleanbot/autopatrol,
 /obj/effect/turf_decal/tile/purple/half/contrasted,
 /obj/effect/turf_decal/tile/blue,
 /turf/open/floor/iron,

_maps/map_files/MetaStation/MetaStation.dmm

@@ -3473,7 +3473,7 @@
 /obj/machinery/light/small/directional/east,
 /obj/machinery/firealarm/directional/east,
 /obj/effect/turf_decal/tile/blue,
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat_interior)
 "bkF" = (
@@ -11435,7 +11435,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
 "eih" = (
-/mob/living/simple_animal/bot/cleanbot/medbay,
+/mob/living/basic/bot/cleanbot/medbay,
 /turf/open/floor/iron/white,
 /area/station/medical/storage)
 "eiO" = (
@@ -64698,7 +64698,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral,
-/mob/living/simple_animal/bot/cleanbot/autopatrol,
+/mob/living/basic/bot/cleanbot/autopatrol,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "wUt" = (

_maps/map_files/NSSJourney/NSSJourney.dmm

@@ -21572,6 +21572,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
+/mob/living/basic/bot/cleanbot/medbay,
 /turf/open/floor/iron/white,
 /area/station/medical/cryo)
 "bGY" = (
@@ -29962,7 +29963,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat/service)
 "cvi" = (

_maps/map_files/NSVBlueshift/Blueshift.dmm

@@ -11877,7 +11877,7 @@
 /turf/open/floor/iron/dark/side,
 /area/station/security/prison/shower)
 "cnL" = (
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /obj/structure/railing,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat_interior)
@@ -24539,7 +24539,7 @@
 "eGG" = (
 /obj/structure/cable,
 /obj/effect/landmark/event_spawn,
-/mob/living/simple_animal/bot/cleanbot{
+/mob/living/basic/bot/cleanbot{
 	name = "Soapficcer Cleansky"
 	},
 /obj/structure/disposalpipe/segment{
@@ -36813,7 +36813,7 @@
 /obj/effect/landmark/start/medical_doctor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/mob/living/simple_animal/bot/cleanbot/medbay,
+/mob/living/basic/bot/cleanbot/medbay,
 /obj/item/beacon,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
@@ -59165,7 +59165,7 @@
 /obj/effect/landmark/event_spawn,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/mob/living/simple_animal/bot/cleanbot{
+/mob/living/basic/bot/cleanbot{
 	name = "Sweeps-The-Tiles"
 	},
 /turf/open/floor/iron,
@@ -114073,7 +114073,7 @@
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/cargo/miningdock)
 "vIy" = (
-/mob/living/simple_animal/bot/cleanbot/autopatrol,
+/mob/living/basic/bot/cleanbot/autopatrol,
 /obj/structure/cable,
 /turf/open/floor/iron/goonplaque,
 /area/station/hallway/primary/central/aft)

_maps/map_files/NorthStar/north_star.dmm

@@ -2976,7 +2976,7 @@
 /area/station/commons/fitness)
 "aOw" = (
 /obj/machinery/light/small/directional/north,
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat_interior)
 "aOx" = (

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -46614,7 +46614,7 @@
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/medical/morgue)
 "nfC" = (
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /obj/structure/railing,
 /turf/open/floor/circuit,
 /area/station/ai_monitored/turret_protected/aisat_interior)

_maps/map_files/generic/CentCom_skyrat_z2.dmm

@@ -1274,7 +1274,7 @@
 /turf/open/floor/iron/showroomfloor,
 /area/centcom/holding/cafe)
 "atf" = (
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding/cafe)
 "ati" = (

_maps/map_files/tramstation/tramstation.dmm

@@ -15550,7 +15550,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat_interior)
 "esA" = (
@@ -70301,7 +70301,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat/maint)
 "xZi" = (

_maps/shuttles/emergency_casino.dmm

@@ -1146,7 +1146,7 @@
 "MS" = (
 /obj/structure/mop_bucket,
 /obj/item/mop,
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/mineral/titanium/yellow,
 /area/shuttle/escape)
 "MT" = (

_maps/shuttles/emergency_shadow.dmm

@@ -991,7 +991,7 @@
 /turf/open/floor/eighties,
 /area/shuttle/escape)
 "RV" = (
-/mob/living/simple_animal/bot/cleanbot{
+/mob/living/basic/bot/cleanbot{
 	name = "Mopsy"
 	},
 /obj/machinery/holopad,

_maps/shuttles/emergency_tranquility.dmm

@@ -1385,7 +1385,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /obj/machinery/vending/wallmed/directional/south,
 /turf/open/floor/wood,
 /area/shuttle/escape)

_maps/shuttles/ruin_cyborg_mothership.dmm

@@ -17,7 +17,7 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/ruin/cyborg_mothership)
 "bE" = (
-/mob/living/simple_animal/bot/cleanbot,
+/mob/living/basic/bot/cleanbot,
 /turf/open/floor/iron/showroomfloor,
 /area/shuttle/ruin/cyborg_mothership)
 "cU" = (

code/__DEFINES/ai/ai_blackboard.dm

@@ -140,3 +140,6 @@
 #define BB_BASIC_MOB_REINFORCEMENT_TARGET "BB_basic_mob_reinforcement_target"
 /// The next time at which this mob can call for reinforcements
 #define BB_BASIC_MOB_REINFORCEMENTS_COOLDOWN "BB_basic_mob_reinforcements_cooldown"
+
+///Text we display when we befriend someone
+#define BB_FRIENDLY_MESSAGE "friendly_message"

code/__DEFINES/ai/bot_keys.dm

@@ -33,3 +33,25 @@
 #define BB_NEAR_DEATH_SPEECH "near_death_speech"
 ///in crit patient we must alert medbay about
 #define BB_PATIENT_IN_CRIT "patient_in_crit"
+
+// cleanbots
+///key that holds the foaming ability
+#define BB_CLEANBOT_FOAM "cleanbot_foam"
+///key that holds decals we hunt
+#define BB_CLEANABLE_DECALS "cleanable_decals"
+///key that holds blood we hunt
+#define BB_CLEANABLE_BLOOD "cleanable_blood"
+///key that holds pests we hunt
+#define BB_HUNTABLE_PESTS "huntable_pests"
+///key that holds emagged speech
+#define BB_CLEANBOT_EMAGGED_PHRASES "emagged_phrases"
+///key that holds drawings we hunt
+#define BB_CLEANABLE_DRAWINGS "cleanable_drawings"
+///Key that holds our clean target
+#define BB_CLEAN_TARGET "clean_target"
+///key that holds the janitor we will befriend
+#define BB_FRIENDLY_JANITOR "friendly_janitor"
+///key that holds the victim we will spray
+#define BB_ACID_SPRAY_TARGET "acid_spray_target"
+///key that holds trash we will burn
+#define BB_HUNTABLE_TRASH "huntable_trash"

code/__DEFINES/traits/declarations.dm

@@ -1005,6 +1005,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Trait given to foam darts that have an insert in them
 #define TRAIT_DART_HAS_INSERT "dart_has_insert"
 
+///Trait granted by janitor skillchip, allows communication with cleanbots
+#define TRAIT_CLEANBOT_WHISPERER "cleanbot_whisperer"
+
 /// Trait given when a mob is currently in invisimin mode
 #define TRAIT_INVISIMIN "invisimin"
 

code/_globalvars/traits/_traits.dm

@@ -147,6 +147,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CHEF_KISS" = TRAIT_CHEF_KISS,
 		"TRAIT_CHUNKYFINGERS_IGNORE_BATON" = TRAIT_CHUNKYFINGERS_IGNORE_BATON,
 		"TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS,
+		"TRAIT_CLEANBOT_WHISPERER" = TRAIT_CLEANBOT_WHISPERER,
 		"TRAIT_CLIFF_WALKER" = TRAIT_CLIFF_WALKER,
 		"TRAIT_CLOWN_ENJOYER" = TRAIT_CLOWN_ENJOYER,
 		"TRAIT_CLUMSY" = TRAIT_CLUMSY,

code/datums/ai/basic_mobs/basic_ai_behaviors/befriend_target.dm

@@ -0,0 +1,21 @@
+///behavior to befriend any targets
+/datum/ai_behavior/befriend_target
+
+/datum/ai_behavior/befriend_target/perform(seconds_per_tick, datum/ai_controller/controller, target_key, befriend_message)
+	. = ..()
+	var/mob/living/living_pawn = controller.pawn
+	var/mob/living/living_target = controller.blackboard[target_key]
+	if(QDELETED(living_target))
+		finish_action(controller, FALSE, target_key)
+		return
+
+	living_pawn.befriend(living_target)
+	var/befriend_text = controller.blackboard[befriend_message]
+	if(befriend_text)
+		to_chat(living_target, span_nicegreen("[living_pawn] [befriend_text]"))
+
+	finish_action(controller, TRUE, target_key)
+
+/datum/ai_behavior/befriend_target/finish_action(datum/ai_controller/controller, succeeded, target_key)
+	. = ..()
+	controller.clear_blackboard_key(target_key)

code/datums/components/cleaner.dm

@@ -120,14 +120,16 @@
 		cleaning_duration = (cleaning_duration * min(user.mind.get_skill_modifier(/datum/skill/cleaning, SKILL_SPEED_MODIFIER)+skill_duration_modifier_offset, 1))
 
 	//do the cleaning
+	var/clean_succeeded = FALSE
 	if(do_after(user, cleaning_duration, target = target))
+		clean_succeeded = TRUE
 		if(clean_target)
 			for(var/obj/effect/decal/cleanable/cleanable_decal in target) //it's important to do this before you wash all of the cleanables off
 				user.mind?.adjust_experience(/datum/skill/cleaning, round(cleanable_decal.beauty / CLEAN_SKILL_BEAUTY_ADJUSTMENT))
 			if(target.wash(cleaning_strength))
 				user.mind?.adjust_experience(/datum/skill/cleaning, round(CLEAN_SKILL_GENERIC_WASH_XP))
-		on_cleaned_callback?.Invoke(source, target, user)
 
+	on_cleaned_callback?.Invoke(source, target, user, clean_succeeded)
 	//remove the cleaning overlay
 	target.cut_overlay(low_bubble)
 	target.cut_overlay(high_bubble)

code/datums/components/crafting/robot.dm

@@ -32,7 +32,7 @@
 
 /datum/crafting_recipe/cleanbot
 	name = "Cleanbot"
-	result = /mob/living/simple_animal/bot/cleanbot
+	result = /mob/living/basic/bot/cleanbot
 	reqs = list(
 		/obj/item/reagent_containers/cup/bucket = 1,
 		/obj/item/assembly/prox_sensor = 1,

code/game/objects/items/clown_items.dm

@@ -129,7 +129,9 @@
  * * target - The atom that is being cleaned
  * * user - The mob that is using the soap to clean.
  */
-/obj/item/soap/proc/decreaseUses(datum/source, atom/target, mob/living/user)
+/obj/item/soap/proc/decreaseUses(datum/source, atom/target, mob/living/user, clean_succeeded)
+	if(!clean_succeeded)
+		return
 	var/skillcheck = 1
 	if(user?.mind)
 		skillcheck = user.mind.get_skill_modifier(/datum/skill/cleaning, SKILL_SPEED_MODIFIER)

code/game/objects/items/mop.dm

@@ -60,7 +60,9 @@
  * * cleaned_turf the turf that is being cleaned
  * * cleaner the mob that is doing the cleaning
  */
-/obj/item/mop/proc/apply_reagents(datum/cleaning_source, turf/cleaned_turf, mob/living/cleaner)
+/obj/item/mop/proc/apply_reagents(datum/cleaning_source, turf/cleaned_turf, mob/living/cleaner, clean_succeeded)
+	if(!clean_succeeded)
+		return
 	reagents.expose(cleaned_turf, TOUCH, 10) //Needed for proper floor wetting.
 	var/val2remove = 1
 	if(cleaner?.mind)

code/game/objects/structures/false_walls.dm

@@ -73,14 +73,14 @@
 
 /obj/structure/falsewall/update_icon_state()
 	if(opening)
-		icon = fake_icon
+		icon = initial(icon)
 		icon_state = "[base_icon_state]-[density ? "opening" : "closing"]"
 		return ..()
 	if(density)
-		icon = initial(icon)
+		icon = fake_icon
 		icon_state = "[base_icon_state]-[smoothing_junction]"
 	else
-		icon = fake_icon
+		icon = initial(icon)
 		icon_state = "[base_icon_state]-open"
 	return ..()
 

code/modules/jobs/job_types/janitor.dm

@@ -40,6 +40,7 @@
 	uniform = /obj/item/clothing/under/rank/civilian/janitor
 	belt = /obj/item/modular_computer/pda/janitor
 	ears = /obj/item/radio/headset/headset_srv
+	skillchips = list(/obj/item/skillchip/job/janitor)
 
 /datum/outfit/job/janitor/pre_equip(mob/living/carbon/human/human_equipper, visuals_only)
 	. = ..()

code/modules/library/skill_learning/job_skillchips/janitor.dm

@@ -0,0 +1,9 @@
+/obj/item/skillchip/job/janitor
+	name = "CL34NM4ST.R skillchip"
+	desc = "Become a cleanbot whisperer."
+	auto_traits = list(TRAIT_CLEANBOT_WHISPERER)
+	skill_name = "Voice Of The Voiceless"
+	skill_description = "Gain the affection of all thankless, hardworking cleanbots on the station."
+	skill_icon = "broom"
+	activate_message = span_notice("You start feeling empathetic towards all the cleanbots on the station.")
+	deactivate_message = span_notice("You forget why you felt any sympathy towards the cleanbots, they are just robots after all.")