Captain Jetpack now fits on suit storage slot. (#70107)

* Adds a base modsuit chestplate allow list, cutting down on copy paste
* Allows Jetpacks to work while equipped to a de-hardcoded slot_flags list
* Allows the Captain's jetpack to fit on space suits and MODsuits by default
* Makes the Captain's jetpack fit on the Suit storage slot.
This commit is contained in:
Xander3359
2022-09-25 16:11:55 -04:00
committed by GitHub
parent f583070bbb
commit 63d8a2cb49
6 changed files with 20 additions and 55 deletions
+3 -2
View File
@@ -30,12 +30,12 @@
AddComponent(/datum/component/jetpack, stabilizers, COMSIG_JETPACK_ACTIVATED, COMSIG_JETPACK_DEACTIVATED, JETPACK_ACTIVATION_FAILED, get_mover, check_on_move, /datum/effect_system/trail_follow/ion)
/obj/item/tank/jetpack/item_action_slot_check(slot)
if(slot == ITEM_SLOT_BACK)
if(slot & slot_flags)
return TRUE
/obj/item/tank/jetpack/equipped(mob/user, slot, initial)
. = ..()
if(on && slot != ITEM_SLOT_BACK)
if(on && !(slot & slot_flags))
turn_off(user)
/obj/item/tank/jetpack/dropped(mob/user, silent)
@@ -179,6 +179,7 @@
w_class = WEIGHT_CLASS_NORMAL
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
/obj/item/tank/jetpack/oxygen/security
name = "security jetpack (oxygen)"