diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index bc2a585f7b3..2ed53b90dc3 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -84,7 +84,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) /datum/theft_objective/voidsuit name = "a nasa voidsuit" - typepath = /obj/item/clothing/suit/space/nasavoid + typepath = /obj/item/clothing/suit/space/voidsuit protected_jobs = list("Research Director") /datum/theft_objective/slime_extract diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 3334fdf2de7..1710babcfae 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 = "It works well in a void." + desc = "A simple retro jetpack. This one is painted orange." icon_state = "jetpack-void" item_state = "jetpack-void" @@ -96,6 +96,16 @@ ..() air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/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" + /obj/item/weapon/tank/jetpack/oxygen name = "Jetpack (Oxygen)" diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index ba32e37f38c..1c59a73dae6 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -9,8 +9,8 @@ ..() new /obj/item/weapon/tank/jetpack/void(src) new /obj/item/clothing/mask/breath(src) - new /obj/item/clothing/head/helmet/space/nasavoid(src) - new /obj/item/clothing/suit/space/nasavoid(src) + new /obj/item/clothing/head/helmet/space/voidsuit(src) + new /obj/item/clothing/suit/space/voidsuit(src) new /obj/item/weapon/crowbar(src) new /obj/item/weapon/stock_parts/cell(src) new /obj/item/device/multitool(src) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm index cce0f4c49b3..2641df9a60e 100644 --- a/code/modules/clothing/spacesuits/void.dm +++ b/code/modules/clothing/spacesuits/void.dm @@ -1,14 +1,95 @@ -//NASA Voidsuit -/obj/item/clothing/head/helmet/space/nasavoid - name = "NASA Void Helmet" - desc = "A high tech, NASA Centcom branch designed, dark red space suit helmet. Used for AI satellite maintenance." - icon_state = "void" +//Voidsuits +/obj/item/clothing/head/helmet/space/voidsuit + name = "Red Retro Void Helmet" + desc = "A classic, retro space suit helmet in red." + icon_state = "void-red" item_state = "void" -/obj/item/clothing/suit/space/nasavoid - name = "NASA Voidsuit" - icon_state = "void" +/obj/item/clothing/suit/space/voidsuit + name = "Red Retro Voidsuit" + icon_state = "void-red" item_state = "void" - desc = "A high tech, NASA Centcom branch designed, dark red Space suit. Used for AI satellite maintenance." - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool) \ No newline at end of file + desc = "A classic, retro Space suit in red." + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool) + +//Colors!!! +/obj/item/clothing/head/helmet/space/voidsuit/green + name = "Green Retro Void Helmet" + desc = "A classic, retro space suit helmet in green." + icon_state = "void-green" + +/obj/item/clothing/suit/space/voidsuit/green + name = "Green Retro Voidsuit" + icon_state = "void-green" + desc = "A classic, retro Space suit in green." + +/obj/item/clothing/head/helmet/space/voidsuit/ntblue + name = "NT Blue Retro Void Helmet" + desc = "A classic, retro space suit helmet in NT colors." + icon_state = "void-ntblue" + +/obj/item/clothing/suit/space/voidsuit/ntblue + name = "NT Blue Retro Voidsuit" + icon_state = "void-ntblue" + desc = "A classic, retro Space suit in NT colors." + +/obj/item/clothing/head/helmet/space/voidsuit/purple + name = "Purple Retro Void Helmet" + desc = "A classic, retro dark space suit helmet in purple." + icon_state = "void-purple" + +/obj/item/clothing/suit/space/voidsuit/pruple + name = "Purple Retro Voidsuit" + icon_state = "void-purple" + desc = "A classic, retro dark Space suit in purple." + +/obj/item/clothing/head/helmet/space/voidsuit/yellow + name = "Yellow Retro Void Helmet" + desc = "A classic, retro space suit helmet in yellow." + icon_state = "void-yellow" + +/obj/item/clothing/suit/space/voidsuit/yellow + name = "Yellow Retro Voidsuit" + icon_state = "void-yellow" + desc = "A classic, retro Space suit in yellow." + +/obj/item/clothing/head/helmet/space/voidsuit/ltblue + name = "Light Blue Retro Void Helmet" + desc = "A classic, retro space suit helmet in light blue." + icon_state = "void-light_blue" + +/obj/item/clothing/suit/space/voidsuit/ltblue + name = "Light Blue Retro Voidsuit" + icon_state = "void-light_blue" + desc = "A classic, retro Space suit 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/voidsuit/captian + name = "Fancy Retro Void Helmet" + desc = "A classic, retro space suit helmet, this one is fit for a captian." + icon_state = "void-captian" + +/obj/item/clothing/suit/space/voidsuit/captain + name = "Fancy Retro Voidsuit" + icon_state = "void-captian" + desc = "A classic, retro Space suit, this one is fit for a captian." + +//Syndi's suit, on par with a blood red softsuit + +/obj/item/clothing/head/helmet/space/voidsuit/syndi + name = "Blood Red Retro Void Helmet" + desc = "A classic, retro space suit helmet in blood red." + icon_state = "void-syndi" + armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) + +/obj/item/clothing/suit/space/voidsuit/syndi + name = "Blood Red Retro Voidsuit" + icon_state = "void-syndi" + desc = "A classic, retro Space suit in blood red." + 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) + + diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index d180bb9c2ac..9f07ea7c64d 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -689,7 +689,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite /obj/item/weapon/hand_tele, /obj/item/weapon/rcd, /obj/item/weapon/tank/jetpack,\ /obj/item/clothing/under/rank/captain, /obj/item/device/aicard,\ /obj/item/clothing/shoes/magboots, /obj/item/areaeditor/blueprints, /obj/item/weapon/disk/nuclear,\ - /obj/item/clothing/suit/space/nasavoid, /obj/item/weapon/tank) + /obj/item/clothing/suit/space/voidsuit, /obj/item/weapon/tank) /obj/effect/hallucination/bolts var/list/doors = list() diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 574052a3297..d229cd65875 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 81096a8c13a..3435b1bdba6 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 008e7ae9ad2..78d7bc94091 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 5c34785d51e..80c4c0e9ff2 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 92b77524bc4..c393394e1c3 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi index c020f467d92..e43d6c44008 100644 Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ