From 6f5ea7f5e74a15a6820d4fbe5214baa92852efb3 Mon Sep 17 00:00:00 2001 From: xxalpha Date: Tue, 17 Mar 2015 18:42:29 +0000 Subject: [PATCH 1/4] Adds embedded jetpacks to hardsuits. --- .../objects/items/weapons/tanks/jetpack.dm | 60 ++++++++++++++++++- code/modules/clothing/spacesuits/hardsuit.dm | 1 + code/modules/clothing/suits/toggles.dm | 14 ++++- .../mob/living/carbon/human/human_movement.dm | 4 ++ .../mob/living/carbon/human/species.dm | 5 ++ 5 files changed, 82 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 6bb7562f847..f707edc7dc9 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -106,4 +106,62 @@ ..() ion_trail = new /datum/effect/effect/system/ion_trail_follow() ion_trail.set_up(src) - air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) \ No newline at end of file + air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + + +/obj/item/weapon/tank/jetpack/suit + name = "suit embedded jetpack" + desc = "A device that will use your internals tank as a gas source for propulsion." + icon_state = "jetpack-void" + item_state = "jetpack-void" + var/obj/item/weapon/tank/internals/tank = null + +/obj/item/weapon/tank/jetpack/suit/New() + ..() + SSobj.processing -= src + air_contents = null + +/obj/item/weapon/tank/jetpack/suit/toggle() + set name = "Toggle Jetpack" + set category = "Object" + + if(istype(loc.loc,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = loc.loc + + if(!H.wear_suit) + H << "You must be wearing the suit to use the embedded jetpack." + return + if(!istype(H.s_store,/obj/item/weapon/tank/internals)) + H << "You must have a tank in your suit's torage to use the embedded jetpack." + return + if(usr.stat || !usr.canmove || usr.restrained()) + return + + on = !on + if(on) + ion_trail.start() + tank = H.s_store + air_contents = tank.air_contents + SSobj.processing |= src + icon_state = "[icon_state]-on" + else + turn_off() + H << "You toggle the embedded jetpack [on? "on":"off"]." + +/obj/item/weapon/tank/jetpack/suit/proc/turn_off() + SSobj.processing -= src + ion_trail.stop() + air_contents = null + tank = null + icon_state = initial(icon_state) + on = 0 + +/obj/item/weapon/tank/jetpack/suit/process() + if(!istype(loc.loc,/mob/living/carbon/human)) + turn_off() + return + var/mob/living/carbon/human/H = loc.loc + if(!tank || tank != H.s_store) + turn_off() + return + ..() \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index c76fbd9c198..2f4fc73f3aa 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -45,6 +45,7 @@ var/obj/item/clothing/head/helmet/space/hardsuit/helmet action_button_name = "Toggle Helmet" var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit + var/obj/item/weapon/tank/jetpack/suit/jetpack = null //Atmospherics /obj/item/clothing/head/helmet/space/hardsuit/atmos diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index c9567e9c4ed..a6209bd3a68 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -80,6 +80,8 @@ /obj/item/clothing/suit/space/hardsuit/New() MakeHelmet() + jetpack = new /obj/item/weapon/tank/jetpack/suit() + jetpack.loc = src ..() /obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet() @@ -136,4 +138,14 @@ else H << "You disengage the helmet on the hardsuit." playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) - RemoveHelmet() \ No newline at end of file + RemoveHelmet() + +/obj/item/clothing/suit/space/hardsuit/verb/Jetpack() + set name = "Toggle Jetpack" + set category = "Object" + jetpack.toggle() + +/obj/item/clothing/suit/space/hardsuit/verb/Jetpack_Rockets() + set name = "Toggle Jetpack Stabilization" + set category = "Object" + jetpack.toggle_rockets() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 01a14d53a6d..ae12ba0dcc8 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -15,6 +15,10 @@ var/obj/item/weapon/tank/jetpack/J = back if((movement_dir || J.stabilization_on) && J.allow_thrust(0.01, src)) return 1 + if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit) && isturf(loc)) //Second check is so you can't use a jetpack in a mech + var/obj/item/clothing/suit/space/hardsuit/C = wear_suit + if((movement_dir || C.jetpack.stabilization_on) && C.jetpack.allow_thrust(0.01, src)) + return 1 return 0 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 1db023ee37a..0de395d61ba 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -654,6 +654,11 @@ var/obj/item/weapon/tank/jetpack/J = H.back if(J.allow_thrust(0.01, H)) hasjetpack = 1 + else if(istype(H.wear_suit,/obj/item/clothing/suit/space/hardsuit)) + var/obj/item/clothing/suit/space/hardsuit/C = H.wear_suit + if(C.jetpack.allow_thrust(0.01, H)) + hasjetpack = 1 + var/grav = has_gravity(H) if(!grav && !hasjetpack) From 8fa8919e2eb3c253574ead29e70533646fe894ac Mon Sep 17 00:00:00 2001 From: xxalpha Date: Tue, 17 Mar 2015 19:41:58 +0000 Subject: [PATCH 2/4] Added a comment, removed unnecessary line. --- code/game/objects/items/weapons/tanks/jetpack.dm | 4 ++-- code/modules/clothing/suits/toggles.dm | 3 +-- code/modules/mob/living/carbon/human/species.dm | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index f707edc7dc9..201ff68bd9e 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -110,7 +110,7 @@ /obj/item/weapon/tank/jetpack/suit - name = "suit embedded jetpack" + name = "suit inbuilt jetpack" desc = "A device that will use your internals tank as a gas source for propulsion." icon_state = "jetpack-void" item_state = "jetpack-void" @@ -149,12 +149,12 @@ H << "You toggle the embedded jetpack [on? "on":"off"]." /obj/item/weapon/tank/jetpack/suit/proc/turn_off() + on = 0 SSobj.processing -= src ion_trail.stop() air_contents = null tank = null icon_state = initial(icon_state) - on = 0 /obj/item/weapon/tank/jetpack/suit/process() if(!istype(loc.loc,/mob/living/carbon/human)) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index a6209bd3a68..a8d22c67765 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -80,8 +80,7 @@ /obj/item/clothing/suit/space/hardsuit/New() MakeHelmet() - jetpack = new /obj/item/weapon/tank/jetpack/suit() - jetpack.loc = src + jetpack = new /obj/item/weapon/tank/jetpack/suit(src) ..() /obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 0de395d61ba..f2f5d6d2de1 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -654,7 +654,7 @@ var/obj/item/weapon/tank/jetpack/J = H.back if(J.allow_thrust(0.01, H)) hasjetpack = 1 - else if(istype(H.wear_suit,/obj/item/clothing/suit/space/hardsuit)) + else if(istype(H.wear_suit,/obj/item/clothing/suit/space/hardsuit)) //copypasta but faster implementation currently var/obj/item/clothing/suit/space/hardsuit/C = H.wear_suit if(C.jetpack.allow_thrust(0.01, H)) hasjetpack = 1 From edccabb0c4645a69aeaf7a175707ed5700f9e52c Mon Sep 17 00:00:00 2001 From: xxalpha Date: Wed, 18 Mar 2015 17:48:45 +0000 Subject: [PATCH 3/4] Only engineering type hardsuits have the inbuilt jetpack. --- code/game/machinery/suit_storage_unit.dm | 6 +-- .../objects/items/weapons/tanks/jetpack.dm | 6 +-- code/modules/awaymissions/corpse.dm | 2 +- code/modules/clothing/spacesuits/hardsuit.dm | 50 +++++++++++++++---- code/modules/clothing/suits/toggles.dm | 11 ---- .../mob/living/carbon/human/human_movement.dm | 4 +- .../mob/living/carbon/human/species.dm | 4 +- 7 files changed, 52 insertions(+), 31 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 77472452150..9b76cdb4f85 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -44,11 +44,11 @@ STORAGE_TYPE = /obj/item/weapon/tank/jetpack/oxygen /obj/machinery/suit_storage_unit/engine - SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/engine MASK_TYPE = /obj/item/clothing/mask/breath /obj/machinery/suit_storage_unit/ce - SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/elite + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/engine/elite MASK_TYPE = /obj/item/clothing/mask/breath STORAGE_TYPE= /obj/item/clothing/shoes/magboots/advance @@ -61,7 +61,7 @@ MASK_TYPE = /obj/item/clothing/mask/gas/sechailer /obj/machinery/suit_storage_unit/atmos - SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/atmos + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/engine/atmos MASK_TYPE = /obj/item/clothing/mask/gas STORAGE_TYPE = /obj/item/weapon/watertank/atmos diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 201ff68bd9e..65a043fa5de 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -129,10 +129,10 @@ var/mob/living/carbon/human/H = loc.loc if(!H.wear_suit) - H << "You must be wearing the suit to use the embedded jetpack." + H << "You must be wearing the suit to use the inbuilt jetpack." return if(!istype(H.s_store,/obj/item/weapon/tank/internals)) - H << "You must have a tank in your suit's torage to use the embedded jetpack." + H << "You must have a tank in your suit's storage to use the inbuilt jetpack." return if(usr.stat || !usr.canmove || usr.restrained()) return @@ -146,7 +146,7 @@ icon_state = "[icon_state]-on" else turn_off() - H << "You toggle the embedded jetpack [on? "on":"off"]." + H << "You toggle the inbuilt jetpack [on? "on":"off"]." /obj/item/weapon/tank/jetpack/suit/proc/turn_off() on = 0 diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 703962ae3ba..bae1c5582cc 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -196,7 +196,7 @@ corpseidaccess = "Station Engineer" /obj/effect/landmark/corpse/engineer/rig - corpsesuit = /obj/item/clothing/suit/space/hardsuit + corpsesuit = /obj/item/clothing/suit/space/hardsuit/engine corpsemask = /obj/item/clothing/mask/breath /obj/effect/landmark/corpse/clown diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 2f4fc73f3aa..c626b9ff47b 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -1,6 +1,6 @@ - //Regular (engineering) hardsuits + //Baseline hardsuits /obj/item/clothing/head/helmet/space/hardsuit - name = "engineering hardsuit helmet" + name = "hardsuit helmet" desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." icon_state = "hardsuit0-engineering" item_state = "eng_helm" @@ -35,7 +35,7 @@ /obj/item/clothing/suit/space/hardsuit - name = "engineering hardsuit" + name = "hardsuit" desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." icon_state = "hardsuit-engineering" item_state = "eng_hardsuit" @@ -45,10 +45,42 @@ var/obj/item/clothing/head/helmet/space/hardsuit/helmet action_button_name = "Toggle Helmet" var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit + + + //Engineering +/obj/item/clothing/head/helmet/space/hardsuit/engine + name = "engineering hardsuit helmet" + desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." + icon_state = "hardsuit0-engineering" + item_state = "eng_helm" + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75) + item_color = "engineering" + +/obj/item/clothing/suit/space/hardsuit/engine + name = "engineering hardsuit" + desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." + icon_state = "hardsuit-engineering" + item_state = "eng_hardsuit" + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine var/obj/item/weapon/tank/jetpack/suit/jetpack = null +/obj/item/clothing/suit/space/hardsuit/engine/New() + jetpack = new /obj/item/weapon/tank/jetpack/suit(src) + ..() + +/obj/item/clothing/suit/space/hardsuit/engine/verb/Jetpack() + set name = "Toggle Inbuilt Jetpack" + set category = "Object" + jetpack.toggle() + +/obj/item/clothing/suit/space/hardsuit/engine/verb/Jetpack_Rockets() + set name = "Toggle Inbuilt Jetpack Stabilization" + set category = "Object" + jetpack.toggle_rockets() + //Atmospherics -/obj/item/clothing/head/helmet/space/hardsuit/atmos +/obj/item/clothing/head/helmet/space/hardsuit/engine/atmos name = "atmospherics hardsuit helmet" desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has thermal shielding." icon_state = "hardsuit0-atmospherics" @@ -58,7 +90,7 @@ heat_protection = HEAD //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT -/obj/item/clothing/suit/space/hardsuit/atmos +/obj/item/clothing/suit/space/hardsuit/engine/atmos name = "atmospherics hardsuit" desc = "A special suit that protects against hazardous, low pressure environments. Has thermal shielding." icon_state = "hardsuit-atmospherics" @@ -66,11 +98,11 @@ armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 0) heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/atmos + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos //Chief Engineer's hardsuit -/obj/item/clothing/head/helmet/space/hardsuit/elite +/obj/item/clothing/head/helmet/space/hardsuit/engine/elite name = "advanced hardsuit helmet" desc = "An advanced helmet designed for work in a hazardous, low pressure environment. Shines with a high polish." icon_state = "hardsuit0-white" @@ -80,7 +112,7 @@ heat_protection = HEAD //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT -/obj/item/clothing/suit/space/hardsuit/elite +/obj/item/clothing/suit/space/hardsuit/engine/elite icon_state = "hardsuit-white" name = "advanced hardsuit" desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish." @@ -88,7 +120,7 @@ armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 90) heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/elite + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/elite //Mining hardsuit diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index a8d22c67765..1a4202e88b3 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -80,7 +80,6 @@ /obj/item/clothing/suit/space/hardsuit/New() MakeHelmet() - jetpack = new /obj/item/weapon/tank/jetpack/suit(src) ..() /obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet() @@ -138,13 +137,3 @@ H << "You disengage the helmet on the hardsuit." playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) RemoveHelmet() - -/obj/item/clothing/suit/space/hardsuit/verb/Jetpack() - set name = "Toggle Jetpack" - set category = "Object" - jetpack.toggle() - -/obj/item/clothing/suit/space/hardsuit/verb/Jetpack_Rockets() - set name = "Toggle Jetpack Stabilization" - set category = "Object" - jetpack.toggle_rockets() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index ae12ba0dcc8..5e914e68242 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -15,8 +15,8 @@ var/obj/item/weapon/tank/jetpack/J = back if((movement_dir || J.stabilization_on) && J.allow_thrust(0.01, src)) return 1 - if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit) && isturf(loc)) //Second check is so you can't use a jetpack in a mech - var/obj/item/clothing/suit/space/hardsuit/C = wear_suit + if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit/engine) && isturf(loc)) //Second check is so you can't use a jetpack in a mech + var/obj/item/clothing/suit/space/hardsuit/engine/C = wear_suit if((movement_dir || C.jetpack.stabilization_on) && C.jetpack.allow_thrust(0.01, src)) return 1 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index f2f5d6d2de1..ed2c2e1d864 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -654,8 +654,8 @@ var/obj/item/weapon/tank/jetpack/J = H.back if(J.allow_thrust(0.01, H)) hasjetpack = 1 - else if(istype(H.wear_suit,/obj/item/clothing/suit/space/hardsuit)) //copypasta but faster implementation currently - var/obj/item/clothing/suit/space/hardsuit/C = H.wear_suit + else if(istype(H.wear_suit,/obj/item/clothing/suit/space/hardsuit/engine)) //copypasta but faster implementation currently + var/obj/item/clothing/suit/space/hardsuit/engine/C = H.wear_suit if(C.jetpack.allow_thrust(0.01, H)) hasjetpack = 1 From 902e50f6b2f94b2982b2e19f8ecec132941ea2f1 Mon Sep 17 00:00:00 2001 From: xxalpha Date: Sat, 21 Mar 2015 00:46:39 +0000 Subject: [PATCH 4/4] Added inbuilt jetpack to syndicate hardsuit. --- code/modules/clothing/spacesuits/hardsuit.dm | 25 +++++++++++--------- code/modules/clothing/suits/toggles.dm | 3 +++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index c626b9ff47b..d1c93d3f95f 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -45,7 +45,17 @@ var/obj/item/clothing/head/helmet/space/hardsuit/helmet action_button_name = "Toggle Helmet" var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit + var/obj/item/weapon/tank/jetpack/suit/jetpack = null +/obj/item/clothing/suit/space/hardsuit/verb/Jetpack() + set name = "Toggle Inbuilt Jetpack" + set category = "Object" + jetpack.toggle() + +/obj/item/clothing/suit/space/hardsuit/verb/Jetpack_Rockets() + set name = "Toggle Inbuilt Jetpack Stabilization" + set category = "Object" + jetpack.toggle_rockets() //Engineering /obj/item/clothing/head/helmet/space/hardsuit/engine @@ -63,22 +73,12 @@ item_state = "eng_hardsuit" armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine - var/obj/item/weapon/tank/jetpack/suit/jetpack = null + /obj/item/clothing/suit/space/hardsuit/engine/New() jetpack = new /obj/item/weapon/tank/jetpack/suit(src) ..() -/obj/item/clothing/suit/space/hardsuit/engine/verb/Jetpack() - set name = "Toggle Inbuilt Jetpack" - set category = "Object" - jetpack.toggle() - -/obj/item/clothing/suit/space/hardsuit/engine/verb/Jetpack_Rockets() - set name = "Toggle Inbuilt Jetpack Stabilization" - set category = "Object" - jetpack.toggle_rockets() - //Atmospherics /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos name = "atmospherics hardsuit helmet" @@ -231,6 +231,9 @@ ..() flags ^= NODROP +/obj/item/clothing/suit/space/hardsuit/syndi/New() + jetpack = new /obj/item/weapon/tank/jetpack/suit(src) + ..() //The Owl Hardsuit /obj/item/clothing/head/helmet/space/hardsuit/syndi/owl diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 1a4202e88b3..380e0262597 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -80,6 +80,9 @@ /obj/item/clothing/suit/space/hardsuit/New() MakeHelmet() + if(!jetpack) + verbs -= /obj/item/clothing/suit/space/hardsuit/verb/Jetpack + verbs -= /obj/item/clothing/suit/space/hardsuit/verb/Jetpack_Rockets ..() /obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet()