From 41bff2e8a8bc74b52b7eeff519b43bf73183b8e3 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Mon, 25 Nov 2013 20:30:52 -0500 Subject: [PATCH] Ninjas Now Spawn With Jetpacks Ninjas will now spawn with a black jetpack filled with Oxygen. This is neccisary because they currently spawn at Carpspawn with no way to move aside from throwing either their C4, only light source, or air tank. --- code/game/gamemodes/events/space_ninja.dm | 2 ++ code/game/objects/items/weapons/tanks/jetpack.dm | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index c3b77d5f875..bfbdfc417f0 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -532,6 +532,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. del(head) del(shoes) del(gloves) + del(back) var/obj/item/device/radio/R = new /obj/item/device/radio/headset(src) equip_to_slot_or_del(R, slot_l_ear) @@ -544,6 +545,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. equip_to_slot_or_del(new /obj/item/clothing/gloves/space_ninja(src), slot_gloves) equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/space_ninja(src), slot_head) equip_to_slot_or_del(new /obj/item/clothing/mask/gas/voice/space_ninja(src), slot_wear_mask) + equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack/oxygenblack(src), slot_back) equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt) equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_r_store) equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_l_store) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index cdff7937b1c..e7f8c1f6ce5 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -96,6 +96,18 @@ air_contents.adjust((6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) return +/obj/item/weapon/tank/jetpack/oxygenblack + name = "Jetpack (Oxygen)" + desc = "A black tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution." + icon_state = "jetpack-black" + item_state = "jetpack-black" + + New() + ..() + //src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.adjust((6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + return + /obj/item/weapon/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."