From 30d414652cc01479ec3fe4247ca9038b306c4cf3 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Tue, 28 Apr 2020 18:39:04 +0200 Subject: [PATCH] Nerfs the cybersun hardsuit and moves it out of the uplink (#50721) * nerf * nerf this * description --- .../ruins/spaceruin_code/forgottenship.dm | 7 +++---- code/modules/uplink/uplink_items.dm | 18 +----------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/code/modules/ruins/spaceruin_code/forgottenship.dm b/code/modules/ruins/spaceruin_code/forgottenship.dm index bf0d84daea0..dd893477388 100644 --- a/code/modules/ruins/spaceruin_code/forgottenship.dm +++ b/code/modules/ruins/spaceruin_code/forgottenship.dm @@ -133,7 +133,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) icon_state = "cybersun" item_state = "cybersun" hardsuit_type = "cybersun" - armor = list("melee" = 30, "bullet" = 40, "laser" = 70, "energy" = 70, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) + armor = list("melee" = 30, "bullet" = 40, "laser" = 55, "energy" = 55, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) strip_delay = 600 actions_types = list() @@ -143,9 +143,8 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) item_state = "cybersun" hardsuit_type = "cybersun" name = "Cybersun hardsuit" - desc = "Prototype hardsuit with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else. Requires the user to activate the inner mechanism in order to unequip it, making it really difficult to take it off from somebody else." - armor = list("melee" = 30, "bullet" = 40, "laser" = 70, "energy" = 70, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) - strip_delay = 600 + desc = "Prototype hardsuit with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else." + armor = list("melee" = 30, "bullet" = 40, "laser" = 55, "energy" = 55, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) slowdown = 0 helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cybersun actions_types = list(/datum/action/item_action/toggle_helmet, /datum/action/item_action/toggle_spacesuit) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index c6ccc1dd681..37696c2a3c4 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1258,22 +1258,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 8 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //you can't buy it in nuke, because the elite hardsuit costs the same while being better -/datum/uplink_item/suits/hardsuit/cybersun - name = "Cybersun Hardsuit" - desc = "A long forgotten hardsuit made by Cybersun industries. \ - Offers ROBUST protection against laser-based weapons, while still giving somewhat good chances \ - to survive assault from a toolbox or shotgun. \ - Not to mention, it doesn't slow you down and contains an integrated jetpack that runs on standard tanks. \ - Systems in this hardsuit make it really hard to take it off from you." - item = /obj/item/clothing/suit/space/hardsuit/cybersun - cost = 14 - exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //nuke and clown ops get it for lower value - -/datum/uplink_item/suits/hardsuit/cybersun/nuke - cost = 8 - include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) - exclude_modes = list() - /datum/uplink_item/suits/hardsuit/elite name = "Elite Syndicate Hardsuit" desc = "An upgraded, elite version of the Syndicate hardsuit. It features fireproofing, and also \ @@ -1967,7 +1951,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 1 include_modes = list(/datum/game_mode/nuclear/clown_ops) illegal_tech = FALSE - + /datum/uplink_item/badass/tactical_naptime name = "Sleepy Time Pajama Bundle" desc = "Even soldiers need to get a good nights rest. Comes with blood-red pajamas, a blankie, a hot mug of cocoa and a fuzzy friend."