From b72859dd99e6cd03cd06572980dcf5be5c45b62e Mon Sep 17 00:00:00 2001 From: Kugamo Date: Sat, 9 Jul 2022 09:07:18 -0500 Subject: [PATCH] Fixes invisible pipes while pipecrawling (#18163) * okay * removes unnecessary changes * also fixes vent crawling through trinary devices * Squashed commit of the following: commit 69fb7ad265d4bb754d416f6e78723912f9512586 Author: Kugamo Date: Mon Jul 4 21:02:30 2022 -0500 blah commit ad608c84e3cb97ce09b27692bf2595fff38c10e3 Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Mon Jul 4 16:41:18 2022 +0100 atmospherics (#18152) commit c644fd0384ad4ff0272226f531c1c1c64b1430fc Author: Viz <107632879+Inadvizable@users.noreply.github.com> Date: Mon Jul 4 09:28:22 2022 +0200 I HATE INSTANT STUNS! I HATE INSTANT STUNS! (#18196) commit 422f40b6705bd3916ea3b8207a3e46b4eb37e849 Author: Farie82 Date: Sun Jul 3 23:28:19 2022 +0200 Makes it so the baseturf on lavaland is lava, not space (#18193) commit 77767b8986fb1c103ba4a11c7c3d6f2fa8b38978 Author: Viz <107632879+Inadvizable@users.noreply.github.com> Date: Sun Jul 3 23:12:44 2022 +0200 Untases your slug (#18185) commit 38c4d55204aaf53766f96c361ad660840331d7a6 Author: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Sun Jul 3 15:51:30 2022 -0400 Operative nuke spawns in the right place (#18199) * Ah yes, nukes * Oh that works too. * Update nuclear.dm commit 9a8647194f7977a6e82490e33f26f77c3271795a Author: Charlie <69320440+hal9000PR@users.noreply.github.com> Date: Sun Jul 3 20:51:21 2022 +0100 buckling (#18203) commit 36130193b5e750eb847ae560f08852d61c86c09e Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Sun Jul 3 18:55:11 2022 +0100 Code Readability - Pipe Dispenser (#18169) * pipe_dispenser * prrefer wrench_act for wrench use * Use User, Not Usr Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> commit da94f632516b736b793194ccc07f1a428ff9f24a Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Sun Jul 3 07:25:09 2022 -0500 Nerfs telekinesis (#18177) * tk nerfed from .3 to 3 seconds * Update telekinesis.dm * removes those (), I didn't need em commit bfdce2966adb2edf53fc0cf9b2d222725de156e2 Author: PacifistDalek <32213277+PacifistDalek@users.noreply.github.com> Date: Sun Jul 3 07:09:57 2022 -0400 Absolute Heresy (#18182) commit 41b231a9a0fc91595de5ed8fc264c309dd737dcb Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Sun Jul 3 04:08:35 2022 -0700 update config comments to be accurate (#18175) commit e3b55275766d6200452c91690ed6962506dc697b Author: moxian Date: Sat Jul 2 22:38:01 2022 +0000 Fix several runtimes with remote welderbombing (#18137) commit 9a8d6da7abc0d3ca27b06795a22dc03b635dae84 Author: Kugamo Date: Sat Jul 2 12:45:24 2022 -0500 New TEG sprites (#18085) * amogus * Revert "amogus" This reverts commit ebaa99c77b4bd30ba6af7e82651d7d5f65fe23b8. * T E Gee :D * adjusts sprites slightly TEGs taller now, I though they looked too short b4 * makes pipe connection nicer * Emissive Devices yep * suggested changes Moved update_icon() call out of atmos/process, which was calling it multiple times a second, and into return_transfer_air() which is the only place where the critical variable is redefined. * readds conflicted changes * bruh * SteelSlayer Suggestion Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * removes duplicate proc Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> commit 8dc53fc65ebf89bfa8a813d0b2b38282906b53dc Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Sat Jul 2 17:34:38 2022 +0100 Code Readability - Doors (#18149) * doors * return TRUE Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * return TRUE Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * return TRUE Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> commit 89ba9c047c63c8d681505c03b37ba644ba184c02 Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Sat Jul 2 16:48:46 2022 +0100 Code Readability - Effects (#18150) * effects * removed anchored = TRUE from objects that inherit that property within the effects folder and subfolders commit 3c00a1f06127cc196f577e5f6d1b4d3165e2e5ae Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri Jul 1 23:25:01 2022 +0100 Removes cortical borers. No, I am not sorry. (#18161) * Removes cortical borers. No, I am not sorry. * Icon purge commit 26bd51946564ad7fd5f711c93c3f5f09cf7854dd Author: Kugamo Date: Fri Jul 1 17:20:42 2022 -0500 [GBP no update] Fixes Possible Firealarm spam (#18143) * Yep * SteelSlayer Suggestion Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> commit f6646447f37d576fecdee9252e3f7d2f7e512631 Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Fri Jul 1 23:02:55 2022 +0100 Code Readability - Computers (#18147) * computers * Remove src. Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * remove src. Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * change var name 'screen' to 'authenticated' Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> commit d1da0769580b26c24e830e1bb619a391002a47ac Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Fri Jul 1 21:52:12 2022 +0100 Code Readability - Spells (#18141) * changed fake disintegrate to not need a permit (as far as sec bots are concerned) * prefer boolean defines to magic numbers Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * added check * spells * Revert "added check" This reverts commit 082aa40246653d70a615ad766b2e18f7892bef4d. Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> commit 8b876914ce8610b2914d109a77fc7e9ad6aa5749 Author: Marm <85680653+ItsMarmite@users.noreply.github.com> Date: Fri Jul 1 15:42:29 2022 +0100 Fixes ebolas (#18168) commit aaf1eae36c22dd74e4c4dc141abe2ff388cca7bc Author: moxian Date: Fri Jul 1 14:42:11 2022 +0000 Fix a runtime in dna vault Initialize (#18172) commit 66cad5fb2b4e0afe09c9d02df6f54373d8646349 Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Fri Jul 1 10:26:55 2022 +0100 Code Readability - Door Control (#18162) * door_control * put comment back * comment change for autodoc Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> commit f18bf0f2d4fd5c742a81e6d2710fb9272b4c77e9 Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Fri Jul 1 06:06:40 2022 +0100 turret_control (#18165) commit 46b5b16d21b16e124e674c3875fbbef2b0577981 Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Thu Jun 30 22:32:34 2022 +0100 updated holopad (#18145) commit e9133fe658fb88e647c052e59d66967c8b9efcbe Author: KalevTait <107985691+KalevTait@users.noreply.github.com> Date: Thu Jun 30 22:32:13 2022 +0100 toilet init (#18146) commit 51f870595eb4710f528e7a0af61d4e2021c295ef Author: Marm <85680653+ItsMarmite@users.noreply.github.com> Date: Thu Jun 30 19:00:29 2022 +0100 Nerfs Deathnettle (#18128) * Nerfs Deathnettle (I hate plants) * Update nettle.dm Early returns are good apparently. * Stage of grief: fear Should fix errors? * Update code/modules/hydroponics/grown/nettle.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> commit bead47ea292456d63634f23ae114e9cd269e15b0 Author: Charlie <69320440+hal9000PR@users.noreply.github.com> Date: Thu Jun 30 17:57:52 2022 +0100 Adds crawling. (#17899) * crawling? * knockdown. CONTAINS CHANGES THAT NEED REVERTING * plotting can_moves death * CANMOVE IS DEAD * mappers are insane * removes todos as the are todone * decreases crawling speed * silly-con fixes * surgery fixes * fixes death * pAI fixes * removes var/lying * runtime fix * decreases default crawling speed * correct crawling dir * some more fixes * stunbaton tweak, revert later * rejuv fix * restraint and incapacitated refactor * crawling dir in line with TG * fixes vehicle movement and grabs * alien rest fixes * antistun fixes * fixed fall sounds * forgor to stage this * first review * canmove zombie dispersal * fix * lots of fixes * defines * fixes the trait helper * if you got no legs you can still crawl * sillyconfix * no reverty keepy * jaunt fix * hopefully fixes perma sleepy zzz * admin rejuv temp fix * rest canceling * antistun chems now remove knockdown * buckle offset fix * fixes some stuff * crawling delay = 4 * descuffs bed * sleeping hotfix * fixes simple mob resting * V is the macro for resting * projectiles no dodgy * refines the projectile check * god I hate strings * MORE FIXES * I hate buckling * fixes capulettium plus * winding down * farie review * bugs did stop showing up * SEAN * todo * sean review * ed209 * i HATE cyborgs * steel review * laaaaaast things * reverts stun baton changes * and done * Revert "Squashed commit of the following:" This reverts commit 734c90351bf16cee55c59dd456c4117b1943e8f4. * new solution!! actually utilizes the logic in /obj/machinery/atmospherics/relaymove(mob/living/user, direction) that seemingly was written for just these scenarios (moving between pipenets) --- .../modules/atmospherics/machinery/atmospherics.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm index 8f5fc135577..7f86c8600c9 100644 --- a/code/modules/atmospherics/machinery/atmospherics.dm +++ b/code/modules/atmospherics/machinery/atmospherics.dm @@ -297,7 +297,7 @@ Pipelines + Other Objects -> Pipe network user.forceMove(target_move.loc) //handles entering and so on user.visible_message("You hear something squeezing through the ducts.", "You climb out of the ventilation system.") else if(target_move.can_crawl_through()) - if(returnPipenet() != target_move.returnPipenet()) + if(returnPipenet(target_move) != target_move.returnPipenet()) user.update_pipe_vision(target_move) user.forceMove(target_move) if(world.time - user.last_played_vent > VENT_SOUND_DELAY) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 5b9ae6f1cb5..fb0b346fa3f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -514,10 +514,10 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven to_chat(src, "This ventilation duct is not connected to anything!") -/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine) - if(!istype(starting_machine) || !starting_machine.returnPipenet() || !starting_machine.can_see_pipes()) +/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine, obj/machinery/atmospherics/target_move) + if(!istype(starting_machine) || !starting_machine.returnPipenet(target_move) || !starting_machine.can_see_pipes()) return - var/datum/pipeline/pipeline = starting_machine.returnPipenet() + var/datum/pipeline/pipeline = starting_machine.returnPipenet(target_move) var/list/totalMembers = list() totalMembers |= pipeline.members totalMembers |= pipeline.other_atmosmch @@ -539,13 +539,15 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven /atom/proc/update_pipe_vision() return -/mob/living/update_pipe_vision() - if(pipes_shown.len) +/mob/living/update_pipe_vision(obj/machinery/atmospherics/target_move) + if(pipes_shown.len && !(target_move)) if(!is_ventcrawling(src)) remove_ventcrawl() else if(is_ventcrawling(src)) - add_ventcrawl(loc) + if(target_move) + remove_ventcrawl() + add_ventcrawl(loc, target_move) //Throwing stuff