From e47598be8b2eb1f4e5d47c542f2eb8e01d9ad4f1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 22 May 2019 18:39:51 -0400 Subject: [PATCH 1/4] Update jetpack.dm --- code/game/objects/items/tanks/jetpack.dm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index b3ee748d13..765f715821 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -33,7 +33,6 @@ else toggle_internals(user) - /obj/item/tank/jetpack/proc/cycle(mob/user) if(user.incapacitated()) return @@ -48,7 +47,6 @@ var/datum/action/A = X A.UpdateButtonIcon() - /obj/item/tank/jetpack/proc/turn_on() on = TRUE icon_state = "[initial(icon_state)]-on" @@ -91,7 +89,7 @@ desc = "A jetpack made from two air tanks, a fire extinguisher and some atmospherics equipment. It doesn't look like it can hold much." icon_state = "jetpack-improvised" item_state = "jetpack-sec" - volume = 20 //normal jetpacks have 70 volume + volume = 30 //normal jetpacks have 70 volume gas_type = null //it starts empty full_speed = FALSE //moves at hardsuit jetpack speeds @@ -119,6 +117,7 @@ /obj/item/tank/jetpack/void name = "void jetpack (oxygen)" desc = "It works well in a void." + volume = 60 icon_state = "jetpack-void" item_state = "jetpack-void" @@ -133,7 +132,7 @@ desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks." icon_state = "jetpack-mini" item_state = "jetpack-mini" - volume = 40 + volume = 50 throw_range = 7 w_class = WEIGHT_CLASS_NORMAL @@ -152,8 +151,6 @@ icon_state = "jetpack-sec" item_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." @@ -162,7 +159,6 @@ distribute_pressure = 0 gas_type = /datum/gas/carbon_dioxide - /obj/item/tank/jetpack/suit name = "hardsuit jetpack upgrade" desc = "A modular, compact set of thrusters designed to integrate with a hardsuit. It is fueled by a tank inserted into the suit's storage compartment." @@ -221,7 +217,6 @@ return ..() - //Return a jetpack that the mob can use //Back worn jetpacks, hardsuit internal packs, and so on. //Used in Process_Spacemove() and wherever you want to check for/get a jetpack From 717398213bc03d43af917f034449715f2b4f332f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 22 May 2019 18:52:15 -0400 Subject: [PATCH 2/4] Update pirates.dm --- code/modules/events/pirates.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 910e94f680..8890b6ca30 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -48,8 +48,6 @@ if(!shuttle_spawned) spawn_shuttle() - - /datum/round_event/pirates/start() if(!paid_off && !shuttle_spawned) spawn_shuttle() @@ -150,7 +148,6 @@ to_chat(user,"You retrieve the siphoned credits!") credits_stored = 0 - /obj/machinery/shuttle_scrambler/proc/send_notification() priority_announce("Data theft signal detected, source registered on local gps units.") @@ -222,8 +219,7 @@ suit_type = /obj/item/clothing/suit/space helmet_type = /obj/item/clothing/head/helmet/space mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/tank/internals/oxygen - + storage_type = /obj/machinery/suit_storage_unit/pirate /obj/machinery/loot_locator name = "Booty Locator" @@ -454,4 +450,4 @@ /datum/export/pirate/cash/get_amount(obj/O) var/obj/item/stack/spacecash/C = O - return ..() * C.amount * C.value \ No newline at end of file + return ..() * C.amount * C.value From fb6eca8d462d6167446a919da1b19a8fe0d34313 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 22 May 2019 21:28:16 -0400 Subject: [PATCH 3/4] How did this even compile? --- code/modules/events/pirates.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 8890b6ca30..7256ddb6ea 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -219,7 +219,7 @@ suit_type = /obj/item/clothing/suit/space helmet_type = /obj/item/clothing/head/helmet/space mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/machinery/suit_storage_unit/pirate + storage_type = /obj/item/tank/jetpack/void /obj/machinery/loot_locator name = "Booty Locator" From ed23f9834a1cb6a323439ac5f59eb970562c5a99 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 22 May 2019 22:19:32 -0400 Subject: [PATCH 4/4] Update jetpack.dm --- code/game/objects/items/tanks/jetpack.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 765f715821..a5a2398fe0 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -120,6 +120,7 @@ volume = 60 icon_state = "jetpack-void" item_state = "jetpack-void" + full_speed = FALSE //Old pre-hardsuit tech /obj/item/tank/jetpack/oxygen name = "jetpack (oxygen)"