From b00e9a5ad8f6ffacefe4619b8eea1e0f5d8dfe2b Mon Sep 17 00:00:00 2001 From: Verkister Date: Mon, 11 Oct 2021 15:59:07 +0300 Subject: [PATCH 1/6] Update digest_act_vr.dm --- code/modules/vore/eating/digest_act_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index a8d678832d..b00068bd3a 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -54,9 +54,9 @@ if(0) d_stage_name = "ruined" if(d_stage_name) - if(!cleanname) - cleanname = name - cleanname = "[d_stage_name] [initial(cleanname)]" + if(!oldname) + oldname = cleanname ? cleanname : name + cleanname = "[d_stage_name] [oldname]" decontaminate() gurgled_color = B.contamination_color //Apply the correct color setting so uncontaminable things can still have the right overlay. gurgle_contaminate(B, B.contamination_flavor, B.contamination_color) //CHOMPEdit End From 96720043763ef2b4a204a03d0f736ebd639ea89d Mon Sep 17 00:00:00 2001 From: Verkister Date: Mon, 11 Oct 2021 16:00:30 +0300 Subject: [PATCH 2/6] Update contaminate_vr.dm --- code/modules/vore/eating/contaminate_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/vore/eating/contaminate_vr.dm b/code/modules/vore/eating/contaminate_vr.dm index 823d26c508..10d852ee86 100644 --- a/code/modules/vore/eating/contaminate_vr.dm +++ b/code/modules/vore/eating/contaminate_vr.dm @@ -18,6 +18,7 @@ var/list/gurgled_overlays = list( /obj/item var/gurgled = FALSE + var/oldname //CHOMPEdit var/cleanname var/cleandesc var/gurgled_color From 730024d25cef6c34347fd481f6ee79424484bb76 Mon Sep 17 00:00:00 2001 From: Psik9941 <92316778+Psik9941@users.noreply.github.com> Date: Mon, 11 Oct 2021 08:51:27 -0500 Subject: [PATCH 3/6] Update tools.dm Adding cable coil to autolathe under the tools category Default additions just have 1x, 5x, 10x print options. Looking into a 30x print option to get a max stack, but need to dig through more code to figure out how this is done. --- code/datums/autolathe/tools.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/autolathe/tools.dm b/code/datums/autolathe/tools.dm index e62232540f..ac783c5c29 100644 --- a/code/datums/autolathe/tools.dm +++ b/code/datums/autolathe/tools.dm @@ -63,3 +63,7 @@ /datum/category_item/autolathe/tools/rsf name = "rapid service fabricator" path = /obj/item/weapon/rsf + +/datum/category_item/autolathe/tools/cable_coil //Psik - defaults to 1,5,10x with a 30x stack max, need to figure out 30x eventually + name = "cable coil" + path =/obj/item/stack/cable_coil From 7c03ffc35cdf17611fd922f07ac3bb493eaad020 Mon Sep 17 00:00:00 2001 From: Psik9941 <92316778+Psik9941@users.noreply.github.com> Date: Mon, 11 Oct 2021 09:09:42 -0500 Subject: [PATCH 4/6] Adding //CHOMPEdit comment Noted --- code/datums/autolathe/tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/autolathe/tools.dm b/code/datums/autolathe/tools.dm index ac783c5c29..6d698a1b8c 100644 --- a/code/datums/autolathe/tools.dm +++ b/code/datums/autolathe/tools.dm @@ -64,6 +64,6 @@ name = "rapid service fabricator" path = /obj/item/weapon/rsf -/datum/category_item/autolathe/tools/cable_coil //Psik - defaults to 1,5,10x with a 30x stack max, need to figure out 30x eventually +/datum/category_item/autolathe/tools/cable_coil //CHOMPEdit -- defaults to 1,5,10x with a 30x stack max, need to figure out 30x eventually name = "cable coil" path =/obj/item/stack/cable_coil From 2ba2b281ebae4fc897bfe450c823bc457ce2adab Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 13 Oct 2021 14:02:57 -0700 Subject: [PATCH 5/6] Fix shuttle flooring generating insane lag /turf/simulated/shuttle/proc/underlay_update() had a "return 0" for it. Return 0 would add a blank value to a LIST and there was no GC for it. Nothing else seems adversely affected by this change to remove the 0 and just have it return. --- code/game/turfs/simulated/floor_types.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 486e215325..742acb9f93 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -112,7 +112,7 @@ /turf/simulated/shuttle/proc/underlay_update() if(!takes_underlays) //Basically, if it's not forced, and we don't care, don't do it. - return 0 + return //CHOMP Edit removed 0. Sarcastically quoting the above comment ^ "Basically, if it's not stupposed to store a fucking value, don't store a fucking value." var/turf/under //May be a path or a turf var/mutable_appearance/us = new(src) //We'll use this for changes later From fdc47f365eb5aa872f56b7152f56675cab233fe0 Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 14 Oct 2021 17:57:23 +0300 Subject: [PATCH 6/6] Makes digestion death keep the ghost in belly The ghost is still just as free to release themselves by simply making a move with arrow key or other basic ghost maneuver, but this time they can also stay within the belly and maybe even be subjected to autotransfer or manual release at the pred's whim so on. --- code/modules/vore/eating/belly_obj_vr.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 4029122fbc..a78eaa60f2 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -237,6 +237,8 @@ // Called whenever an atom enters this belly /obj/belly/Entered(atom/movable/thing, atom/OldLoc) thing.belly_cycles = 0 //CHOMPEdit: reset cycle count + if(istype(thing, /mob/observer)) //CHOMPEdit. Silence, spook. + return if(OldLoc in contents) return //Someone dropping something (or being stripdigested) @@ -630,7 +632,9 @@ //Incase they have the loop going, let's double check to stop it. M.stop_sound_channel(CHANNEL_PREYLOOP) // Delete the digested mob - M.ghostize() // Make sure they're out, so we can copy attack logs and such. + var/mob/observer/G = M.ghostize() //CHOMPEdit start. Make sure they're out, so we can copy attack logs and such. + if(G) + G.forceMove(src) //CHOMPEdit end. qdel(M) // Handle a mob being absorbed