From 7a55449f77255db721180803f2d5846e6891c46d Mon Sep 17 00:00:00 2001 From: Artemchik542 Date: Sat, 30 Aug 2025 23:06:58 +0700 Subject: [PATCH] first step --- code/controllers/subsystem/throwing.dm | 2 +- code/game/objects/items/tanks/jetpack.dm | 12 ++++++------ code/modules/mob/living/living_item_handling.dm | 2 +- code/modules/mod/modules/modules_general.dm | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 83f6e4e4ff8c..029c3379f837 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -207,7 +207,7 @@ SUBSYSTEM_DEF(throwing) var/drift_force = speed if (isitem(thrownthing)) var/obj/item/thrownitem = thrownthing - drift_force *= WEIGHT_TO_NEWTONS(thrownitem.w_class) + drift_force *= WEIGHT_TO_NEWTONS(thrownitem.w_class) * 2 //MASSMETA EDIT (fix_newtonian_movement) if (!hit) for (var/atom/movable/obstacle as anything in get_turf(thrownthing)) //looking for our target on the turf we land on. diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 815631e4cf8d..90a663b1d530 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -21,9 +21,9 @@ /// Callback for the jetpack component var/thrust_callback /// How much force out jetpack can output per tick - var/drift_force = 1.5 NEWTONS + var/drift_force = 8 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) /// How much force this jetpack can output per tick to stabilize the user - var/stabilizer_force = 1.2 NEWTONS + var/stabilizer_force = 25 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) /obj/item/tank/jetpack/Initialize(mapload) . = ..() @@ -187,8 +187,8 @@ volume = 20 //normal jetpacks have 70 volume gas_type = null //it starts empty full_speed = FALSE - drift_force = 1 NEWTONS - stabilizer_force = 0.5 NEWTONS + drift_force = 3 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) + stabilizer_force = 10 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) /obj/item/tank/jetpack/improvised/allow_thrust(num) if(!ismob(loc)) @@ -231,8 +231,8 @@ volume = 90 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //steal objective items are hard to destroy. slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE - drift_force = 2 NEWTONS - stabilizer_force = 2 NEWTONS + drift_force = 8 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) + stabilizer_force = 25 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) /obj/item/tank/jetpack/oxygen/security name = "security jetpack (oxygen)" diff --git a/code/modules/mob/living/living_item_handling.dm b/code/modules/mob/living/living_item_handling.dm index 755f5d544666..51d89266aa03 100644 --- a/code/modules/mob/living/living_item_handling.dm +++ b/code/modules/mob/living/living_item_handling.dm @@ -114,7 +114,7 @@ var/drift_force = max(0.5 NEWTONS, 1 NEWTONS + power_throw) if (isitem(thrown_thing)) var/obj/item/thrown_item = thrown_thing - drift_force *= WEIGHT_TO_NEWTONS(thrown_item.w_class) + drift_force *= WEIGHT_TO_NEWTONS(thrown_item.w_class) * 2 //MASSMETA EDIT (fix_newtonian_movement) newtonian_move(get_angle(target, src), drift_force = drift_force) thrown_thing.safe_throw_at(target, thrown_thing.throw_range + extra_throw_range, max(1,thrown_thing.throw_speed + power_throw), src, null, null, null, move_force) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 07faf3b32d26..4a8d7c15b248 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -114,9 +114,9 @@ /// Callback to see if we can thrust the user. var/thrust_callback /// How much force this module can apply per tick - var/drift_force = 1.5 NEWTONS + var/drift_force = 8 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) /// How much force this module's stabilizier can put out - var/stabilizer_force = 1.2 NEWTONS + var/stabilizer_force = 25 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) /obj/item/mod/module/jetpack/Initialize(mapload) . = ..() @@ -187,8 +187,8 @@ icon_state = "jetpack_advanced" overlay_state_inactive = "module_jetpackadv" overlay_state_active = "module_jetpackadv_on" - drift_force = 2 NEWTONS - stabilizer_force = 2 NEWTONS + drift_force = 8 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) + stabilizer_force = 25 NEWTONS //MASSMETA EDIT (fix_newtonian_movement) /// Cooldown to use if we didn't actually launch a jump jet #define FAILED_ACTIVATION_COOLDOWN 3 SECONDS