From e0fad6282cf480fe97c0c089d679114e27bdb1ab Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 27 Aug 2024 00:39:54 +0000 Subject: [PATCH 01/37] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-29549.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29562.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29573.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29575.yml | 5 ----- html/changelogs/archive/2024-08.yml | 12 ++++++++++++ 5 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-29549.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29562.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29573.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29575.yml diff --git a/html/changelogs/AutoChangeLog-pr-29549.yml b/html/changelogs/AutoChangeLog-pr-29549.yml deleted file mode 100644 index 959c31921c7aa..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29549.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LT3" -delete-after: True -changes: - - spellcheck: "Sneak a peek of Hilbert's Hotel, not a sneak peak" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29562.yml b/html/changelogs/AutoChangeLog-pr-29562.yml deleted file mode 100644 index ac3ea02e51f4c..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29562.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "aKromatopzia" -delete-after: True -changes: - - image: "more teshari clothing sprites" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29573.yml b/html/changelogs/AutoChangeLog-pr-29573.yml deleted file mode 100644 index b6d6e9bbdac42..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29573.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "fixes blob spore and slime AI endlessly attacking the dead" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29575.yml b/html/changelogs/AutoChangeLog-pr-29575.yml deleted file mode 100644 index ef3fcd4dea9d9..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29575.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "projectkepler-ru" -delete-after: True -changes: - - bugfix: "Helmet pepperspray not working because of an NRI sabotage on the supplyline, the IDMA Force has now succesfully repelled the attack and has shifted focus toward trying to identify the suspect involved in this attack" - - bugfix: "weird suppresor overlay shenanigan" \ No newline at end of file diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index 73c25d98d58cd..3c003198f0fd6 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -800,3 +800,15 @@ - balance: m45a5 has less painful wait period - bugfix: gun not being in pistol case when they should be - rscadd: 10mm AP, HP speedloader to the tech +2024-08-27: + LT3: + - spellcheck: Sneak a peek of Hilbert's Hotel, not a sneak peak + SkyratBot: + - bugfix: fixes blob spore and slime AI endlessly attacking the dead + aKromatopzia: + - image: more teshari clothing sprites + projectkepler-ru: + - bugfix: Helmet pepperspray not working because of an NRI sabotage on the supplyline, + the IDMA Force has now succesfully repelled the attack and has shifted focus + toward trying to identify the suspect involved in this attack + - bugfix: weird suppresor overlay shenanigan From 502b147965852521c9625e685d0838110033d8a7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:30:26 +0200 Subject: [PATCH 02/37] [MIRROR] Salt electrolysis (#29577) * Salt electrolysis (#85304) ## About The Pull Request Add salt electrolysis. You need to mix ethereal blood with table salt/sodium chlorine/NaCl and you get sodium and chlorine. ## Why It's Good For The Game Add ghetto chemistry way to obtain sodium Add new reaction for ghetto chimestry ![20_5](https://github.com/user-attachments/assets/9e4108ba-fb2e-4f47-a6d3-8e98f97292ff) ## Changelog :cl: add: Added salt electrolysis reaction /:cl: --------- Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@ users.noreply.github.com> * Salt electrolysis --------- Co-authored-by: Sakamoto4ka <126394911+Sakamoto4ka@users.noreply.github.com> Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@ users.noreply.github.com> --- .../reagents/chemistry/recipes/others.dm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 7b8a0655cb350..52ec613270c4a 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -38,6 +38,13 @@ results = list(/datum/reagent/consumable/salt = 2) required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/chlorine = 1) // That's what I said! Sodium Chloride! reaction_tags = REACTION_TAG_EASY | REACTION_TAG_FOOD + required_other = TRUE + +/datum/chemical_reaction/sodiumchloride/pre_reaction_other_checks(datum/reagents/holder) + . = ..() + if(holder.has_reagent(/datum/reagent/consumable/liquidelectricity) || holder.has_reagent(/datum/reagent/consumable/liquidelectricity/enriched)) + return FALSE + /datum/chemical_reaction/stable_plasma results = list(/datum/reagent/stable_plasma = 1) @@ -600,6 +607,18 @@ results = list(/datum/reagent/oxygen = 2.5, /datum/reagent/hydrogen = 5) required_reagents = list(/datum/reagent/consumable/liquidelectricity/enriched = 1, /datum/reagent/water = 5) reaction_tags = REACTION_TAG_EASY | REACTION_TAG_CHEMICAL + +//salt electrolysis +/datum/chemical_reaction/saltelectrolysis + results = list(/datum/reagent/chlorine = 2.5, /datum/reagent/sodium = 2.5) + required_reagents = list(/datum/reagent/consumable/salt = 5) + required_catalysts = list(/datum/reagent/consumable/liquidelectricity = 1) + reaction_tags = REACTION_TAG_EASY | REACTION_TAG_CHEMICAL + +/datum/chemical_reaction/saltelectrolysis/enriched + required_catalysts = list(/datum/reagent/consumable/liquidelectricity/enriched = 1) + + //butterflium /datum/chemical_reaction/butterflium required_reagents = list(/datum/reagent/colorful_reagent = 1, /datum/reagent/medicine/omnizine = 1, /datum/reagent/medicine/strange_reagent = 1, /datum/reagent/consumable/nutriment = 1) From e3da5577407ef71d93fd39b236565e86d1cc41df Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:30:38 +0200 Subject: [PATCH 03/37] [MIRROR] Bioscrambler anomalies no longer affect inorganic species (#29578) * Bioscrambler anomalies no longer affect inorganic species (#86061) ## About The Pull Request Closes #86045 by making inorganic or geneless species not be affected by bioscrambler anomalies ## Why It's Good For The Game Currently this only affects voidwalkers which are now also considered geneless, but should ensure that we don't end up with bioscrambled semiorganic skeletons or synths later down the line if something akin to those gets added and ends up missing limb/organ tags. ## Changelog :cl: fix: Bioscrambler anomalies no longer affect inorganic species /:cl: * Bioscrambler anomalies no longer affect inorganic species --------- Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> --- code/modules/antagonists/voidwalker/voidwalker_species.dm | 1 + code/modules/mob/living/carbon/carbon_defense.dm | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/code/modules/antagonists/voidwalker/voidwalker_species.dm b/code/modules/antagonists/voidwalker/voidwalker_species.dm index 069582fbb2c7e..5b50c3da69ed9 100644 --- a/code/modules/antagonists/voidwalker/voidwalker_species.dm +++ b/code/modules/antagonists/voidwalker/voidwalker_species.dm @@ -20,6 +20,7 @@ TRAIT_ADVANCEDTOOLUSER, TRAIT_NO_BLOOD_OVERLAY, TRAIT_NO_THROWING, + TRAIT_GENELESS, ) changesource_flags = MIRROR_BADMIN diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index de35d03fc253a..a7429fff827d9 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -696,6 +696,12 @@ /// Randomise a body part and organ of this mob /mob/living/carbon/proc/bioscramble(scramble_source) + if(!(mob_biotypes & MOB_ORGANIC)) + return FALSE + + if (HAS_TRAIT(src, TRAIT_GENELESS)) + return FALSE + if (run_armor_check(attack_flag = BIO, absorb_text = "Your armor protects you from [scramble_source]!") >= 100) return FALSE From de9005fa352b1a1245599c15c407661299ff9a23 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:30:47 +0200 Subject: [PATCH 04/37] Automatic changelog for PR #29577 [ci skip] --- html/changelogs/AutoChangeLog-pr-29577.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29577.yml diff --git a/html/changelogs/AutoChangeLog-pr-29577.yml b/html/changelogs/AutoChangeLog-pr-29577.yml new file mode 100644 index 0000000000000..cde6e71ea8d8f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29577.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - rscadd: "Added salt electrolysis reaction" \ No newline at end of file From 1cd348bd27839c700092520c7c865ebbb9284d93 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:30:58 +0200 Subject: [PATCH 05/37] [MIRROR] Fixes a typo on snowdin shuttle transi(s)t consoles (#29571) * Fixes a typo on snowdin shuttle transi(s)t consoles (#86055) ## About The Pull Request Closes #86053 ## Changelog :cl: spellcheck: Fixed a typo on snowdin shuttle transi(s)t consoles /:cl: * Fixes a typo on snowdin shuttle transi(s)t consoles --------- Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> --- _maps/RandomZLevels/snowdin.dmm | 358 ++++++++++++++++---------------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index f72d9fd320724..fb40f75070ef7 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -176,6 +176,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/awaymission/snowdin/post/dorm) +"aR" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/awaystart/snowdin, +/obj/item/bedsheet/purple, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "aS" = ( /turf/closed/wall, /area/awaymission/snowdin/post/dorm) @@ -199,6 +208,14 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, /area/awaymission/snowdin/post/dorm) +"aX" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/awaystart/snowdin, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "aY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/wood, @@ -217,6 +234,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/awaymission/snowdin/post/dorm) +"bb" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/awaystart/snowdin, +/obj/item/paper/crumpled/ruins/snowdin/dontdeadopeninside, +/obj/item/bedsheet/green, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "bc" = ( /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/dark, @@ -381,20 +408,16 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post/research) -"bK" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/landmark/awaystart/snowdin, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) "bL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/spider/stickyweb, /turf/open/floor/iron/freezer, /area/awaymission/snowdin/post/kitchen) +"bM" = ( +/obj/effect/landmark/awaystart/snowdin, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/freezer, +/area/awaymission/snowdin/post/kitchen) "bN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/spider/stickyweb, @@ -1066,6 +1089,14 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) +"eh" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/landmark/awaystart/snowdin, +/obj/item/bedsheet/red, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "ei" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/wall, @@ -1117,14 +1148,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/messhall) -"ew" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/landmark/awaystart/snowdin, -/obj/item/bedsheet/red, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "ex" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, @@ -1886,11 +1909,6 @@ }, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) -"ht" = ( -/obj/structure/table, -/obj/item/trash/waffles, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) "hu" = ( /obj/structure/chair{ dir = 8 @@ -2048,6 +2066,25 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/snowdin/post/gateway) +"hR" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/landmark/awaystart/snowdin, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) +"hS" = ( +/obj/effect/landmark/awaystart/snowdin, +/obj/effect/turf_decal/loading_area, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) +"hT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/landmark/awaystart/snowdin, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) "hU" = ( /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, @@ -2256,6 +2293,29 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/engineering) +"iA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 5 + }, +/obj/effect/landmark/awaystart/snowdin, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) +"iB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 10 + }, +/obj/effect/landmark/awaystart/snowdin, +/obj/machinery/holopad, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) +"iC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/landmark/awaystart/snowdin, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) "iD" = ( /obj/structure/table, /obj/item/crowbar, @@ -2513,6 +2573,20 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post/minipost) +"ju" = ( +/obj/effect/landmark/awaystart/snowdin, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) +"jv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/landmark/awaystart/snowdin, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) "jw" = ( /obj/structure/table, /obj/item/paper/pamphlet/gateway, @@ -2567,6 +2641,15 @@ /obj/structure/cable, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) +"jE" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/awaystart/snowdin, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "jF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -2807,16 +2890,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) -"kE" = ( -/obj/structure/bed{ - dir = 4 - }, -/obj/effect/landmark/awaystart/snowdin, -/obj/item/bedsheet/nanotrasen{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/awaymission/snowdin/post/dorm) "kF" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -3441,6 +3514,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) +"mA" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/awaystart/snowdin, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "mB" = ( /obj/item/storage/toolbox/electrical, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -3687,14 +3768,6 @@ slowdown = 1 }, /area/awaymission/snowdin/outside) -"nz" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/landmark/awaystart/snowdin, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) "nA" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/item/reagent_containers/cup/bucket, @@ -5158,19 +5231,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/custodials) -"sU" = ( -/obj/effect/turf_decal/weather/snow, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/machinery/computer{ - desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; - dir = 4; - icon_screen = null; - name = "Shuttle Transist Console" - }, -/turf/open/floor/iron/dark/snowdin, -/area/awaymission/snowdin/outside) "sX" = ( /obj/item/disk/holodisk/snowdin/ripjacob, /obj/structure/cable, @@ -5248,12 +5308,6 @@ }, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/outside) -"tm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/landmark/awaystart/snowdin, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "tp" = ( /turf/closed/wall/mineral/snow, /area/awaymission/snowdin/cave/cavern) @@ -5315,14 +5369,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) -"tN" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/landmark/awaystart/snowdin, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "tQ" = ( /obj/machinery/light/small/directional/south, /obj/structure/sign/nanotrasen{ @@ -5646,6 +5692,11 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) +"vv" = ( +/obj/structure/table, +/obj/item/trash/waffles, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) "vw" = ( /obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, @@ -5761,15 +5812,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) -"wc" = ( -/obj/machinery/computer{ - desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; - dir = 1; - icon_screen = null; - name = "Shuttle Transist Console" - }, -/turf/open/floor/mineral/titanium/blue, -/area/awaymission/snowdin/post/broken_shuttle) "wd" = ( /obj/item/shard, /obj/structure/flora/grass/both/style_random, @@ -6569,11 +6611,6 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) -"zB" = ( -/obj/effect/landmark/awaystart/snowdin, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "zC" = ( /obj/structure/rack, /obj/item/grown/log/tree, @@ -6984,6 +7021,13 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) +"Be" = ( +/obj/effect/landmark/awaystart/snowdin, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/minipost) "Bf" = ( /obj/machinery/space_heater, /obj/effect/mapping_helpers/broken_floor, @@ -7430,6 +7474,16 @@ }, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"CX" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/effect/landmark/awaystart/snowdin, +/obj/item/bedsheet/nanotrasen{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/awaymission/snowdin/post/dorm) "CZ" = ( /obj/structure/frame/machine, /obj/item/stack/cable_coil{ @@ -7620,17 +7674,6 @@ /mob/living/basic/bear/snow, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/cave) -"DZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/obj/effect/landmark/awaystart/snowdin, -/obj/machinery/holopad, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "Ea" = ( /obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null @@ -7729,11 +7772,6 @@ }, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) -"Ex" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/landmark/awaystart/snowdin, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "Ez" = ( /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, @@ -7949,13 +7987,6 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) -"FH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 5 - }, -/obj/effect/landmark/awaystart/snowdin, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "FI" = ( /obj/machinery/conveyor{ id = "snowdin_belt_mine" @@ -8628,11 +8659,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) -"Jn" = ( -/obj/effect/landmark/awaystart/snowdin, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/iron/freezer, -/area/awaymission/snowdin/post/kitchen) "Jq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -9057,16 +9083,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) -"LH" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/landmark/awaystart/snowdin, -/obj/item/paper/crumpled/ruins/snowdin/dontdeadopeninside, -/obj/item/bedsheet/green, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "LI" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/decal/cleanable/blood/drip, @@ -9673,6 +9689,15 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/research) +"OY" = ( +/obj/machinery/computer{ + desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; + dir = 1; + icon_screen = null; + name = "Shuttle Transit Console" + }, +/turf/open/floor/mineral/titanium/blue, +/area/awaymission/snowdin/post/broken_shuttle) "OZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -9729,13 +9754,6 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) -"Pk" = ( -/obj/effect/landmark/awaystart/snowdin, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/minipost) "Pm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -9966,15 +9984,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/snowdin/post/engineering) -"Qy" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/landmark/awaystart/snowdin, -/obj/item/bedsheet/purple, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "Qz" = ( /obj/machinery/door/firedoor, /obj/structure/holosign/barrier/atmos, @@ -10089,6 +10098,19 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) +"QW" = ( +/obj/effect/turf_decal/weather/snow, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/computer{ + desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; + dir = 4; + icon_screen = null; + name = "Shuttle Transit Console" + }, +/turf/open/floor/iron/dark/snowdin, +/area/awaymission/snowdin/outside) "QY" = ( /obj/structure/girder, /obj/effect/turf_decal/weather/snow, @@ -10508,12 +10530,6 @@ /mob/living/basic/bear/snow, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) -"Th" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/landmark/awaystart/snowdin, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "Tk" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/asteroid/snow{ @@ -10588,15 +10604,6 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) -"TL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/landmark/awaystart/snowdin, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "TM" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -10787,13 +10794,6 @@ /obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) -"UW" = ( -/obj/effect/landmark/awaystart/snowdin, -/obj/effect/turf_decal/loading_area, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "Va" = ( /obj/structure/fence{ dir = 4 @@ -16268,7 +16268,7 @@ dB Cx eN dC -kE +CX Nb hG aK @@ -17543,7 +17543,7 @@ ae Zy Qj aK -Qy +aR Uk Nh aV @@ -18835,7 +18835,7 @@ bS cu db aV -ew +eh eW aS gm @@ -19085,7 +19085,7 @@ Zy Zy Qj aK -tN +aX XW ND aS @@ -20627,7 +20627,7 @@ Zy Zy Qj aK -LH +bb RX IC aS @@ -20716,7 +20716,7 @@ oa vN vT vY -wc +OY vM oa dX @@ -21431,7 +21431,7 @@ TI Zy ax sI -sU +QW tf tl tf @@ -21521,7 +21521,7 @@ tl tf tl tf -sU +QW sI hl Zy @@ -22438,9 +22438,9 @@ fh fG gw gw -tm -FH -zB +hR +iA +ju jY kJ lu @@ -22695,9 +22695,9 @@ fh fG gx hm -UW -DZ -TL +hS +iB +jv jZ kK lv @@ -22952,9 +22952,9 @@ fh fG fG hn -Th -Ex -zB +hT +iC +ju jY kJ lw @@ -23075,7 +23075,7 @@ Av Lw yX AY -Pk +Be yX Lz BA @@ -24484,7 +24484,7 @@ Zy Qj bf bv -Jn +bM cb cH do @@ -25007,7 +25007,7 @@ Kd ex fJ gA -ht +vv hW iH jz @@ -29122,7 +29122,7 @@ gO ic ic iN -bK +jE kh kU lM @@ -30154,7 +30154,7 @@ jH ie kY id -nz +mA mV fY Qj From bedca4cecc9489d2dc93f8c6510a47280f1cdbd1 Mon Sep 17 00:00:00 2001 From: Odairu <39929315+Odairu@users.noreply.github.com> Date: Tue, 27 Aug 2024 07:32:07 -0400 Subject: [PATCH 06/37] makes it so hands are completely unusable when in army crawl (#29579) * Update prone_mob.dm * Update prone_mob.dm --- .../code/datums/components/prone_mob.dm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/modular_skyrat/master_files/code/datums/components/prone_mob.dm b/modular_skyrat/master_files/code/datums/components/prone_mob.dm index 739187bdab320..883855ec7563a 100644 --- a/modular_skyrat/master_files/code/datums/components/prone_mob.dm +++ b/modular_skyrat/master_files/code/datums/components/prone_mob.dm @@ -5,38 +5,25 @@ if(!isliving(parent)) return COMPONENT_INCOMPATIBLE source = parent - parent.add_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING), type) + parent.add_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING, TRAIT_HANDS_BLOCKED), type) parent.add_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING), type) passtable_on(parent, type) source.layer = PROJECTILE_HIT_THRESHHOLD_LAYER /datum/component/prone_mob/RegisterWithParent() RegisterSignals(parent, list(COMSIG_MOVABLE_REMOVE_PRONE_STATE, COMSIG_LIVING_GET_PULLED), PROC_REF(stop_army_crawl)) - RegisterSignals(parent, list(COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_ITEM_ATTACK), PROC_REF(check_attack)) - RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, PROC_REF(check_pull)) /datum/component/prone_mob/UnregisterFromParent() UnregisterSignal(parent, list( COMSIG_LIVING_GET_PULLED, - COMSIG_MOB_ATTACK_HAND, - COMSIG_MOB_ITEM_ATTACK, - COMSIG_LIVING_GET_PULLED, - COMSIG_LIVING_TRY_PULL + COMSIG_LIVING_TRY_PULL, )) return ..() -/datum/component/prone_mob/proc/check_attack(mob/living/source) - SIGNAL_HANDLER - return COMPONENT_CANCEL_ATTACK_CHAIN - -/datum/component/prone_mob/proc/check_pull(mob/living/source) - SIGNAL_HANDLER - return COMSIG_LIVING_CANCEL_PULL - /datum/component/prone_mob/proc/stop_army_crawl(mob/living/source) SIGNAL_HANDLER source = parent - parent.remove_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING), type) + parent.remove_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING, TRAIT_HANDS_BLOCKED), type) passtable_off(parent, type) source.layer = MOB_LAYER qdel(src) From be8de2d20196546f53836e888462c2e6a9711e65 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:33:37 +0200 Subject: [PATCH 07/37] Automatic changelog for PR #29578 [ci skip] --- html/changelogs/AutoChangeLog-pr-29578.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29578.yml diff --git a/html/changelogs/AutoChangeLog-pr-29578.yml b/html/changelogs/AutoChangeLog-pr-29578.yml new file mode 100644 index 0000000000000..3bd6929b91f50 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29578.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Bioscrambler anomalies no longer affect inorganic species" \ No newline at end of file From 3ce8f5daa69d1b7e6446449b49580b0b79f68c78 Mon Sep 17 00:00:00 2001 From: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:34:27 +0700 Subject: [PATCH 08/37] mildoversight (#29580) Update sol_defense.dm --- .../company_imports/code/armament_datums/sol_defense.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm b/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm index d1da8ba8ca1a4..98ac561a11520 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm @@ -86,6 +86,7 @@ /datum/armament_entry/company_import/sol_defense/sidearm/eland item_type = /obj/item/gun/ballistic/revolver/sol cost = PAYCHECK_COMMAND * 4 + restricted = TRUE //You can still buy it from cargo side //If cargo decides to agree with sec on a compromise then good job @@ -131,14 +132,14 @@ cost = PAYCHECK_COMMAND * 10 contraband = TRUE //Begone -*/ + /datum/armament_entry/company_import/sol_defense/longarm/infanterie item_type = /obj/item/gun/ballistic/automatic/sol_rifle cost = PAYCHECK_COMMAND * 14 contraband = TRUE -/* These one are simply rediculous, but we'll keep it there incase someone has idea +These one are simply rediculous, but we'll keep it there incase someone has idea /datum/armament_entry/company_import/sol_defense/longarm/outomaties item_type = /obj/item/gun/ballistic/automatic/sol_rifle/machinegun cost = PAYCHECK_COMMAND * 23 From 6f0035a075133805052ece2e0fe6281c3c72d18d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:43:12 +0200 Subject: [PATCH 09/37] Automatic changelog for PR #29571 [ci skip] --- html/changelogs/AutoChangeLog-pr-29571.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29571.yml diff --git a/html/changelogs/AutoChangeLog-pr-29571.yml b/html/changelogs/AutoChangeLog-pr-29571.yml new file mode 100644 index 0000000000000..fe6f0efc612ad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29571.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - spellcheck: "Fixed a typo on snowdin shuttle transi(s)t consoles" \ No newline at end of file From b632f5913f9ec71d17e08db8d7727cab165bcbe6 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:43:47 +0200 Subject: [PATCH 10/37] Automatic changelog for PR #29579 [ci skip] --- html/changelogs/AutoChangeLog-pr-29579.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29579.yml diff --git a/html/changelogs/AutoChangeLog-pr-29579.yml b/html/changelogs/AutoChangeLog-pr-29579.yml new file mode 100644 index 0000000000000..0ab069753291f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29579.yml @@ -0,0 +1,4 @@ +author: "Odairu" +delete-after: True +changes: + - balance: "No more hands in army crawl (goodbye gbp)" \ No newline at end of file From af6c18d03158d8a7ec30ba551951f80c2abbc6b1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:54:11 +0200 Subject: [PATCH 11/37] Automatic changelog for PR #29580 [ci skip] --- html/changelogs/AutoChangeLog-pr-29580.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29580.yml diff --git a/html/changelogs/AutoChangeLog-pr-29580.yml b/html/changelogs/AutoChangeLog-pr-29580.yml new file mode 100644 index 0000000000000..893f90bc882ad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29580.yml @@ -0,0 +1,5 @@ +author: "projectkepler-ru" +delete-after: True +changes: + - bugfix: "eland not being restricted" + - bugfix: "battle rifle stillbeing puchasable normally" \ No newline at end of file From 597a3adb717251bf0453aa4c88ba17a5a8187089 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 28 Aug 2024 00:40:08 +0000 Subject: [PATCH 12/37] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-29571.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29577.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29578.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29579.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29580.yml | 5 ----- html/changelogs/archive/2024-08.yml | 10 ++++++++++ 6 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-29571.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29577.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29578.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29579.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29580.yml diff --git a/html/changelogs/AutoChangeLog-pr-29571.yml b/html/changelogs/AutoChangeLog-pr-29571.yml deleted file mode 100644 index fe6f0efc612ad..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29571.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - spellcheck: "Fixed a typo on snowdin shuttle transi(s)t consoles" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29577.yml b/html/changelogs/AutoChangeLog-pr-29577.yml deleted file mode 100644 index cde6e71ea8d8f..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29577.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - rscadd: "Added salt electrolysis reaction" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29578.yml b/html/changelogs/AutoChangeLog-pr-29578.yml deleted file mode 100644 index 3bd6929b91f50..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29578.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Bioscrambler anomalies no longer affect inorganic species" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29579.yml b/html/changelogs/AutoChangeLog-pr-29579.yml deleted file mode 100644 index 0ab069753291f..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29579.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Odairu" -delete-after: True -changes: - - balance: "No more hands in army crawl (goodbye gbp)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29580.yml b/html/changelogs/AutoChangeLog-pr-29580.yml deleted file mode 100644 index 893f90bc882ad..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29580.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "projectkepler-ru" -delete-after: True -changes: - - bugfix: "eland not being restricted" - - bugfix: "battle rifle stillbeing puchasable normally" \ No newline at end of file diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index 3c003198f0fd6..9a2d52d8e61ae 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -812,3 +812,13 @@ the IDMA Force has now succesfully repelled the attack and has shifted focus toward trying to identify the suspect involved in this attack - bugfix: weird suppresor overlay shenanigan +2024-08-28: + Odairu: + - balance: No more hands in army crawl (goodbye gbp) + SkyratBot: + - bugfix: Bioscrambler anomalies no longer affect inorganic species + - spellcheck: Fixed a typo on snowdin shuttle transi(s)t consoles + - rscadd: Added salt electrolysis reaction + projectkepler-ru: + - bugfix: eland not being restricted + - bugfix: battle rifle stillbeing puchasable normally From 58bce982e2e4e769627cabcf34813e1f2ce7d2eb Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:17:39 +0200 Subject: [PATCH 13/37] [MIRROR] Blackbox logging for remaining time on anomaly defusal (#29568) * Blackbox logging for remaining time on anomaly defusal (#86044) ## About The Pull Request Back in 2023 in PR #74666 Mothblocks said: `We really should collect data on how many people collect anomalies and how much time they had left.` Now here in 2024 it occurs to me that I don't think we actually log that information anywhere. So I added it. Please note: I don't remember how blackbox logging works so while I think this works it might not be the correct way to format the data. Please tell me if it isn't. ## Why It's Good For The Game `We really should collect data on how many people collect anomalies and how much time they had left.` ## Changelog Not player facing --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@ users.noreply.github.com> * Blackbox logging for remaining time on anomaly defusal --------- Co-authored-by: Jacquerel Co-authored-by: Zephyr <12817816+ZephyrTFA@ users.noreply.github.com> --- code/game/objects/effects/anomalies/_anomalies.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm index ce9bab6a511cc..f249d22500c30 100644 --- a/code/game/objects/effects/anomalies/_anomalies.dm +++ b/code/game/objects/effects/anomalies/_anomalies.dm @@ -95,6 +95,15 @@ /obj/effect/anomaly/proc/anomalyNeutralize() new /obj/effect/particle_effect/fluid/smoke/bad(loc) + SSblackbox.record_feedback( + "nested tally", + "anomaly_defused", + 1, + list( + "[type]", + immortal ? "immortal" : "[round((death_time - world.time) / 10)]ds time left", + ) + ) if(drops_core) if(isnull(anomaly_core)) From 3a2b9c4afd9870a36a53f14497167d012403e33e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:17:52 +0200 Subject: [PATCH 14/37] [MIRROR] Fixes access define inconsistencies for QM (#29581) * Fixes access define inconsistencies for QM (#86075) ## About The Pull Request A define change was missed when we made QM a full-fledged member of command, so it was showing up in the wrong section on Plexagon. The access was also called "Quartermaster" instead of matching the naming convention of "$abbreviation Office", so I fixed that. Fixes #86073. ![image](https://github.com/user-attachments/assets/d3289b7b-e639-43d4-9adf-47cbce9e579a) ## Why It's Good For The Game Makes it easier to find QM access at a glance (even if you're probably just going to use the drop-down). ## Changelog :cl: Vekter fix: Fixed an issue causing Quartermaster office access to show in the wrong area on Plexagon Access Management. fix: Fixed an inconsistency in the naming for QM Office access. /:cl: * Fixes access define inconsistencies for QM --------- Co-authored-by: Vekter --- code/__DEFINES/access.dm | 1 - code/controllers/subsystem/id_access.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 15dd8b04a0683..6200a86da624e 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -326,7 +326,6 @@ ACCESS_PHARMACY, \ ACCESS_PLUMBING, \ ACCESS_PSYCHOLOGY, \ - ACCESS_QM, \ ACCESS_RESEARCH, \ ACCESS_ROBOTICS, \ ACCESS_SCIENCE, \ diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index 86f2e124a8f42..6c5df16d7e737 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -291,7 +291,7 @@ SUBSYSTEM_DEF(id_access) desc_by_access["[ACCESS_VIROLOGY]"] = "Virology" desc_by_access["[ACCESS_PSYCHOLOGY]"] = "Psychology" desc_by_access["[ACCESS_CMO]"] = "CMO Office" - desc_by_access["[ACCESS_QM]"] = "Quartermaster" + desc_by_access["[ACCESS_QM]"] = "QM Office" desc_by_access["[ACCESS_SURGERY]"] = "Surgery" desc_by_access["[ACCESS_THEATRE]"] = "Theatre" desc_by_access["[ACCESS_RESEARCH]"] = "Science" From c80a04685c2970517ef78ff03f388e3184a85000 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:18:11 +0200 Subject: [PATCH 15/37] [MIRROR] Fix runtime with `convert_reagent` (#29582) * Fix runtime with `convert_reagent` (#86089) ## About The Pull Request It didn't check if the reagents pool actually had the reagent passed (ie, it did not check the result of `has_reagent`) Did some cleanup while in the area. ## Changelog :cl: Melbert fix: Juicing and grinding should break less /:cl: * Fix runtime with `convert_reagent` --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- .../reagents/chemistry/holder/holder.dm | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/holder/holder.dm b/code/modules/reagents/chemistry/holder/holder.dm index 11117142d70e5..f084a7eaa39d4 100644 --- a/code/modules/reagents/chemistry/holder/holder.dm +++ b/code/modules/reagents/chemistry/holder/holder.dm @@ -344,26 +344,29 @@ stack_trace("invalid reagent path passed to convert reagent [source_reagent_typepath]") return FALSE - var/reagent_amount - var/reagent_purity - var/reagent_ph + var/reagent_amount = 0 + var/reagent_purity = 0 + var/reagent_ph = 0 if(include_source_subtypes) reagent_ph = ph var/weighted_purity var/list/reagent_type_list = typecacheof(source_reagent_typepath) for(var/datum/reagent/reagent as anything in reagent_list) - if(reagent.type in reagent_type_list) + if(is_type_in_typecache(reagent, reagent_type_list)) weighted_purity += reagent.volume * reagent.purity reagent_amount += reagent.volume remove_reagent(reagent.type, reagent.volume * multiplier) reagent_purity = weighted_purity / reagent_amount else var/datum/reagent/source_reagent = has_reagent(source_reagent_typepath) - reagent_amount = source_reagent.volume - reagent_purity = source_reagent.purity - reagent_ph = source_reagent.ph - remove_reagent(source_reagent_typepath, reagent_amount) - add_reagent(target_reagent_typepath, reagent_amount * multiplier, reagtemp = chem_temp, added_purity = reagent_purity, added_ph = reagent_ph) + if(istype(source_reagent)) + reagent_amount = source_reagent.volume + reagent_purity = source_reagent.purity + reagent_ph = source_reagent.ph + remove_reagent(source_reagent_typepath, reagent_amount) + + if(reagent_amount > 0) + add_reagent(target_reagent_typepath, reagent_amount * multiplier, reagtemp = chem_temp, added_purity = reagent_purity, added_ph = reagent_ph) /// Removes all reagents /datum/reagents/proc/clear_reagents() From 5de20f543e9ed1b02d0158959c0f14e2d9cceaf9 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:18:15 +0200 Subject: [PATCH 16/37] Automatic changelog for PR #29581 [ci skip] --- html/changelogs/AutoChangeLog-pr-29581.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29581.yml diff --git a/html/changelogs/AutoChangeLog-pr-29581.yml b/html/changelogs/AutoChangeLog-pr-29581.yml new file mode 100644 index 0000000000000..62f8dcbd1f2f6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29581.yml @@ -0,0 +1,5 @@ +author: "Vekter" +delete-after: True +changes: + - bugfix: "Fixed an issue causing Quartermaster office access to show in the wrong area on Plexagon Access Management." + - bugfix: "Fixed an inconsistency in the naming for QM Office access." \ No newline at end of file From 1e06b3b618ff29c6da5e54cab37e89777ef3d7e5 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:18:25 +0200 Subject: [PATCH 17/37] [MIRROR] fix computer sound loop (#29583) * fix computer sound loop (#86081) ## About The Pull Request `mid_sounds = list('sound/machines/computer/computer_mid1.ogg' = 1, 'sound/machines/computer/computer_mid2.ogg' = 1)` These actually don't play if you don't set the value to 1 - added a disclaimer on this ## No one noticed this!! ## Changelog :cl: grungussuss fix: after 4 years, computer sound loop now works properly /:cl: * fix computer sound loop --------- Co-authored-by: grungussuss <96586172+Sadboysuss@users.noreply.github.com> --- code/datums/looping_sounds/_looping_sound.dm | 2 +- code/datums/looping_sounds/machinery_sounds.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 54185efdb8dda..122eab2861e99 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -2,7 +2,7 @@ * A datum for sounds that need to loop, with a high amount of configurability. */ /datum/looping_sound - /// (list or soundfile) Since this can be either a list or a single soundfile you can have random sounds. May contain further lists but must contain a soundfile at the end. + /// (list or soundfile) Since this can be either a list or a single soundfile you can have random sounds. May contain further lists but must contain a soundfile at the end. In a list, path must have also be assigned a value or it will be assigned 0 and not play. var/mid_sounds /// The length of time to wait between playing mid_sounds. var/mid_length diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index 2d5e3564e6d09..738cb61f6c580 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -116,7 +116,7 @@ start_sound = 'sound/machines/computer/computer_start.ogg' start_length = 7.2 SECONDS start_volume = 10 - mid_sounds = list('sound/machines/computer/computer_mid1.ogg', 'sound/machines/computer/computer_mid2.ogg') + mid_sounds = list('sound/machines/computer/computer_mid1.ogg' = 1, 'sound/machines/computer/computer_mid2.ogg' = 1) mid_length = 1.8 SECONDS end_sound = 'sound/machines/computer/computer_end.ogg' end_volume = 10 From d70c9399234f3f3b7e5eb534c748a5f574860a06 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:20:48 +0200 Subject: [PATCH 18/37] Automatic changelog for PR #29582 [ci skip] --- html/changelogs/AutoChangeLog-pr-29582.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29582.yml diff --git a/html/changelogs/AutoChangeLog-pr-29582.yml b/html/changelogs/AutoChangeLog-pr-29582.yml new file mode 100644 index 0000000000000..75cc76c1f3a24 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29582.yml @@ -0,0 +1,4 @@ +author: "Melbert" +delete-after: True +changes: + - bugfix: "Juicing and grinding should break less" \ No newline at end of file From 63339f5bff4fccc3adf1761c9ab0d9ccad873cd3 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:30:53 +0200 Subject: [PATCH 19/37] Automatic changelog for PR #29583 [ci skip] --- html/changelogs/AutoChangeLog-pr-29583.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29583.yml diff --git a/html/changelogs/AutoChangeLog-pr-29583.yml b/html/changelogs/AutoChangeLog-pr-29583.yml new file mode 100644 index 0000000000000..dae70dd181dab --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29583.yml @@ -0,0 +1,4 @@ +author: "grungussuss" +delete-after: True +changes: + - bugfix: "after 4 years, computer sound loop now works properly" \ No newline at end of file From c74ef9b95df67c6990c2722d26f44e788075c791 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 29 Aug 2024 02:19:43 +0200 Subject: [PATCH 20/37] [MIRROR] Revolver in roundstart holsters is on the last slot and not on first (#29586) * Revolver in roundstart holsters is on the last slot and not on first (#86023) ## Why It's Good For The Game Always have to move revolver to the last slot, and if you don't, the hotkey will give you a speedloader instead, which is very annoying sometimes(especially in deathmatch). :cl: qol: revolver in roundstart holsters is on the last slot and not on first /:cl: * Revolver in roundstart holsters is on the last slot and not on first --------- Co-authored-by: Xackii <120736708+Xackii@users.noreply.github.com> --- code/game/objects/items/storage/holsters.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index f8dee3afdc7f4..cc8a790c8ef34 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -113,8 +113,8 @@ /obj/item/storage/belt/holster/detective/full/PopulateContents() generate_items_inside(list( - /obj/item/gun/ballistic/revolver/c38/detective = 1, /obj/item/ammo_box/c38 = 2, + /obj/item/gun/ballistic/revolver/c38/detective = 1, ), src) /obj/item/storage/belt/holster/detective/full/ert @@ -126,8 +126,8 @@ /obj/item/storage/belt/holster/detective/full/ert/PopulateContents() generate_items_inside(list( - /obj/item/gun/ballistic/automatic/pistol/m1911 = 1, /obj/item/ammo_box/magazine/m45 = 2, + /obj/item/gun/ballistic/automatic/pistol/m1911 = 1, ),src) /obj/item/storage/belt/holster/chameleon @@ -197,8 +197,8 @@ /obj/item/storage/belt/holster/nukie/cowboy/full/PopulateContents() generate_items_inside(list( - /obj/item/gun/ballistic/revolver/syndicate/cowboy/nuclear = 1, /obj/item/ammo_box/a357 = 2, + /obj/item/gun/ballistic/revolver/syndicate/cowboy/nuclear = 1, ), src) From 36529582b342e95c74285424c885bc3490df6b9e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 29 Aug 2024 02:20:06 +0200 Subject: [PATCH 21/37] Automatic changelog for PR #29586 [ci skip] --- html/changelogs/AutoChangeLog-pr-29586.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29586.yml diff --git a/html/changelogs/AutoChangeLog-pr-29586.yml b/html/changelogs/AutoChangeLog-pr-29586.yml new file mode 100644 index 0000000000000..416b77d4ba174 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29586.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - qol: "revolver in roundstart holsters is on the last slot and not on first" \ No newline at end of file From 64f5a86c938c5729b82300b8867af074cb588a36 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 29 Aug 2024 00:40:26 +0000 Subject: [PATCH 22/37] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-29581.yml | 5 ----- html/changelogs/AutoChangeLog-pr-29582.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29583.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29586.yml | 4 ---- html/changelogs/archive/2024-08.yml | 11 +++++++++++ 5 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-29581.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29582.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29583.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29586.yml diff --git a/html/changelogs/AutoChangeLog-pr-29581.yml b/html/changelogs/AutoChangeLog-pr-29581.yml deleted file mode 100644 index 62f8dcbd1f2f6..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29581.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Vekter" -delete-after: True -changes: - - bugfix: "Fixed an issue causing Quartermaster office access to show in the wrong area on Plexagon Access Management." - - bugfix: "Fixed an inconsistency in the naming for QM Office access." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29582.yml b/html/changelogs/AutoChangeLog-pr-29582.yml deleted file mode 100644 index 75cc76c1f3a24..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29582.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Melbert" -delete-after: True -changes: - - bugfix: "Juicing and grinding should break less" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29583.yml b/html/changelogs/AutoChangeLog-pr-29583.yml deleted file mode 100644 index dae70dd181dab..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29583.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "grungussuss" -delete-after: True -changes: - - bugfix: "after 4 years, computer sound loop now works properly" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29586.yml b/html/changelogs/AutoChangeLog-pr-29586.yml deleted file mode 100644 index 416b77d4ba174..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29586.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - qol: "revolver in roundstart holsters is on the last slot and not on first" \ No newline at end of file diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index 9a2d52d8e61ae..993f5b556db07 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -822,3 +822,14 @@ projectkepler-ru: - bugfix: eland not being restricted - bugfix: battle rifle stillbeing puchasable normally +2024-08-29: + Melbert: + - bugfix: Juicing and grinding should break less + SkyratBot: + - qol: revolver in roundstart holsters is on the last slot and not on first + Vekter: + - bugfix: Fixed an issue causing Quartermaster office access to show in the wrong + area on Plexagon Access Management. + - bugfix: Fixed an inconsistency in the naming for QM Office access. + grungussuss: + - bugfix: after 4 years, computer sound loop now works properly From b34da5ed8d3cb6d06165280b73cf0ae45b7e2c10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:20:01 +0700 Subject: [PATCH 23/37] Bump webpack from 5.91.0 to 5.94.0 in /tgui (#29590) Bumps [webpack](https://github.com/webpack/webpack) from 5.91.0 to 5.94.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.91.0...v5.94.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tgui/package.json | 2 +- tgui/yarn.lock | 55 +++++++++++++++-------------------------------- 2 files changed, 18 insertions(+), 39 deletions(-) diff --git a/tgui/package.json b/tgui/package.json index bb59cc24c7464..332f0ec273de5 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -50,7 +50,7 @@ "swc-loader": "^0.2.6", "typescript": "^5.4.3", "url-loader": "^4.1.1", - "webpack": "^5.91.0", + "webpack": "^5.94.0", "webpack-bundle-analyzer": "^4.10.1", "webpack-cli": "^5.1.4" } diff --git a/tgui/yarn.lock b/tgui/yarn.lock index fccdc9d25f942..b8203094cb8a9 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -1348,27 +1348,7 @@ __metadata: languageName: node linkType: hard -"@types/eslint-scope@npm:^3.7.3": - version: 3.7.7 - resolution: "@types/eslint-scope@npm:3.7.7" - dependencies: - "@types/eslint": "npm:*" - "@types/estree": "npm:*" - checksum: 10c0/a0ecbdf2f03912679440550817ff77ef39a30fa8bfdacaf6372b88b1f931828aec392f52283240f0d648cf3055c5ddc564544a626bcf245f3d09fcb099ebe3cc - languageName: node - linkType: hard - -"@types/eslint@npm:*": - version: 8.56.7 - resolution: "@types/eslint@npm:8.56.7" - dependencies: - "@types/estree": "npm:*" - "@types/json-schema": "npm:*" - checksum: 10c0/159bb5ae2f78d905b9263240c75d07b60c26e1bcaecee8c775a7bb0cf7362f5dcdd286259ba6289ab62f989b87048090b2420619f7170a0abbd83cb68b5e0699 - languageName: node - linkType: hard - -"@types/estree@npm:*, @types/estree@npm:^1.0.5": +"@types/estree@npm:^1.0.5": version: 1.0.5 resolution: "@types/estree@npm:1.0.5" checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d @@ -1430,7 +1410,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db @@ -1854,12 +1834,12 @@ __metadata: languageName: node linkType: hard -"acorn-import-assertions@npm:^1.9.0": - version: 1.9.0 - resolution: "acorn-import-assertions@npm:1.9.0" +"acorn-import-attributes@npm:^1.9.5": + version: 1.9.5 + resolution: "acorn-import-attributes@npm:1.9.5" peerDependencies: acorn: ^8 - checksum: 10c0/3b4a194e128efdc9b86c2b1544f623aba4c1aa70d638f8ab7dc3971a5b4aa4c57bd62f99af6e5325bb5973c55863b4112e708a6f408bad7a138647ca72283afe + checksum: 10c0/5926eaaead2326d5a86f322ff1b617b0f698aa61dc719a5baa0e9d955c9885cc71febac3fb5bacff71bbf2c4f9c12db2056883c68c53eb962c048b952e1e013d languageName: node linkType: hard @@ -3221,13 +3201,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.16.0": - version: 5.16.0 - resolution: "enhanced-resolve@npm:5.16.0" +"enhanced-resolve@npm:^5.17.1": + version: 5.17.1 + resolution: "enhanced-resolve@npm:5.17.1" dependencies: graceful-fs: "npm:^4.2.4" tapable: "npm:^2.2.0" - checksum: 10c0/dd69669cbb638ccacefd03e04d5e195ee6a99b7f5f8012f86d2df7781834de357923e06064ea621137c4ce0b37cc12b872b4e6d1ac6ab15fe98e7f1dfbbb08c4 + checksum: 10c0/81a0515675eca17efdba2cf5bad87abc91a528fc1191aad50e275e74f045b41506167d420099022da7181c8d787170ea41e4a11a0b10b7a16f6237daecb15370 languageName: node linkType: hard @@ -8376,7 +8356,7 @@ __metadata: swc-loader: "npm:^0.2.6" typescript: "npm:^5.4.3" url-loader: "npm:^4.1.1" - webpack: "npm:^5.91.0" + webpack: "npm:^5.94.0" webpack-bundle-analyzer: "npm:^4.10.1" webpack-cli: "npm:^5.1.4" languageName: unknown @@ -8962,20 +8942,19 @@ __metadata: languageName: node linkType: hard -"webpack@npm:^5.91.0": - version: 5.91.0 - resolution: "webpack@npm:5.91.0" +"webpack@npm:^5.94.0": + version: 5.94.0 + resolution: "webpack@npm:5.94.0" dependencies: - "@types/eslint-scope": "npm:^3.7.3" "@types/estree": "npm:^1.0.5" "@webassemblyjs/ast": "npm:^1.12.1" "@webassemblyjs/wasm-edit": "npm:^1.12.1" "@webassemblyjs/wasm-parser": "npm:^1.12.1" acorn: "npm:^8.7.1" - acorn-import-assertions: "npm:^1.9.0" + acorn-import-attributes: "npm:^1.9.5" browserslist: "npm:^4.21.10" chrome-trace-event: "npm:^1.0.2" - enhanced-resolve: "npm:^5.16.0" + enhanced-resolve: "npm:^5.17.1" es-module-lexer: "npm:^1.2.1" eslint-scope: "npm:5.1.1" events: "npm:^3.2.0" @@ -8995,7 +8974,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 10c0/74a3e0ea1c9a492accf035317f31769ffeaaab415811524b9f17bc7bf7012c5b6e1a9860df5ca6903f3ae2618727b801eb47d9351a2595dfffb25941d368b88c + checksum: 10c0/b4d1b751f634079bd177a89eef84d80fa5bb8d6fc15d72ab40fc2b9ca5167a79b56585e1a849e9e27e259803ee5c4365cb719e54af70a43c06358ec268ff4ebf languageName: node linkType: hard From 46f9d432af9e4784041d13c44ce3811668f7dcdc Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Aug 2024 07:20:48 +0200 Subject: [PATCH 24/37] [MIRROR] Removes a no longer used fish variable. (#29591) * Removes a no longer used fish variable. (#86105) ## About The Pull Request Since Ben revamped the fish analyzer, this variable is no longer used. Frankly it could as well be removed. Knowing the family history of a fish really isn't in the top 100 things to do before being robusted in maints. ## Why It's Good For The Game Unused var. ## Changelog N/A. * Removes a no longer used fish variable. --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/fishing/fish/_fish.dm | 9 --------- code/modules/fishing/sources/source_types.dm | 1 - 2 files changed, 10 deletions(-) diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 509215e350766..6c13da95050b7 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -82,8 +82,6 @@ var/list/compatible_types /// A list of possible evolutions. If set, offsprings may be of a different, new fish type if conditions are met. var/list/evolution_types - /// The species' name(s) of the parents of the fish. Shown by the fish analyzer. - var/progenitors // Fishing related properties @@ -160,7 +158,6 @@ if(apply_qualities) apply_traits() //Make sure traits are applied before size and weight. update_size_and_weight() - progenitors = full_capitalize(name) //default value register_evolutions() @@ -556,12 +553,6 @@ partner.breeding_wait = world.time + breeding_timeout else //Make a close of this fish. new_fish.update_size_and_weight(size, weight, TRUE) - new_fish.progenitors = initial(name) - if(partner && type != partner.type) - var/string = "[initial(name)] - [initial(partner.name)]" - new_fish.progenitors = full_capitalize(string) - else - new_fish.progenitors = full_capitalize(initial(name)) breeding_wait = world.time + breeding_timeout diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm index e7192bbd09c7d..d26977f195bd9 100644 --- a/code/modules/fishing/sources/source_types.dm +++ b/code/modules/fishing/sources/source_types.dm @@ -180,7 +180,6 @@ new_traits |= pick_weight(weighted_traits) caught_fish.inherit_traits(new_traits) caught_fish.randomize_size_and_weight(deviation = 0.3) - caught_fish.progenitors = full_capitalize(caught_fish.name) return caught_fish From c0ae388edf4f49d1b1639777a03e675faa35e3ab Mon Sep 17 00:00:00 2001 From: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Date: Fri, 30 Aug 2024 00:03:52 -0700 Subject: [PATCH 25/37] Fix Blueshift cargo shuttle buttons/conveyor (#29594) * fix cargo * okay? --- _maps/map_files/NSVBlueshift/Blueshift.dmm | 29 ++++++++++------------ _maps/shuttles/skyrat/cargo_skyrat.dmm | 4 +-- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index 3c6daff156c13..537943f66e9e7 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -2271,7 +2271,6 @@ c_tag = "Cargo Bay - Starboard"; name = "cargo camera" }, -/obj/machinery/light/directional/east, /turf/open/floor/plating, /area/station/cargo/storage) "axk" = ( @@ -4830,11 +4829,11 @@ /turf/open/floor/wood, /area/station/security/courtroom) "aYi" = ( -/obj/machinery/door/airlock/external{ +/obj/machinery/door/airlock/external/glass{ name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/supply/general, -/turf/open/floor/iron, +/turf/open/floor/iron/smooth, /area/station/cargo/storage) "aYj" = ( /obj/structure/cable, @@ -23568,11 +23567,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/conveyor{ - dir = 1; - id = "cargoload" - }, -/turf/open/floor/plating, +/turf/open/floor/iron/smooth, /area/station/cargo/storage) "eyt" = ( /obj/machinery/light/small/directional/south, @@ -38938,7 +38933,7 @@ /obj/effect/turf_decal/caution/stand_clear{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/smooth_large, /area/station/cargo/storage) "hvV" = ( /obj/structure/table/reinforced, @@ -59140,7 +59135,8 @@ /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/qm) "lov" = ( -/obj/machinery/conveyor{ +/obj/machinery/conveyor/inverted{ + dir = 5; id = "cargoload" }, /obj/machinery/airalarm/directional/north, @@ -86065,8 +86061,8 @@ /turf/open/floor/glass/reinforced, /area/station/security/prison/safe) "qvW" = ( -/obj/machinery/conveyor/inverted{ - dir = 6; +/obj/machinery/conveyor{ + dir = 8; id = "cargoload" }, /turf/open/floor/plating, @@ -101984,6 +101980,7 @@ id = "cargounload" }, /obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/light/directional/east, /turf/open/floor/plating, /area/station/cargo/storage) "txP" = ( @@ -168523,11 +168520,11 @@ eym kGC gaG aYi -kGC +ilS aYi bka kGC -kGC +pWU sej kGC ilS @@ -168780,7 +168777,7 @@ kGC kGC mAN hvU -pWU +kGC hvU sEm kGC @@ -169037,7 +169034,7 @@ eeU kGC gaG aYi -kGC +pWU aYi bka kGC diff --git a/_maps/shuttles/skyrat/cargo_skyrat.dmm b/_maps/shuttles/skyrat/cargo_skyrat.dmm index 1d49e06971108..f906a0248425d 100644 --- a/_maps/shuttles/skyrat/cargo_skyrat.dmm +++ b/_maps/shuttles/skyrat/cargo_skyrat.dmm @@ -111,7 +111,7 @@ "uk" = ( /obj/machinery/conveyor{ dir = 8; - id = "QMLoad" + id = "cargoload" }, /obj/machinery/door/poddoor{ id = "QMLoaddoor"; @@ -194,7 +194,7 @@ "Xz" = ( /obj/machinery/conveyor{ dir = 4; - id = "QMLoad2" + id = "cargounload" }, /obj/machinery/door/poddoor{ id = "QMLoaddoor2"; From b75f930249b4ae681ce9bfa46e84af95b208ae79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 14:04:07 +0700 Subject: [PATCH 26/37] Bump micromatch from 4.0.5 to 4.0.8 in /tgui (#29593) Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8) --- updated-dependencies: - dependency-name: micromatch dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tgui/yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tgui/yarn.lock b/tgui/yarn.lock index b8203094cb8a9..298f467b80f99 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -2349,7 +2349,7 @@ __metadata: languageName: node linkType: hard -"braces@npm:^3.0.2, braces@npm:~3.0.2": +"braces@npm:^3.0.3, braces@npm:~3.0.2": version: 3.0.3 resolution: "braces@npm:3.0.3" dependencies: @@ -6149,12 +6149,12 @@ __metadata: linkType: hard "micromatch@npm:^4.0.4": - version: 4.0.5 - resolution: "micromatch@npm:4.0.5" + version: 4.0.8 + resolution: "micromatch@npm:4.0.8" dependencies: - braces: "npm:^3.0.2" + braces: "npm:^3.0.3" picomatch: "npm:^2.3.1" - checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff + checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8 languageName: node linkType: hard From be115f1a271f9d2febf707cdb6d46a1ec7fefd44 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:04:16 +0200 Subject: [PATCH 27/37] Automatic changelog for PR #29594 [ci skip] --- html/changelogs/AutoChangeLog-pr-29594.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29594.yml diff --git a/html/changelogs/AutoChangeLog-pr-29594.yml b/html/changelogs/AutoChangeLog-pr-29594.yml new file mode 100644 index 0000000000000..dfb3ca3692bbe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29594.yml @@ -0,0 +1,5 @@ +author: "LT3" +delete-after: True +changes: + - bugfix: "Blueshift's cargo shuttle buttons are no longer trapped under glass windows" + - bugfix: "Blueshift's cargo shuttle conveyors are properly linked" \ No newline at end of file From 2831233d09c4c270354be33e22794bb959b76cc9 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:04:26 +0200 Subject: [PATCH 28/37] [MIRROR] Stagger animation is no longer horrilbly jittery (#29587) * Stagger animation is no longer horrilbly jittery (#86027) ## About The Pull Request ANIMATION_PARALLEL and random loop was messing it up heavily, plus you only swayed to one side. Now its smoother, no longer teleports you around and you don't snap to the center of the tile the moment you unstagger ## Why It's Good For The Game Current stagger animation is rather ugly and jittery, this should help fix its visuals. ## Changelog :cl: fix: Stagger animation is no longer horrilbly jittery /:cl: * Stagger animation is no longer horrilbly jittery --------- Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> --- code/datums/status_effects/debuffs/staggered.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/datums/status_effects/debuffs/staggered.dm b/code/datums/status_effects/debuffs/staggered.dm index 9db72e1fd06ee..1291da1307a61 100644 --- a/code/datums/status_effects/debuffs/staggered.dm +++ b/code/datums/status_effects/debuffs/staggered.dm @@ -4,7 +4,7 @@ /// Staggered can occur most often via shoving, but can also occur in other places too. /datum/status_effect/staggered id = "staggered" - tick_interval = 0.5 SECONDS + tick_interval = 0.8 SECONDS alert_type = null remove_on_fullheal = TRUE @@ -25,7 +25,7 @@ UnregisterSignal(owner, COMSIG_LIVING_DEATH) owner.remove_movespeed_modifier(/datum/movespeed_modifier/staggered) // Resetting both X on remove so we're back to normal - owner.pixel_x = owner.base_pixel_x + animate(owner, pixel_x = owner.base_pixel_x, time = 0.2 SECONDS, flags = ANIMATION_PARALLEL) /// Signal proc that self deletes our staggered effect /datum/status_effect/staggered/proc/clear_staggered(datum/source) @@ -40,13 +40,16 @@ return if(HAS_TRAIT(owner, TRAIT_FAKEDEATH)) return - owner.do_stagger_animation() + INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob/living, do_stagger_animation)) /// Helper proc that causes the mob to do a stagger animation. /// Doesn't change significantly, just meant to represent swaying back and forth /mob/living/proc/do_stagger_animation() - animate(src, pixel_x = 4, time = 0.2 SECONDS, loop = 6, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL) - animate(pixel_x = -4, time = 0.2 SECONDS, flags = ANIMATION_RELATIVE) + animate(src, pixel_x = 4, time = 0.2 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL) + sleep(0.2 SECONDS) + animate(src, pixel_x = -8, time = 0.2 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL) + sleep(0.2 SECONDS) + animate(src, pixel_x = 4, time = 0.2 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL) /// Status effect specifically for instances where someone is vulnerable to being stunned when shoved. /datum/status_effect/next_shove_stuns From 20aa0f2c6668bfa811c725a9be6fe9cf1486071b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:04:58 +0200 Subject: [PATCH 29/37] [MIRROR] Reverts accidental .gitignore changes (#29585) Reverts accidental .gitignore changes Co-authored-by: AnturK --- .gitignore | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index ae125254922ef..7889e8a6cf70c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,8 +25,6 @@ # Ignore compiled linux libs in the root folder, e.g. librust_g.so /*.so -# - #Ignore compiled files and other files generated during compilation. *.mdme *.mdme.* @@ -37,16 +35,6 @@ *.lk *.int *.backup - -# Ignore tools ported over from SpacemanDMM for personal use -.fingerprint -build/ -deps/ -incremental/ -dmm-tools.exe -dmm-tools.d -git-diagnostics-2024-08-11-1513.zip - ### https://raw.github.com/github/gitignore/cc542de017c606138a87ee4880e5f06b3a306def/Global/Linux.gitignore *~ @@ -264,5 +252,8 @@ define_sanity_output.txt # Running OpenDream locally tgstation.json +<<<<<<< HEAD .cargo-lock >>>>>>> 5d81843b3302 (Raptor faction fix (#85792)) +======= +>>>>>>> 8fa9db8869f0 (Reverts accidental .gitignore changes (#86114)) From 8aa09073e89ccf31961d9de96b34e0386b6be126 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:07:27 +0200 Subject: [PATCH 30/37] Automatic changelog for PR #29587 [ci skip] --- html/changelogs/AutoChangeLog-pr-29587.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29587.yml diff --git a/html/changelogs/AutoChangeLog-pr-29587.yml b/html/changelogs/AutoChangeLog-pr-29587.yml new file mode 100644 index 0000000000000..9f6513b8da825 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29587.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Stagger animation is no longer horrilbly jittery" \ No newline at end of file From 7c226fb45dc3c32c8e66e5698a2fbd9230d00341 Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:57:17 +0200 Subject: [PATCH 31/37] [no gbp] Allows anyone to use the larger part sizes (#29595) Balls 2.0 --- code/__DEFINES/~skyrat_defines/DNA.dm | 6 ---- .../modules/client/preferences/genitals.dm | 34 ++----------------- .../modules/surgery/organs/genitals.dm | 4 +-- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/code/__DEFINES/~skyrat_defines/DNA.dm b/code/__DEFINES/~skyrat_defines/DNA.dm index d8c48d4506642..bec7a87da318c 100644 --- a/code/__DEFINES/~skyrat_defines/DNA.dm +++ b/code/__DEFINES/~skyrat_defines/DNA.dm @@ -70,19 +70,13 @@ //In inches #define PENIS_MIN_GIRTH PENIS_MIN_LENGTH #define PENIS_MAX_GIRTH 20 -/// for non oversized mobs with a 'normal' body size -#define PENIS_MAX_GIRTH_NORMAL_SIZED 15 #define PENIS_DEFAULT_GIRTH 5 // a lil big but not by much #define PENIS_MIN_LENGTH 1 #define PENIS_MAX_LENGTH 36 -/// for non oversized mobs with a 'normal' body size -#define PENIS_MAX_LENGTH_NORMAL_SIZED 20 #define PENIS_DEFAULT_LENGTH 6 //still a lil long but not insane #define TESTICLES_MIN_SIZE 0 #define TESTICLES_MAX_SIZE 6 -/// for non oversized mobs with a 'normal' body size -#define TESTICLES_MAX_NORMAL_SIZED 3 #define SHEATH_NONE "None" #define SHEATH_NORMAL "Sheath" diff --git a/modular_skyrat/master_files/code/modules/client/preferences/genitals.dm b/modular_skyrat/master_files/code/modules/client/preferences/genitals.dm index 8c89617fa168d..7bc229b0d0a1b 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/genitals.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/genitals.dm @@ -199,24 +199,9 @@ var/part_enabled = is_factual_sprite_accessory(relevant_mutant_bodypart, preferences.read_preference(/datum/preference/choiced/genital/penis)) return erp_allowed && part_enabled && (passed_initial_check || allowed) -/// The difference between the absolute max length and the length for normal sized mobs -#define PENIS_LENGTH_ABOVE_NORMAL PENIS_MAX_LENGTH - PENIS_MAX_LENGTH_NORMAL_SIZED - /datum/preference/numeric/penis_length/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) - // Adjust allowed size based on character size - var/body_size = preferences?.read_preference(/datum/preference/numeric/body_size) || BODY_SIZE_NORMAL - var/has_oversized_quirk = preferences?.all_quirks.Find(/datum/quirk/oversized::name) - // Clamp this for normal sized characters. Max allowed size is proportional to the mob's body_size, rounded up. - if(!has_oversized_quirk) - var/adjusted_size = PENIS_MAX_LENGTH_NORMAL_SIZED - if(body_size > 1) - adjusted_size = ceil(round(PENIS_MAX_LENGTH_NORMAL_SIZED, step) + ((((body_size - round(1, step)) * round(2, step))) * round(PENIS_LENGTH_ABOVE_NORMAL, step))) // floating point inaccuracy fun - if(value > adjusted_size) - value = adjusted_size target.dna.features["penis_size"] = value -#undef PENIS_LENGTH_ABOVE_NORMAL - /datum/preference/numeric/penis_length/create_default_value() // if you change from this to PENIS_MAX_LENGTH the game should laugh at you return round(max(PENIS_MIN_LENGTH, PENIS_DEFAULT_LENGTH)) @@ -235,24 +220,9 @@ var/part_enabled = is_factual_sprite_accessory(relevant_mutant_bodypart, preferences.read_preference(/datum/preference/choiced/genital/penis)) return erp_allowed && part_enabled && (passed_initial_check || allowed) -/// The difference between the absolute max girth and the girth for normal sized mobs -#define PENIS_GIRTH_ABOVE_NORMAL PENIS_MAX_GIRTH - PENIS_MAX_GIRTH_NORMAL_SIZED - /datum/preference/numeric/penis_girth/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) - // Adjust allowed size based on character size - var/body_size = preferences?.read_preference(/datum/preference/numeric/body_size) || BODY_SIZE_NORMAL - var/has_oversized_quirk = preferences?.all_quirks.Find(/datum/quirk/oversized::name) - // Clamp this for normal sized characters. Max allowed size is proportional to the mob's body_size, rounded up. - if(!has_oversized_quirk) - var/adjusted_size = PENIS_MAX_GIRTH_NORMAL_SIZED - if(body_size > 1) - adjusted_size = ceil(round(PENIS_MAX_GIRTH_NORMAL_SIZED, step) + ((((body_size - round(1, step)) * round(2, step))) * round(PENIS_GIRTH_ABOVE_NORMAL, step))) // floating point inaccuracy fun - if(value > adjusted_size) - value = adjusted_size target.dna.features["penis_girth"] = value -#undef PENIS_GIRTH_ABOVE_NORMAL - /datum/preference/numeric/penis_girth/create_default_value() return round(max(PENIS_MIN_GIRTH, PENIS_DEFAULT_GIRTH)) @@ -352,8 +322,8 @@ savefile_identifier = PREFERENCE_CHARACTER savefile_key = "balls_size" relevant_mutant_bodypart = ORGAN_SLOT_TESTICLES - minimum = 0 - maximum = 6 + minimum = TESTICLES_MIN_SIZE + maximum = TESTICLES_MAX_SIZE /datum/preference/numeric/balls_size/is_accessible(datum/preferences/preferences) var/passed_initial_check = ..(preferences) diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm index 68e72da16c2bd..4708d892bd517 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm @@ -259,7 +259,7 @@ layers = EXTERNAL_ADJACENT | EXTERNAL_BEHIND /obj/item/organ/external/genital/testicles/update_genital_icon_state() - var/measured_size = clamp(genital_size, 1, 6) + var/measured_size = clamp(genital_size, 1, TESTICLES_MAX_SIZE) var/passed_string = "testicles_[genital_type]_[measured_size]" if(uses_skintones) passed_string += "_s" @@ -283,7 +283,7 @@ /obj/item/organ/external/genital/testicles/get_sprite_size_string() var/measured_size = FLOOR(genital_size,1) - measured_size = clamp(measured_size, 0, 6) + measured_size = clamp(measured_size, 0, TESTICLES_MAX_SIZE) var/passed_string = "[genital_type]_[measured_size]" if(uses_skintones) passed_string += "_s" From 003a925c270eaac0dc1538ca271fe3121586d306 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:57:39 +0200 Subject: [PATCH 32/37] Automatic changelog for PR #29595 [ci skip] --- html/changelogs/AutoChangeLog-pr-29595.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29595.yml diff --git a/html/changelogs/AutoChangeLog-pr-29595.yml b/html/changelogs/AutoChangeLog-pr-29595.yml new file mode 100644 index 0000000000000..75a52328828f4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29595.yml @@ -0,0 +1,4 @@ +author: "Majkl-J" +delete-after: True +changes: + - balance: "You can now use larger dick sizes no matter the character size" \ No newline at end of file From 5f9ef28700aff63e4076f60a6d28ac0e299a0516 Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:43:44 +0200 Subject: [PATCH 33/37] [MISSED MIRROR] Storing supermatter sliver in a specialized container no longer dusts you (#84492) (#29597) Storing supermatter sliver in a specialized container no longer dusts you (#84492) ## About The Pull Request Melee attack chain rework strikes again. Closes #84398 Moved interaction logic into tongues and allowed them to actually handle attack code beyond dusting people. ## Changelog :cl: fix: You no longer get dusted upon trying to store your supermatter sliver. /:cl: Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> --- code/game/objects/items/theft_tools.dm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index 41edfaea37e88..e13251fe8e5ea 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -247,13 +247,6 @@ if(ismob(loc)) to_chat(loc, span_warning("[src] is permanently sealed, [sliver] is safely contained.")) -/obj/item/nuke_core_container/supermatter/attackby(obj/item/hemostat/supermatter/tongs, mob/user) - if(istype(tongs)) - //try to load shard into core - load(tongs, user) - else - return ..() - /obj/item/scalpel/supermatter name = "supermatter scalpel" desc = "A scalpel with a fragile tip of condensed hyper-noblium gas, searingly cold to the touch, that can safely shave a sliver off a supermatter crystal." @@ -295,11 +288,15 @@ /obj/item/hemostat/supermatter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!sliver) - return NONE + return ..() + if (istype(interacting_with, /obj/item/nuke_core_container/supermatter)) + var/obj/item/nuke_core_container/supermatter/container = interacting_with + container.load(src, user) + return ITEM_INTERACT_SUCCESS if(ismovable(interacting_with) && interacting_with != sliver) Consume(interacting_with, user) return ITEM_INTERACT_SUCCESS - return NONE + return ..() /obj/item/hemostat/supermatter/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) // no instakill supermatter javelins if(sliver) From 9f33b56e16d1ddfcb08f3338841e7e4bd4f2b4e6 Mon Sep 17 00:00:00 2001 From: thegrb93 Date: Fri, 30 Aug 2024 06:44:06 -0400 Subject: [PATCH 34/37] Fixes deconstruction of lewd machines (#29596) --- .../code/lewd_machinery/milking_machine.dm | 7 +------ .../code/lewd_structures/bdsm_furniture.dm | 15 ++------------- .../code/lewd_structures/construction.dm | 5 ++--- .../code/lewd_structures/dancing_pole.dm | 5 ----- .../code/lewd_structures/shibari_stand.dm | 7 +------ 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm index eef5f958eb419..e2ee0e9a13680 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm @@ -408,18 +408,13 @@ current_mob.adjust_pain(pain_amounts[current_mode] * seconds_per_tick) /obj/structure/chair/milking_machine/click_ctrl_shift(mob/user) - . = ..() - if(. == FALSE) - return FALSE - to_chat(user, span_notice("You begin to disassemble [src]...")) if(!do_after(user, 8 SECONDS, src)) to_chat(user, span_warning("You fail to disassemble [src]!")) - return FALSE + return deconstruct(TRUE) to_chat(user, span_notice("You disassemble [src].")) - return TRUE // Machine deconstruction process handler /obj/structure/chair/milking_machine/atom_deconstruct(disassembled) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm index ade6b6cdcd83f..80980aa9bb87c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm @@ -55,23 +55,17 @@ affected_mob.pixel_y = affected_mob.base_pixel_y + affected_mob.body_position_pixel_y_offset /obj/structure/bed/bdsm_bed/click_ctrl_shift(mob/user) - . = ..() - if(. == FALSE) - return FALSE - add_fingerprint(user) to_chat(user, span_notice("You begin unfastening the frame of [src] and deflating the latex pillows...")) if(!do_after(user, 8 SECONDS, src)) to_chat(user, span_warning("You fail to disassemble [src].")) - return FALSE + return to_chat(user, span_notice("You disassemble [src].")) var/obj/item/construction_kit/bdsm/bed/created_kit = new created_kit.forceMove(loc) qdel(src) - return TRUE - /obj/structure/bed/bdsm_bed/Destroy() unbuckle_all_mobs(TRUE) return ..() @@ -289,20 +283,15 @@ */ /obj/structure/chair/x_stand/click_ctrl_shift(mob/user) - . = ..() - if(. == FALSE) - return FALSE - add_fingerprint(user) to_chat(user, span_notice("You begin unfastening the frame of [src]...")) if(!do_after(user, 8 SECONDS, src)) - return FALSE + return to_chat(user, span_notice("You disassemble [src].")) new /obj/item/construction_kit/bdsm/x_stand(loc) unbuckle_all_mobs() qdel(src) - return TRUE /obj/structure/chair/x_stand/examine(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/construction.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/construction.dm index 711ea3f970087..c8930f51c6814 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/construction.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/construction.dm @@ -22,12 +22,12 @@ /obj/item/construction_kit/click_ctrl_shift(mob/user) if((item_flags & IN_INVENTORY) || (item_flags & IN_STORAGE)) - return FALSE + return to_chat(user, span_notice("You begin to assemble [src]...")) if(!do_after(user, construction_time, src)) to_chat(user, span_warning("You fail to assemble [src]!")) - return FALSE + return var/obj/structure/chair/final_structure = new resulting_structure (get_turf(user)) if(current_color && istype(final_structure, /obj/structure/chair/milking_machine)) @@ -45,7 +45,6 @@ qdel(src) to_chat(user, span_notice("You assemble [src].")) - return TRUE // MILKER diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm index 65b0c14bf0516..8f98e0b2f9b23 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm @@ -154,10 +154,6 @@ dancer = null /obj/structure/stripper_pole/click_ctrl_shift(mob/user) - . = ..() - if(. == FALSE) - return FALSE - add_fingerprint(user) balloon_alert(user, "disassembling...") if(!do_after(user, 8 SECONDS, src)) @@ -167,7 +163,6 @@ balloon_alert(user, "disassembled") new /obj/item/construction_kit/pole(get_turf(user)) qdel(src) - return TRUE /obj/structure/stripper_pole/examine(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm index 421a28240d2b8..e9c0a2ad3aa73 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm @@ -188,21 +188,16 @@ //Disassembling shibari stand /obj/structure/chair/shibari_stand/click_ctrl_shift(mob/user) - . = ..() - if(. == FALSE) - return FALSE - to_chat(user, span_notice("You begin unfastening the frame of \the [src]...")) if(!do_after(user, 8 SECONDS, src)) to_chat(user, span_warning("You fail to disassemble \the [src].")) - return FALSE + return to_chat(user, span_notice("You disassemble \the [src].")) var/obj/item/construction_kit/bdsm/shibari/kit = new(get_turf(src)) kit.set_greyscale(greyscale_colors) unbuckle_all_mobs() qdel(src) - return TRUE //Changing color of shibari stand /obj/structure/chair/shibari_stand/click_ctrl(mob/user) From 8f854169859270f85586badf2e51734e40eb7a9d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:44:08 +0200 Subject: [PATCH 35/37] Automatic changelog for PR #29597 [ci skip] --- html/changelogs/AutoChangeLog-pr-29597.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29597.yml diff --git a/html/changelogs/AutoChangeLog-pr-29597.yml b/html/changelogs/AutoChangeLog-pr-29597.yml new file mode 100644 index 0000000000000..0a8591f80f8a4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29597.yml @@ -0,0 +1,4 @@ +author: "Majkl-J" +delete-after: True +changes: + - bugfix: "You no longer get dusted upon trying to store your supermatter sliver." \ No newline at end of file From d08176ad717a5939381caf08f37ba15528b72f1c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:44:29 +0200 Subject: [PATCH 36/37] Automatic changelog for PR #29596 [ci skip] --- html/changelogs/AutoChangeLog-pr-29596.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-29596.yml diff --git a/html/changelogs/AutoChangeLog-pr-29596.yml b/html/changelogs/AutoChangeLog-pr-29596.yml new file mode 100644 index 0000000000000..6dfa0a91751d9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-29596.yml @@ -0,0 +1,4 @@ +author: "thegrb93" +delete-after: True +changes: + - bugfix: "Fixes not being able to disassemble the lewd machines" \ No newline at end of file From 581a50e28dbde0c4ddac00e7d27375dfe5f4fb44 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 31 Aug 2024 00:40:33 +0000 Subject: [PATCH 37/37] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-29587.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29594.yml | 5 ----- html/changelogs/AutoChangeLog-pr-29595.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29596.yml | 4 ---- html/changelogs/AutoChangeLog-pr-29597.yml | 4 ---- html/changelogs/archive/2024-08.yml | 11 +++++++++++ 6 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-29587.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29594.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29595.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29596.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-29597.yml diff --git a/html/changelogs/AutoChangeLog-pr-29587.yml b/html/changelogs/AutoChangeLog-pr-29587.yml deleted file mode 100644 index 9f6513b8da825..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29587.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Stagger animation is no longer horrilbly jittery" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29594.yml b/html/changelogs/AutoChangeLog-pr-29594.yml deleted file mode 100644 index dfb3ca3692bbe..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29594.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "LT3" -delete-after: True -changes: - - bugfix: "Blueshift's cargo shuttle buttons are no longer trapped under glass windows" - - bugfix: "Blueshift's cargo shuttle conveyors are properly linked" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29595.yml b/html/changelogs/AutoChangeLog-pr-29595.yml deleted file mode 100644 index 75a52328828f4..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29595.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Majkl-J" -delete-after: True -changes: - - balance: "You can now use larger dick sizes no matter the character size" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29596.yml b/html/changelogs/AutoChangeLog-pr-29596.yml deleted file mode 100644 index 6dfa0a91751d9..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29596.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "thegrb93" -delete-after: True -changes: - - bugfix: "Fixes not being able to disassemble the lewd machines" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29597.yml b/html/changelogs/AutoChangeLog-pr-29597.yml deleted file mode 100644 index 0a8591f80f8a4..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-29597.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Majkl-J" -delete-after: True -changes: - - bugfix: "You no longer get dusted upon trying to store your supermatter sliver." \ No newline at end of file diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index 993f5b556db07..2c7d1af871ff6 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -833,3 +833,14 @@ - bugfix: Fixed an inconsistency in the naming for QM Office access. grungussuss: - bugfix: after 4 years, computer sound loop now works properly +2024-08-31: + LT3: + - bugfix: Blueshift's cargo shuttle buttons are no longer trapped under glass windows + - bugfix: Blueshift's cargo shuttle conveyors are properly linked + Majkl-J: + - balance: You can now use larger dick sizes no matter the character size + - bugfix: You no longer get dusted upon trying to store your supermatter sliver. + SkyratBot: + - bugfix: Stagger animation is no longer horrilbly jittery + thegrb93: + - bugfix: Fixes not being able to disassemble the lewd machines