From 1747f9e31ec1057818cb2db45394e0a64bcead14 Mon Sep 17 00:00:00 2001 From: shazbot194 Date: Sat, 14 Apr 2018 17:25:56 -0800 Subject: [PATCH] Small code improvements and description reverts --- .../objects/items/weapons/tanks/jetpack.dm | 4 +- code/modules/clothing/spacesuits/void.dm | 38 ++++++++----------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 1710babcfae..42dbbbda4b6 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -88,7 +88,7 @@ /obj/item/weapon/tank/jetpack/void name = "Void Jetpack (Oxygen)" - desc = "A simple retro jetpack. This one is painted orange." + desc = "It works well in a void." icon_state = "jetpack-void" item_state = "jetpack-void" @@ -98,12 +98,10 @@ /obj/item/weapon/tank/jetpack/void/grey name = "Void Jetpack (Oxygen)" - desc = "A simple retro jetpack. This one is painted grey." icon_state = "jetpack-void-grey" /obj/item/weapon/tank/jetpack/void/gold name = "Retro Jetpack (Oxygen)" - desc = "A simple retro jetpack. This one is painted gold." icon_state = "jetpack-void-gold" diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm index 639d1a7f11c..df26d6f2f15 100644 --- a/code/modules/clothing/spacesuits/void.dm +++ b/code/modules/clothing/spacesuits/void.dm @@ -2,7 +2,7 @@ //Voidsuits /obj/item/clothing/head/helmet/space/nasavoid name = "NASA Void Helmet" - desc = "A retro space suit helmet designed by a branch at NASA Centcomm. This one is in red." + desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance." icon_state = "void-red" item_state = "void" flags_inv = HIDEMASK|HIDEEARS @@ -11,75 +11,65 @@ name = "NASA Void Suit" icon_state = "void-red" item_state = "void" - desc = "A retro Space suit designed by a branch at NASA Centcomm. This one is in red." + desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance." allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool) //Colors!!! /obj/item/clothing/head/helmet/space/nasavoid/green icon_state = "void-green" - desc = "A retro space suit helmet designed by a branch at NASA Centcomm. This one is in green." /obj/item/clothing/suit/space/nasavoid/green icon_state = "void-green" - desc = "A retro Space suit designed by a branch at NASA Centcomm. This one is in green." /obj/item/clothing/head/helmet/space/nasavoid/ntblue icon_state = "void-ntblue" - desc = "A retro space suit helmet designed by a branch at NASA Centcomm. This one is in NT colors." /obj/item/clothing/suit/space/nasavoid/ntblue icon_state = "void-ntblue" - desc = "A retro Space suit designed by a branch at NASA Centcomm. This one is in NT colors." /obj/item/clothing/head/helmet/space/nasavoid/purple icon_state = "void-purple" - desc = "A retro space suit helmet designed by a branch at NASA Centcomm. This one is in purple." /obj/item/clothing/suit/space/nasavoid/purple icon_state = "void-purple" - desc = "A retro Space suit designed by a branch at NASA Centcomm. This one is in purple." /obj/item/clothing/head/helmet/space/nasavoid/yellow icon_state = "void-yellow" - desc = "A retro space suit helmet designed by a branch at NASA Centcomm. This one is in yellow." /obj/item/clothing/suit/space/nasavoid/yellow icon_state = "void-yellow" - desc = "A retro Space suit designed by a branch at NASA Centcomm. This one is in yellow." /obj/item/clothing/head/helmet/space/nasavoid/ltblue icon_state = "void-light_blue" - desc = "A retro space suit helmet designed by a branch at NASA Centcomm. This one is in light blue." /obj/item/clothing/suit/space/nasavoid/ltblue icon_state = "void-light_blue" - desc = "A retro Space suit designed by a branch at NASA Centcomm. This one is in light blue." + //Captian's Suit, like the other captian's suit, but looks better, at the cost of armor - /obj/item/clothing/head/helmet/space/nasavoid/captain name = "Fancy Retro Void Helmet" icon_state = "void-captian" - desc = "A retro space suit helmet designed by a branch at NASA Centcomm. This one is fit for a captain." + desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance. This one is fit for a captain." /obj/item/clothing/suit/space/nasavoid/captain name = "Fancy NASA Void Suit" icon_state = "void-captian" - desc = "A retro Space suit designed by a branch at NASA Centcomm. This one is fit for a captain." + desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance. This one is fit for a captain." //Syndi's suit, on par with a blood red softsuit /obj/item/clothing/head/helmet/space/nasavoid/syndi name = "Blood Red Retro Void Helmet" icon_state = "void-syndi" - desc = "A retro space suit helmet designed by a branch at NASA Centcomm. This one is in blood red." + desc = "A high tech, NASA Centcom branch designed space suit helmet. This one looks rather suspicious." flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) /obj/item/clothing/suit/space/nasavoid/syndi name = "Blood Red NASA Void Suit" icon_state = "void-syndi" - desc = "A retro Space suit designed by a branch at NASA Centcomm. This one is in blood red." + desc = "A high tech, NASA Centcom branch designed space suit. This one looks rather suspicious." w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank) armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) @@ -92,12 +82,11 @@ icon_state = "void-red" desc = "You shouldn't see this, a spawner for NASA Void Suits." var/suits = list("red", "green", "ntblue", "purple", "yellow", "ltblue") - var/obj/item/clothing/head/helmet/space/nasavoid/H - var/obj/item/clothing/suit/space/nasavoid/S /obj/effect/nasavoidsuitspawner/New() - var/suit_pick = pick(suits) - switch(suit_pick) + var/obj/item/clothing/head/helmet/space/nasavoid/H + var/obj/item/clothing/suit/space/nasavoid/S + switch(pick(suits)) if("red") H = new /obj/item/clothing/head/helmet/space/nasavoid S = new /obj/item/clothing/suit/space/nasavoid @@ -116,6 +105,9 @@ if("ltblue") H = new /obj/item/clothing/head/helmet/space/nasavoid/ltblue S = new /obj/item/clothing/suit/space/nasavoid/ltblue - S.loc = get_turf(src) - H.loc = get_turf(src) + var/turf/T = get_turf(src) + if(H) + H.forceMove(T) + if(S) + S.forceMove(T) qdel(src) \ No newline at end of file