From 31ac8c085fa500dce9a0e7f0782505c55f1fd9ea Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sun, 5 Feb 2023 14:35:00 +0800 Subject: [PATCH 1/7] you can no longer walk on mobs that you aren't supposed to be able to walk on --- code/modules/vore/resizing/resize_vr.dm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 9fa0f6243a8..2fcb2380a4e 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -242,6 +242,19 @@ return TRUE return FALSE +/mob/living/proc/can_pass_into(turf/n, var/prey = null) + for (var/atom/movable/M in n) + if (prey == M) + continue + if (istype(M, /mob/living)) + var/mob/living/L = M + if (!(M.CanPass(src, n) || get_effective_size(FALSE) - L.get_effective_size(TRUE) >= 0.75)) + return FALSE + continue + if (!M.CanPass(src, n)) + return FALSE + return TRUE + /** * Handle bumping into someone without mutual help intent. * Called from /mob/living/Bump() @@ -271,7 +284,7 @@ return FALSE var/mob/living/carbon/human/prey = tmob - if(!istype(prey)) + if(!istype(prey) || !(isturf(prey.loc) && can_pass_into(prey.loc, prey))) //If they're not human, steppy shouldn't happen return FALSE From 66dc3ce17614a359f5e68f0052272cad32397851 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sun, 5 Feb 2023 18:28:22 +0800 Subject: [PATCH 2/7] better code --- code/modules/vore/resizing/resize_vr.dm | 27 ++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 2fcb2380a4e..41cad700747 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -242,19 +242,6 @@ return TRUE return FALSE -/mob/living/proc/can_pass_into(turf/n, var/prey = null) - for (var/atom/movable/M in n) - if (prey == M) - continue - if (istype(M, /mob/living)) - var/mob/living/L = M - if (!(M.CanPass(src, n) || get_effective_size(FALSE) - L.get_effective_size(TRUE) >= 0.75)) - return FALSE - continue - if (!M.CanPass(src, n)) - return FALSE - return TRUE - /** * Handle bumping into someone without mutual help intent. * Called from /mob/living/Bump() @@ -284,7 +271,19 @@ return FALSE var/mob/living/carbon/human/prey = tmob - if(!istype(prey) || !(isturf(prey.loc) && can_pass_into(prey.loc, prey))) + var/can_pass = TRUE + if (isturf(prey.loc)) + for (var/atom/movable/M in prey.loc) + if (prey == M) + continue + if (istype(M, /mob/living)) + var/mob/living/L = M + if (!(M.CanPass(src, prey.loc) || get_effective_size(FALSE) - L.get_effective_size(TRUE) >= 0.75)) + can_pass = FALSE + continue + if (!M.CanPass(src, prey.loc)) + can_pass = FALSE + if(!istype(prey) || !can_pass) //If they're not human, steppy shouldn't happen return FALSE From 7da09c462f06813f72e6a9178e7c75f7617e13ce Mon Sep 17 00:00:00 2001 From: Spookerton Date: Sun, 5 Feb 2023 15:08:32 +0000 Subject: [PATCH 3/7] Merge pull request #8929 from Cerebulon/powersink-sprite Fixes powersink having no sprite --- code/game/objects/items/devices/powersink.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index cc902d3b6da..339b57f0558 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -4,6 +4,7 @@ name = "power sink" desc = "A nulling power sink which drains energy from electrical systems." icon_state = "powersink0" + icon = 'icons/obj/device.dmi' w_class = ITEMSIZE_LARGE throwforce = 5 throw_speed = 1 From 022a4c3a89048d5bf9267238e93e86f3a8068b46 Mon Sep 17 00:00:00 2001 From: Spookerton Date: Sun, 5 Feb 2023 15:09:19 +0000 Subject: [PATCH 5/7] Merge pull request #8927 from Atermonera/fix_robotize_order Child organs can't robotize() if they're already robotic --- code/modules/client/preference_setup/general/03_body.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 4489cb21ff0..a084e29ffae 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -339,7 +339,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O // Destroy/cyborgize organs and limbs. character.synthetic = null //Clear the existing var. - for(var/name in BP_ALL) + for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO)) var/status = pref.organ_data[name] var/obj/item/organ/external/O = character.organs_by_name[name] if(O) From d0b43a9718c9e1798c4d9662db06733e76e63c17 Mon Sep 17 00:00:00 2001 From: Burrito-Justice Date: Sun, 5 Feb 2023 21:01:08 -0800 Subject: [PATCH 7/7] add epic player burrito justice to gray goo list Protean whitelist approval reflected here: https://forum.vore-station.net/viewtopic.php?f=46&t=2222 Probably, anyways. I'm not logged into the forum so maybe I was actually called stinky and did not, in fact, get the WL. also I edited this file through github alone because I'm lazy --- config/alienwhitelist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index d836d63d270..b42b0fa5228 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -16,6 +16,7 @@ beyondmylife - Protean bothnevarbackwards - Diona bricker98 - Protean bricker98 - Black-Eyed Shadekin +burritojustice - Protean camanis - Protean cameron653 - Protean cgr - Protean