cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repaths oxygen jetpacks and "removes" fake empty jetpack (#93676)

Browse Source 
## About The Pull Request

removes oxygen jetpack subtype and makes empty jetpack actual oxygen

## Why It's Good For The Game

because our empty jetpack wasnt actually empty and we infact had two
oxygen jetpacks?

## Changelog

N/A
This commit is contained in:
Aliceee2ch
2025-11-01 13:40:04 +01:00
committed by GitHub
parent 915102803c
commit 1513f779ad
18 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/uplink_kits.dm
+1 -1
View File
@@ -751,7 +751,7 @@
new spess_suit(src) // Above allows me to get the helmet from a variable on the object
var/obj/item/clothing/head/helmet/space/syndicate/spess_helmet = GLOB.syndicate_space_suits_to_helmets[spess_suit]
new spess_helmet(src) // 4 TC for the space gear
new /obj/item/tank/jetpack/oxygen/harness(src) // They kinda need this to fly to the cruiser.
new /obj/item/tank/jetpack/harness(src) // They kinda need this to fly to the cruiser.
// Tacticool gear
new /obj/item/clothing/shoes/combat(src)
new /obj/item/clothing/under/syndicate(src)
code/game/objects/items/tanks/jetpack.dm
+4 -12
View File
@@ -1,5 +1,5 @@
/obj/item/tank/jetpack
name = "jetpack (empty)"
name = "jetpack (oxygen)"
desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
icon_state = "jetpack"
inhand_icon_state = "jetpack"
@@ -207,13 +207,7 @@
icon_state = "jetpack-void"
inhand_icon_state = "jetpack-void"
/obj/item/tank/jetpack/oxygen
name = "jetpack (oxygen)"
desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution."
icon_state = "jetpack"
inhand_icon_state = "jetpack"
/obj/item/tank/jetpack/oxygen/harness
/obj/item/tank/jetpack/harness
name = "jet harness (oxygen)"
desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks."
icon_state = "jetpack-mini"
@@ -222,7 +216,7 @@
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
/obj/item/tank/jetpack/oxygen/captain
/obj/item/tank/jetpack/captain
name = "captain's jetpack"
desc = "A compact, lightweight jetpack containing a high amount of compressed oxygen."
icon_state = "jetpack-captain"
@@ -234,14 +228,12 @@
drift_force = 2 NEWTONS
stabilizer_force = 2 NEWTONS
/obj/item/tank/jetpack/oxygen/security
/obj/item/tank/jetpack/security
name = "security jetpack (oxygen)"
desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas by security forces."
icon_state = "jetpack-sec"
inhand_icon_state = "jetpack-sec"
/obj/item/tank/jetpack/carbondioxide
name = "jetpack (carbon dioxide)"
desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals."