From 8ddf825aa8f54c9aea04e72ee6a89596c15c47ea Mon Sep 17 00:00:00 2001 From: evan Date: Tue, 22 Mar 2022 01:22:54 -0400 Subject: [PATCH 1/7] Update arousal.dm --- code/modules/arousal/arousal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm index a27e2cdb74..d367ca65d9 100644 --- a/code/modules/arousal/arousal.dm +++ b/code/modules/arousal/arousal.dm @@ -145,7 +145,7 @@ partners -= L if(iscarbon(L)) var/mob/living/carbon/C = L - if(!C.exposed_genitals.len && !C.is_groin_exposed() && !C.is_chest_exposed()) //Nothing through_clothing, no proper partner. + if(!C.exposed_genitals.len || !C.is_groin_exposed() || !C.is_chest_exposed() || !C.is_mouth_covered()) //Nothing through_clothing, no proper partner. partners -= C //NOW the list should only contain correct partners if(!partners.len) From a8ff45ca16804fcceb68009601e5c647a795f841 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 22 Mar 2022 18:05:58 +0100 Subject: [PATCH 2/7] fix --- code/game/objects/items/tools/weldingtool.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 7688d2d342..6e7ad99221 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -46,6 +46,8 @@ create_reagents(max_fuel) reagents.add_reagent(/datum/reagent/fuel, max_fuel) update_icon() + if(can_off_process) + START_PROCESSING(SSobj, src) /obj/item/weldingtool/ComponentInitialize() . = ..() From 554c38fedf4a543622deca9e377eaadfed0fa514 Mon Sep 17 00:00:00 2001 From: bunny232 Date: Wed, 23 Mar 2022 05:28:24 -0400 Subject: [PATCH 4/7] Update code/modules/arousal/arousal.dm Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> --- code/modules/arousal/arousal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm index d367ca65d9..602fb2de6d 100644 --- a/code/modules/arousal/arousal.dm +++ b/code/modules/arousal/arousal.dm @@ -145,7 +145,7 @@ partners -= L if(iscarbon(L)) var/mob/living/carbon/C = L - if(!C.exposed_genitals.len || !C.is_groin_exposed() || !C.is_chest_exposed() || !C.is_mouth_covered()) //Nothing through_clothing, no proper partner. + if(!C.exposed_genitals.len && !C.is_groin_exposed() && !C.is_chest_exposed() && C.is_mouth_covered()) //Nothing through_clothing, no proper partner. partners -= C //NOW the list should only contain correct partners if(!partners.len) From 8985c02c1ef2f0cfc7bc53056ca70714caab5b9d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 24 Mar 2022 16:38:20 -0500 Subject: [PATCH 5/7] Automatic changelog generation for PR #15571 [ci skip] --- html/changelogs/AutoChangeLog-pr-15571.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15571.yml diff --git a/html/changelogs/AutoChangeLog-pr-15571.yml b/html/changelogs/AutoChangeLog-pr-15571.yml new file mode 100644 index 0000000000..03645d7c28 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15571.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Self-fueling welders should no longer be able to be stuck not refueling." From 8c13f17d691ff3598d375e3a802b386020a98d67 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 24 Mar 2022 16:39:05 -0500 Subject: [PATCH 6/7] Automatic changelog generation for PR #15570 [ci skip] --- html/changelogs/AutoChangeLog-pr-15570.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15570.yml diff --git a/html/changelogs/AutoChangeLog-pr-15570.yml b/html/changelogs/AutoChangeLog-pr-15570.yml new file mode 100644 index 0000000000..251d3eab01 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15570.yml @@ -0,0 +1,4 @@ +author: "bunny232" +delete-after: True +changes: + - rscadd: "The receiving party of a climax with partner action can have their mouth exposed to count as a valid 'hole'" From dcb871261905144100ae0343deb242ecfe0f5d8e Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 25 Mar 2022 00:38:49 +0000 Subject: [PATCH 7/7] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15570.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15571.yml | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15570.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15571.yml diff --git a/html/changelogs/AutoChangeLog-pr-15570.yml b/html/changelogs/AutoChangeLog-pr-15570.yml deleted file mode 100644 index 251d3eab01..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15570.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "bunny232" -delete-after: True -changes: - - rscadd: "The receiving party of a climax with partner action can have their mouth exposed to count as a valid 'hole'" diff --git a/html/changelogs/AutoChangeLog-pr-15571.yml b/html/changelogs/AutoChangeLog-pr-15571.yml deleted file mode 100644 index 03645d7c28..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15571.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "Self-fueling welders should no longer be able to be stuck not refueling."