Merge branch 'Bubberstation:master' into master

_maps/map_files/BoxStation/BoxStation.dmm

@@ -6043,13 +6043,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/common/cryopods)
-"aDN" = (
-/obj/machinery/camera/directional/south{
-	c_tag = "Bathroom"
-	},
-/obj/structure/urinal/directional/north,
-/turf/open/floor/mineral/titanium/blue,
-/area/station/commons/toilet)
 "aDO" = (
 /obj/docking_port/stationary/escape_pod{
 	dir = 8
@@ -96655,7 +96648,7 @@ aAh
 aAh
 aAh
 aAh
-aDN
+feM
 aAh
 aMo
 vYr

_maps/map_files/LimaStation/LimaStation.dmm

@@ -11790,10 +11790,6 @@
 /obj/structure/cable,
 /obj/structure/sink/directional/north,
 /obj/structure/mirror/directional/south,
-/obj/machinery/camera{
-	c_tag = "Central Lower Hallway - Toilets";
-	dir = 8
-	},
 /turf/open/floor/iron/freezer,
 /area/station/commons/toilet/restrooms)
 "eKq" = (
@@ -56480,10 +56476,6 @@
 /turf/open/floor/iron,
 /area/station/maintenance/department/science)
 "vaX" = (
-/obj/machinery/camera{
-	c_tag = "Dormitory - Toilets";
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,

_maps/map_files/biodome/biodome.dmm

@@ -12541,9 +12541,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
-/obj/machinery/camera/directional/east{
-	c_tag = "Service - Auxiliary Toilets"
-	},
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/freezer,
 /area/station/commons/toilet/auxiliary)
@@ -15272,10 +15269,6 @@
 "fpk" = (
 /obj/machinery/duct,
 /obj/machinery/light/small/directional/north,
-/obj/machinery/camera/directional/north{
-	c_tag = "Prison - Showers";
-	network = list("ss13","prison")
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/freezer,
 /area/station/security/prison/shower)
@@ -42767,9 +42760,6 @@
 /turf/closed/wall/mineral/wood,
 /area/station/service/theater)
 "oMa" = (
-/obj/machinery/camera/directional/south{
-	c_tag = "Civilian - Restrooms"
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/landmark/generic_maintenance_landmark,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -52387,10 +52377,6 @@
 "scm" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
-/obj/machinery/camera/directional/north{
-	c_tag = "Prison - Bathroom";
-	network = list("ss13","prison")
-	},
 /turf/open/floor/iron/freezer,
 /area/station/security/prison/shower)
 "scp" = (

_maps/map_files/moonstation/moonstation.dmm

@@ -14956,7 +14956,7 @@
 /obj/item/reagent_containers/cup/glass/bottle/holywater{
 	desc = "A flask of holy water allegedly containing the first seed planted in the Garden of Eden";
 	name = "flask of the first holy seed";
-	list_reagents = list(/datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/water/holywater = 95);
+	list_reagents = list(/datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/water/holywater = 95);
 	pixel_y = 2
 	},
 /turf/open/floor/iron/dark,
@@ -57159,7 +57159,6 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron/dark/corner{
 	dir = 1
 	},
@@ -66526,13 +66525,6 @@
 "sAU" = (
 /turf/closed/wall/r_wall,
 /area/station/security/execution/education)
-"sAZ" = (
-/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{
-	dir = 4
-	},
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/iron/dark/corner,
-/area/station/common/pool)
 "sBa" = (
 /turf/closed/wall,
 /area/station/medical/break_room)
@@ -74116,7 +74108,6 @@
 "uGA" = (
 /obj/structure/sign/warning/no_smoking/directional/south,
 /obj/item/kirbyplants/random/fullysynthetic,
-/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/wood/tile,
 /area/station/common/pool/sauna)
 "uGG" = (
@@ -81744,6 +81735,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron/dark/corner{
 	dir = 1
 	},
@@ -239154,7 +239146,7 @@ ayt
 rqg
 rqg
 rqg
-sAZ
+rqg
 asA
 vmC
 rJR

code/modules/surgery/blood_filter.dm

@@ -39,6 +39,10 @@
  * * bloodfilter - The blood filter to check the whitelist of
  */
 /datum/surgery_step/filter_blood/proc/has_filterable_chems(mob/living/carbon/target, obj/item/blood_filter/bloodfilter)
+	// BUBBER EDIT ADDITION BEGIN - Filtration fixes toxins
+	if(target.toxloss > 0)
+		return TRUE
+	// BUBBER EDIT ADDITION END
 	if(!length(target.reagents?.reagent_list))
 		bloodfilter.audible_message(span_notice("[bloodfilter] pings as it reports no chemicals detected in [target]'s blood."))
 		playsound(get_turf(target), 'sound/machines/ping.ogg', 75, TRUE, falloff_exponent = 12, falloff_distance = 1)
@@ -69,7 +73,7 @@
 		for(var/datum/reagent/chem as anything in target.reagents.reagent_list)
 			if(!length(bloodfilter.whitelist) || (chem.type in bloodfilter.whitelist))
 				target.reagents.remove_reagent(chem.type, clamp(round(chem.volume * 0.22, 0.2), 0.4, 10))
-	target.adjustToxLoss(-2, forced = TRUE) //BUBBER EDIT - Filtration fixes toxins
+	target.adjustToxLoss(amount = clamp(round(target.toxloss * -0.07, 2), -2, -10), forced = TRUE) // BUBBER EDIT ADDITION - Filtration fixes toxins
 	display_results(
 		user,
 		target,

config/bubbers/bubbers_config.txt

@@ -0,0 +1,3 @@
+# Vetted player system
+## If enabled, it will use checks to determine if a player is vetted or not in different parts of the game
+#CHECK_VETTED

html/changelogs/AutoChangeLog-pr-1831.yml

@@ -0,0 +1,4 @@
+author: "MosleyTheMalO"
+delete-after: True
+changes:
+  - config: "adds a config for the vetted system"

html/changelogs/AutoChangeLog-pr-1850.yml

@@ -0,0 +1,4 @@
+author: "LT3"
+delete-after: True
+changes:
+  - bugfix: "Blood filter toxin removal feature now starts correctly"

html/changelogs/AutoChangeLog-pr-1852.yml

@@ -0,0 +1,4 @@
+author: "Shadow-Quill"
+delete-after: True
+changes:
+  - bugfix: "A holy water container on Moonstation now actually contains holy water."

modular_zubbers/code/controllers/configuration/entries/nsfw.dm

@@ -0,0 +1,2 @@
+/// Config to toggle the vetted system
+/datum/config_entry/flag/check_vetted

modular_zubbers/code/game/turfs/open/openspace.dm

@@ -12,8 +12,6 @@
 
 	baseturfs = /turf/open/openspace/moonstation
 
-	plane = FLOOR_PLANE
-
 /turf/open/openspace/moonstation/Initialize(mapload)
 	icon_state = ""
 	. = ..()

modular_zubbers/code/modules/vetted/examine.dm

@@ -1,9 +1,13 @@
 /mob/living/silicon/get_silicon_flavortext()
 	. = ..()
+	if(!CONFIG_GET(flag/check_vetted))
+		return
 	if(client && SSplayer_ranks.is_vetted(client, admin_bypass = FALSE))
 		. += span_greenannounce("This player has been vetted as 18+ by staff.")
 
 /mob/living/carbon/human/examine(mob/user)
 	. = ..()
+	if(!CONFIG_GET(flag/check_vetted))
+		return
 	if(client && SSplayer_ranks.is_vetted(client, admin_bypass = FALSE))
 		. += span_greenannounce("This player has been vetted as 18+ by staff.")

modular_zubbers/code/modules/vetted/vetted.dm

@@ -10,6 +10,9 @@ GLOBAL_PROTECT(vetted_list)
 	if(!istype(user))
 		CRASH("Invalid user type provided to is_vetted(), expected 'client' and obtained '[user ? user.type : "null"]'.")
 
+	if(!CONFIG_GET(flag/check_vetted))
+		return TRUE
+
 	if(GLOB.vetted_list[user.ckey])
 		return TRUE
 

tgstation.dme

@@ -8541,6 +8541,7 @@
 #include "modular_zubbers\code\_globalvars\lists\quirks.dm"
 #include "modular_zubbers\code\_globalvars\lists\text.dm"
 #include "modular_zubbers\code\_globalvars\lists\~maintenance_loot.dm"
+#include "modular_zubbers\code\controllers\configuration\entries\nsfw.dm"
 #include "modular_zubbers\code\controllers\subsystem\air.dm"
 #include "modular_zubbers\code\controllers\subsystem\mapping.dm"
 #include "modular_zubbers\code\controllers\subsystem\research.dm"