From 18e25488048f8cef3094026b9e43d4eba3671072 Mon Sep 17 00:00:00 2001 From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com> Date: Sun, 28 Jul 2024 10:59:10 -0500 Subject: [PATCH 1/7] Vetted System Config (#1831) ## About The Pull Request Adds a config to toggle the vetted system on and off if uncommented it'll use the system to check if players are vetted ## Why It's Good For The Game Useful for testing, so that coders don't have to add their ckeys to the vetted list when running the code locally. Also for downstreams who prefer not using the system. ## Proof Of Testing ![image](https://github.com/user-attachments/assets/62761c52-7285-4318-a76a-0d2c8f4097a6) ## Changelog :cl: config: adds a config for the vetted system /:cl: Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> --- config/bubbers/bubbers_config.txt | 3 +++ .../code/controllers/configuration/entries/nsfw.dm | 2 ++ modular_zubbers/code/modules/vetted/examine.dm | 4 ++++ modular_zubbers/code/modules/vetted/vetted.dm | 3 +++ tgstation.dme | 1 + 5 files changed, 13 insertions(+) create mode 100644 modular_zubbers/code/controllers/configuration/entries/nsfw.dm diff --git a/config/bubbers/bubbers_config.txt b/config/bubbers/bubbers_config.txt index e69de29bb2d1d..f8116eb7abcf7 100644 --- a/config/bubbers/bubbers_config.txt +++ b/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 diff --git a/modular_zubbers/code/controllers/configuration/entries/nsfw.dm b/modular_zubbers/code/controllers/configuration/entries/nsfw.dm new file mode 100644 index 0000000000000..c7f53dd24b5c6 --- /dev/null +++ b/modular_zubbers/code/controllers/configuration/entries/nsfw.dm @@ -0,0 +1,2 @@ +/// Config to toggle the vetted system +/datum/config_entry/flag/check_vetted diff --git a/modular_zubbers/code/modules/vetted/examine.dm b/modular_zubbers/code/modules/vetted/examine.dm index 566446bc484f0..2d51f9bb23da1 100644 --- a/modular_zubbers/code/modules/vetted/examine.dm +++ b/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.") diff --git a/modular_zubbers/code/modules/vetted/vetted.dm b/modular_zubbers/code/modules/vetted/vetted.dm index 1682e81830056..cfe18bf156397 100644 --- a/modular_zubbers/code/modules/vetted/vetted.dm +++ b/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 diff --git a/tgstation.dme b/tgstation.dme index b51501286b879..8e390b106c887 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8537,6 +8537,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" From ff1caad37c8e5d444cb2242daeb53099130cafa8 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun, 28 Jul 2024 17:59:35 +0200 Subject: [PATCH 2/7] Automatic changelog for PR #1831 [ci skip] --- html/changelogs/AutoChangeLog-pr-1831.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1831.yml diff --git a/html/changelogs/AutoChangeLog-pr-1831.yml b/html/changelogs/AutoChangeLog-pr-1831.yml new file mode 100644 index 0000000000000..3739c1d006d9b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1831.yml @@ -0,0 +1,4 @@ +author: "MosleyTheMalO" +delete-after: True +changes: + - config: "adds a config for the vetted system" \ No newline at end of file From e41f6ad82ac518c4eb7c1b59eec8b45767c644b2 Mon Sep 17 00:00:00 2001 From: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Date: Mon, 29 Jul 2024 00:22:41 +0200 Subject: [PATCH 3/7] Removes all security cameras from bathrooms and showers [Bubber] (#1849) ## About The Pull Request Bubber map edits for https://github.com/Skyrat-SS13/Skyrat-tg/pull/28559 ## Why It's Good For The Game Map consistency ## Changelog In previous changelog --- _maps/map_files/BoxStation/BoxStation.dmm | 9 +-------- _maps/map_files/LimaStation/LimaStation.dmm | 8 -------- _maps/map_files/biodome/biodome.dmm | 14 -------------- _maps/map_files/moonstation/moonstation.dmm | 12 ++---------- 4 files changed, 3 insertions(+), 40 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 079bc8055fe0c..bf7615507c2b9 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_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 diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index bd60a22183fb4..5dd373b0d729c 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_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, diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index 9b2b282a322b3..be8ab3526edd5 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_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" = ( diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index a0b54b78e916f..5a7a853a56744 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -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 From 86cfb1b15f4594c6fef238439685b7b6d9181cb3 Mon Sep 17 00:00:00 2001 From: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Date: Mon, 29 Jul 2024 00:43:56 +0200 Subject: [PATCH 4/7] Fix blood filter filtering toxins (#1850) ## About The Pull Request Updates the check for the blood filter's toxin removal so that the surgery step is allowed to start. Updates the removal proc to work similar to the new blood filtering clamp. ## Why It's Good For The Game Toxin filtering to blood filter was added, but the surgery step check won't start unless there's reagents. ## Changelog :cl: LT3 fix: Blood filter toxin removal feature now starts correctly /:cl: --- code/modules/surgery/blood_filter.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/blood_filter.dm b/code/modules/surgery/blood_filter.dm index ff0fc34c4a44f..9f2117c3225d0 100644 --- a/code/modules/surgery/blood_filter.dm +++ b/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, From 94449bc91e123a2cd6bbdaa63b0e3e2a838396ff Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 29 Jul 2024 00:48:16 +0200 Subject: [PATCH 5/7] Automatic changelog for PR #1850 [ci skip] --- html/changelogs/AutoChangeLog-pr-1850.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1850.yml diff --git a/html/changelogs/AutoChangeLog-pr-1850.yml b/html/changelogs/AutoChangeLog-pr-1850.yml new file mode 100644 index 0000000000000..cc4a5a3fae10d --- /dev/null +++ b/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" \ No newline at end of file From 86c6c7ece961934128ee78aee4eb906d05071375 Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:43:19 -0600 Subject: [PATCH 6/7] Fixes a issue causing CI to fail (#1852) ## About The Pull Request Fixes a CI failure due to #1839 being untested and using the wrong path for holy water. (Seriously?) https://github.com/Bubberstation/Bubberstation/actions/runs/10131978025/job/28015352052#step:4:149 ## Why It's Good For The Game Causes a holy water container *actually* contain holy water. Also fixes a CI failure. ## Proof Of Testing https://github.com/Bubberstation/Bubberstation/blob/94449bc91e123a2cd6bbdaa63b0e3e2a838396ff/code/modules/reagents/chemistry/reagents/other_reagents.dm#L377 ## Changelog :cl: fix: A holy water container on Moonstation now actually contains holy water. /:cl: --- _maps/map_files/moonstation/moonstation.dmm | 2 +- modular_zubbers/code/game/turfs/open/openspace.dm | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 5a7a853a56744..b7dd1330561ca 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_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, diff --git a/modular_zubbers/code/game/turfs/open/openspace.dm b/modular_zubbers/code/game/turfs/open/openspace.dm index 986ed2d944846..68c7086e92670 100644 --- a/modular_zubbers/code/game/turfs/open/openspace.dm +++ b/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 = "" . = ..() From 1a8ee4d329c939a886ceb3ed538c42a95fda6932 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 29 Jul 2024 20:43:46 +0200 Subject: [PATCH 7/7] Automatic changelog for PR #1852 [ci skip] --- html/changelogs/AutoChangeLog-pr-1852.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1852.yml diff --git a/html/changelogs/AutoChangeLog-pr-1852.yml b/html/changelogs/AutoChangeLog-pr-1852.yml new file mode 100644 index 0000000000000..546d38227e881 --- /dev/null +++ b/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." \ No newline at end of file