Merge remote-tracking branch 'upstream/master'

_maps/bubber/automapper/templates/generic/interlink_adminoffice.dmm

@@ -73,9 +73,9 @@
 /area/centcom/central_command_areas/admin/interlink)
 "m" = (
 /obj/effect/turf_decal/siding/wood,
-/obj/machinery/vending/boozeomat/all_access{
-	density = 0;
-	pixel_y = 32
+/obj/machinery/vending/boozeomat/cafe{
+	pixel_y = 32;
+	density = 0
 	},
 /turf/open/floor/wood/large,
 /area/centcom/central_command_areas/admin/interlink)

_maps/map_files/BoxStation/BoxStation.dmm

@@ -35316,7 +35316,6 @@
 /obj/item/clothing/gloves/latex{
 	pixel_y = 3
 	},
-/obj/item/storage/pill_bottle/monkeydone,
 /obj/item/storage/pill_bottle/mutadone{
 	pixel_x = 11;
 	pixel_y = 7

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -634,10 +634,12 @@
 "aiU" = (
 /obj/effect/turf_decal/bot_red,
 /obj/structure/sign/warning/hot_temp/directional/north,
-/obj/structure/bodycontainer/crematorium{
-	dir = 4;
-	id = "crematoriumSecurity"
+/obj/structure/rack,
+/obj/item/storage/box/hug/plushes,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+	dir = 9
 	},
+/obj/item/storage/box/hug/plushes,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/security/office)
 "ajb" = (
@@ -12392,12 +12394,6 @@
 /area/station/cargo/storage)
 "dGX" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/dark/filled/corner{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
 /turf/open/floor/iron/dark/textured_corner{
 	dir = 1
 	},
@@ -17122,7 +17118,12 @@
 	pixel_y = 3
 	},
 /obj/item/storage/box/bodybags,
-/obj/item/pushbroom,
+/obj/item/pushbroom{
+	pixel_x = -10
+	},
+/obj/item/mop{
+	pixel_x = 7
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/office)
 "eWh" = (
@@ -22757,8 +22758,17 @@
 /obj/machinery/camera/directional/north{
 	c_tag = "Security - Morgue"
 	},
-/obj/structure/table,
-/obj/item/clothing/gloves/latex,
+/obj/structure/rack,
+/obj/effect/spawner/random/entertainment/plushie{
+	pixel_y = 9
+	},
+/obj/effect/spawner/random/entertainment/plushie{
+	pixel_x = 9;
+	pixel_y = -6
+	},
+/obj/effect/spawner/random/entertainment/plushie{
+	pixel_x = -13
+	},
 /turf/open/floor/iron/dark/smooth_edge,
 /area/station/security/office)
 "gGg" = (
@@ -24597,7 +24607,7 @@
 /area/station/service/chapel/funeral)
 "hgo" = (
 /obj/machinery/door/airlock/grunge{
-	name = "Morgue"
+	name = "Plushie Storage"
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47886,13 +47896,8 @@
 /area/station/maintenance/starboard/greater)
 "nuV" = (
 /obj/effect/turf_decal/trimline/dark/filled/warning{
-	dir = 9
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
+	dir = 8
 	},
-/obj/structure/closet/l3closet/security,
-/obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/station/security/office)
 "nvc" = (
@@ -51969,6 +51974,8 @@
 /obj/item/flashlight/lamp,
 /obj/item/radio/intercom/directional/north,
 /obj/effect/turf_decal/tile/dark_red/fourcorners,
+/obj/item/clothing/suit/jacket/straight_jacket,
+/obj/item/clothing/mask/muzzle,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "oBK" = (
@@ -56540,15 +56547,16 @@
 /area/station/science/robotics/mechbay)
 "pOs" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/button/crematorium{
-	id = "crematoriumSecurity";
-	pixel_y = 25
+/obj/structure/rack,
+/obj/effect/spawner/random/entertainment/plushie_delux{
+	pixel_x = 4
 	},
 /obj/effect/turf_decal/trimline/dark/filled/warning{
-	dir = 9
+	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
+/obj/item/toy/plush/skyrat/duffmoth{
+	pixel_x = -11;
+	pixel_y = 6
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/office)
@@ -75580,17 +75588,12 @@
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/medical/morgue)
 "uXb" = (
-/obj/structure/bed/medical{
-	dir = 4
-	},
-/obj/item/clothing/glasses/blindfold,
 /obj/effect/turf_decal/trimline/dark/filled/line{
 	dir = 5
 	},
-/obj/item/clothing/suit/jacket/straight_jacket,
-/obj/item/clothing/glasses/blindfold,
-/obj/item/clothing/mask/muzzle,
 /obj/structure/sink/directional/south,
+/obj/structure/rack,
+/obj/item/toy/plush/skyrat/sechound,
 /turf/open/floor/iron/dark,
 /area/station/security/office)
 "uXf" = (

_maps/moonstation.json

@@ -18,7 +18,7 @@
 			"Mining": true,
 			"Linkage": null,
 			"Gravity": true,
-			"Lava Ruins": true,
+			"Moonstation Ruins": true,
 			"Baseturf": "/turf/open/lava/smooth/lava_land_surface",
 			"No Parallax": true
 		},

code/__DEFINES/inventory.dm

@@ -119,15 +119,15 @@ DEFINE_BITFIELD(no_equip_flags, list(
 
 //SKYRAT EDIT ADDITION: CUSTOM EAR TOGGLE FOR ANTHRO/ETC EAR SHOWING -
 /// Manually set this on items you want anthro ears to show on!
-#define SHOWSPRITEEARS (1<<14)
+#define SHOWSPRITEEARS (1<<16)
 /// Does this sprite hide the tail?
-#define HIDETAIL (1<<15)
+#define HIDETAIL (1<<17)
 /// Does this sprite also hide the spine on tails? Realistically only useful for the clothes that have a special tail overlay, like MODsuits
-#define HIDESPINE (1<<16)
+#define HIDESPINE (1<<18)
 /// Does this sprite hide devious devices?
-#define HIDESEXTOY (1<<17)
+#define HIDESEXTOY (1<<19)
 /// If this has our taur variant, do we hide our taur part?
-#define HIDETAUR (1<<18)
+#define HIDETAUR (1<<20)
 //SKYRAT EDIT ADDITION END
 
 //SPLURT EDIT

code/__DEFINES/~~bubber_defines/chat.dm

@@ -0,0 +1,3 @@
+// Additional message types for TGUI chat panel filtering
+#define MESSAGE_TYPE_LOOC "looc"
+#define MESSAGE_TYPE_REMOTE_LOOC "rlooc"

code/__DEFINES/~~bubber_defines/traits/declarations.dm

@@ -22,3 +22,6 @@
 //lipstick trait
 #define TRAIT_HYPNO_KISS "hypno kiss"
 
+// Shows extended examine option when worn
+#define TRAIT_WORN_EXAMINE "worn_examine"
+

code/__DEFINES/~~bubber_defines/traits/sources.dm

@@ -0,0 +1,2 @@
+// Loadout trait
+#define TRAIT_SOURCE_LOADOUT "loadout"

code/game/objects/items/devices/scanners/health_analyzer.dm

@@ -93,7 +93,7 @@
 	balloon_alert(user, "analyzing vitals")
 	playsound(user.loc, 'sound/items/healthanalyzer.ogg', 50)
 
-	var/readability_check = user.can_read(src) && !user.is_blind()
+	var/readability_check = user.can_read(src) // BUBBER EDIT CHANGE - Blind people can analyze again - ORIGINAL: user.can_read(src) && !user.is_blind()
 	switch (scanmode)
 		if (SCANMODE_HEALTH)
 			last_scan_text = healthscan(user, M, mode, advanced, tochat = readability_check)

code/modules/antagonists/malf_ai/malf_ai_modules.dm

@@ -499,6 +499,11 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf) - /datum/ai_mod
 
 /datum/action/innate/ai/destroy_rcds/Activate()
 	for(var/I in GLOB.rcd_list)
+		// BUBBER EDIT BEGIN - Ghost role RCDs are spared
+		var/turf/rcd_loc = get_turf(I)
+		if(!is_station_level(rcd_loc.z))
+			continue
+		// BUBBER EDIT END
 		if(!istype(I, /obj/item/construction/rcd/borg)) //Ensures that cyborg RCDs are spared.
 			var/obj/item/construction/rcd/RCD = I
 			RCD.detonate_pulse()

code/modules/loadout/loadout_items.dm

@@ -277,7 +277,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories())
 	ASSERT(!isnull(equipped_item))
 
 	if(!visuals_only)
-		ADD_TRAIT(equipped_item, TRAIT_ITEM_OBJECTIVE_BLOCKED, "Loadout")
+		ADD_TRAIT(equipped_item, TRAIT_ITEM_OBJECTIVE_BLOCKED, TRAIT_SOURCE_LOADOUT)
 
 	var/list/item_details = preference_list[item_path]
 	var/update_flag = NONE
@@ -296,8 +296,9 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories())
 			equipped_item.desc = trim(item_details[INFO_DESCRIBED], PREVENT_CHARACTER_TRIM_LOSS(MAX_DESC_LEN))
 			renamed = 1
 		if(renamed)
-			ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout")
-			SEND_SIGNAL(equipped_item, COMSIG_NAME_CHANGED) // BUBBER EDIT
+			ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, TRAIT_SOURCE_LOADOUT)
+			equipped_item.AddElement(/datum/element/examined_when_worn)
+			SEND_SIGNAL(equipped_item, COMSIG_NAME_CHANGED)
 	// SKYRAT EDIT END
 
 	if(can_be_reskinned && item_details?[INFO_RESKIN])