Skip to content

Press F for newton's jetpacks #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bruh-24 merged 1 commit into from
Aug 30, 2025
Merged

Press F for newton's jetpacks #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/controllers/subsystem/throwing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions code/game/objects/items/tanks/jetpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/living_item_handling.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mod/modules/modules_general.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down Expand Up @@ -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
Expand Down
Loading