cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] All jetpacks are no longer full-speed (#28690)

Browse Source 
* All jetpacks are no longer full-speed (#84712)

## About The Pull Request

Full-speed has been removed from jetpacks
All jetpacks are now modsuit jetpack speed
Due to having no purpose now, Adv. Ion Jetpack has been replaced with
its lesser form, Ion Jetpack

## Why It's Good For The Game
The meta to just blow up gravity and use your jetpack that makes you
faster than 99% of the projectiles ingame and faster than a healthy full
mood human to dunk on literally anyone you see because they cant click
you because youre going mach 3000 is absolutely not fair
With jetpacks being reasonable speeds this is no longer a problem

## Changelog
🆑
balance: All jetpacks are now modsuit jetpack speed
del: Adv. Ion Jetpack module has been removed
/🆑

* All jetpacks are no longer full-speed

* modular fixes

* mapfix

---------

Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com>
Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-08 11:21:48 +02:00
committed by GitHub
parent 528af3e3ea
commit 59fafc8a6b
11 changed files with 24 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
+1 -1
View File
@@ -2503,7 +2503,7 @@
/area/ruin/space/has_grav/cargodise_freighter/kitchen)
"NQ" = (
/obj/structure/safe,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/control/pre_equipped/standard,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/cargodise_freighter/vault)
code/game/objects/items/tanks/jetpack.dm
-6
View File
@@ -10,7 +10,6 @@
actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
var/gas_type = /datum/gas/oxygen
var/on = FALSE
var/full_speed = TRUE // If the jetpack will have a speedboost in space/nograv or not
var/stabilize = FALSE
var/thrust_callback
@@ -98,16 +97,12 @@
return FALSE
on = TRUE
update_icon(UPDATE_ICON_STATE)
if(full_speed)
user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
return TRUE
/obj/item/tank/jetpack/proc/turn_off(mob/user)
SEND_SIGNAL(src, COMSIG_JETPACK_DEACTIVATED, user)
on = FALSE
update_icon(UPDATE_ICON_STATE)
if(user)
user.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
/obj/item/tank/jetpack/proc/allow_thrust(num, use_fuel = TRUE)
if(!ismob(loc))
@@ -148,7 +143,6 @@
worn_icon_state = "jetpack-improvised"
volume = 20 //normal jetpacks have 70 volume
gas_type = null //it starts empty
full_speed = FALSE //moves at modsuit jetpack speeds
/obj/item/tank/jetpack/improvised/allow_thrust(num)
if(!ismob(loc))
code/modules/mod/mod_types.dm
+15 -15
View File
@@ -197,13 +197,13 @@
/obj/item/mod/module/storage/large_capacity,
/obj/item/mod/module/hat_stabilizer,
/obj/item/mod/module/magnetic_harness,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/pathfinder,
/obj/item/mod/module/quick_cuff,
/obj/item/mod/module/headprotector,
)
default_pins = list(
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
)
/obj/item/mod/control/pre_equipped/cosmohonk
@@ -245,7 +245,7 @@
/obj/item/mod/module/shock_absorber,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/dna_lock,
@@ -254,7 +254,7 @@
)
default_pins = list(
/obj/item/mod/module/armor_booster,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
)
@@ -268,7 +268,7 @@
/obj/item/mod/module/shock_absorber,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/hat_stabilizer/syndicate,
@@ -276,14 +276,14 @@
)
default_pins = list(
/obj/item/mod/module/armor_booster,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
)
/obj/item/mod/control/pre_equipped/nuclear/no_jetpack
/obj/item/mod/control/pre_equipped/nuclear/no_jetpack/Initialize(mapload, new_theme, new_skin, new_core)
applied_modules -= list(/obj/item/mod/module/jetpack/advanced, /obj/item/mod/module/jump_jet)
applied_modules -= list(/obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet)
return ..()
/obj/item/mod/control/pre_equipped/nuclear/plasmaman
@@ -305,7 +305,7 @@
/obj/item/mod/module/shock_absorber,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/hat_stabilizer/syndicate,
@@ -313,7 +313,7 @@
)
default_pins = list(
/obj/item/mod/module/armor_booster,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
)
@@ -324,7 +324,7 @@
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
/obj/item/mod/module/thermal_regulator,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/hat_stabilizer/syndicate,
@@ -333,7 +333,7 @@
)
default_pins = list(
/obj/item/mod/module/armor_booster,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flamethrower,
)
@@ -426,13 +426,13 @@
applied_modules = list(
/obj/item/mod/module/storage,
/obj/item/mod/module/magnetic_harness,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
)
default_pins = list(
/obj/item/mod/module/armor_booster,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
)
@@ -623,7 +623,7 @@
/obj/item/mod/module/stealth/ninja,
/obj/item/mod/module/quick_carry/advanced,
/obj/item/mod/module/magboot/advanced,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/anomaly_locked/kinesis/admin,
/obj/item/mod/module/shove_blocker,
/obj/item/mod/module/quick_cuff,
@@ -631,7 +631,7 @@
default_pins = list(
/obj/item/mod/module/stealth/ninja,
/obj/item/mod/module/magboot/advanced,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/anomaly_locked/kinesis/admin,
)
code/modules/mod/modules/modules_general.dm
-19
View File
@@ -108,8 +108,6 @@
overlay_state_inactive = "module_jetpack"
overlay_state_active = "module_jetpack_on"
required_slots = list(ITEM_SLOT_BACK)
/// Do we give the wearer a speed buff.
var/full_speed = FALSE
/// Do we have stabilizers? If yes the user won't move from inertia.
var/stabilize = TRUE
/// Callback to see if we can thrust the user.
@@ -143,14 +141,6 @@
/datum/effect_system/trail_follow/ion/grav_allowed \
)
/obj/item/mod/module/jetpack/on_activation()
if(full_speed)
mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
/obj/item/mod/module/jetpack/on_deactivation(display_message = TRUE, deleting = FALSE)
if(full_speed)
mod.wearer.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
/obj/item/mod/module/jetpack/get_configuration()
. = ..()
.["stabilizers"] = add_ui_configuration("Stabilizers", "bool", stabilize)
@@ -167,15 +157,6 @@
return FALSE
return TRUE
/obj/item/mod/module/jetpack/advanced
name = "MOD advanced ion jetpack module"
desc = "An improvement on the previous model of electric thrusters. This one achieves higher speeds through \
mounting of more jets and application of red paint."
icon_state = "jetpack_advanced"
overlay_state_inactive = "module_jetpackadv"
overlay_state_active = "module_jetpackadv_on"
full_speed = TRUE
/// Cooldown to use if we didn't actually launch a jump jet
#define FAILED_ACTIVATION_COOLDOWN 3 SECONDS
code/modules/movespeed/modifiers/items.dm
-3
View File
@@ -5,9 +5,6 @@
/datum/movespeed_modifier/jetpack/cybernetic
multiplicative_slowdown = -0.5
/datum/movespeed_modifier/jetpack/fullspeed
multiplicative_slowdown = -0.5
/datum/movespeed_modifier/die_of_fate
multiplicative_slowdown = 1
modular_skyrat/master_files/code/modules/mod/mod_types.dm
+1 -1
View File
@@ -4,6 +4,6 @@
/obj/item/mod/module/storage/syndicate,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/chameleon,
)
modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm
+2 -2
View File
@@ -16,11 +16,11 @@
/obj/item/mod/module/rad_protection,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/t_ray,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/visor/meson,
)
default_pins = list(
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/magboot/advanced,
)
modular_skyrat/modules/assault_operatives/code/armaments/armament_modules.dm
+1 -1
View File
@@ -31,5 +31,5 @@
cost = 3
/datum/armament_entry/assault_operatives/modules/jetpack
item_type = /obj/item/mod/module/jetpack/advanced
item_type = /obj/item/mod/module/jetpack
cost = 5
modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm
+1 -1
View File
@@ -39,7 +39,7 @@
applied_modules = list(
/obj/item/mod/module/baton_holster/preloaded/upgraded,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/scorpion_hook,
/obj/item/mod/module/springlock/contractor/no_complexity,
/obj/item/mod/module/storage/syndicate,
modular_skyrat/modules/novaya_ert/code/mod_suit.dm
+2 -2
View File
@@ -87,12 +87,12 @@
/obj/item/mod/module/status_readout/operational,
/obj/item/mod/module/auto_doc,
/obj/item/mod/module/visor/thermal,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/magboot/advanced,
)
default_pins = list(
/obj/item/mod/module/visor/thermal,
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/magboot/advanced,
)
modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm
+1 -1
View File
@@ -70,7 +70,7 @@
category = OPFOR_EQUIPMENT_CATEGORY_MODSUIT_MODULES
/datum/opposing_force_equipment/modsuit_modules/ion_advanced
item_type = /obj/item/mod/module/jetpack/advanced
item_type = /obj/item/mod/module/jetpack
/datum/opposing_force_equipment/modsuit_modules/storage_syndicate
item_type = /obj/item/mod/module/storage/syndicate