From c3df56d4fdfabdf20d95ffde1046206dcc9e77f7 Mon Sep 17 00:00:00 2001 From: Bloop Date: Thu, 6 Apr 2023 21:23:04 -0400 Subject: [PATCH] Fixes the atrocinator modsuit module (#74529) ## About The Pull Request Somewhere gravity got modified where you can have values below -1. This updates all the checks for `NEGATIVE_GRAVITY` to reflect that. Closes https://github.com/tgstation/tgstation/issues/72794 Closes https://github.com/Skyrat-SS13/Skyrat-tg/issues/20314 Confirmed https://github.com/tgstation/tgstation/issues/64703 is still an issue. Fireman carrying prevents it from happening, Something to do with buckle code probably, but I care not to investigate further at this moment. Just stating in case anyone else does. I did not experience the chat bug though. Don't think it's related. ## Why It's Good For The Game ![dreamseeker_BiZRIyQ3Qe](https://user-images.githubusercontent.com/13398309/230061927-646223c4-861a-4dc9-89d9-495c123a016f.gif) ## Changelog :cl: fix: the atrocinator modsuit mod will now make you fall up again when activated. /:cl: --- code/game/turfs/turf.dm | 2 +- code/modules/mod/modules/modules_maint.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 4625a01ab99..c29d23a2452 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -304,7 +304,7 @@ GLOBAL_LIST_EMPTY(station_turfs) /// Precipitates a movable (plus whatever buckled to it) to lower z levels if possible and then calls zImpact() /turf/proc/zFall(atom/movable/falling, levels = 1, force = FALSE, falling_from_move = FALSE) var/direction = DOWN - if(falling.has_gravity() == NEGATIVE_GRAVITY) + if(falling.has_gravity() <= NEGATIVE_GRAVITY) direction = UP var/turf/target = get_step_multiz(src, direction) if(!target) diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm index 3efc046ee38..2e39293fe02 100644 --- a/code/modules/mod/modules/modules_maint.dm +++ b/code/modules/mod/modules/modules_maint.dm @@ -310,7 +310,7 @@ /obj/item/mod/module/atrocinator/proc/check_upstairs() SIGNAL_HANDLER - if(you_fucked_up || mod.wearer.has_gravity() != NEGATIVE_GRAVITY) + if(you_fucked_up || mod.wearer.has_gravity() > NEGATIVE_GRAVITY) return var/turf/open/current_turf = get_turf(mod.wearer) var/turf/open/openspace/turf_above = get_step_multiz(mod.wearer, UP)