From c5f0cd344151b7aa99f0f28191330fe75b4961b7 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Mon, 25 Mar 2024 19:48:10 +1300 Subject: [PATCH] suit armor values (#18721) --- .../clothing/spacesuits/void/alien/skrell.dm | 38 +++++++--- .../clothing/spacesuits/void/alien/unathi.dm | 71 ++----------------- .../changelogs/RustingWithYou - suitnerfs.yml | 41 +++++++++++ 3 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 html/changelogs/RustingWithYou - suitnerfs.yml diff --git a/code/modules/clothing/spacesuits/void/alien/skrell.dm b/code/modules/clothing/spacesuits/void/alien/skrell.dm index b56b2a94578..8abde41daa9 100644 --- a/code/modules/clothing/spacesuits/void/alien/skrell.dm +++ b/code/modules/clothing/spacesuits/void/alien/skrell.dm @@ -56,13 +56,13 @@ item_state = "kala_suit" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, + melee = ARMOR_MELEE_RESISTANT, + bullet = ARMOR_BALLISTIC_MEDIUM, + laser = ARMOR_LASER_PISTOL, + energy = ARMOR_ENERGY_MINOR, bomb = ARMOR_BOMB_PADDED, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + rad = ARMOR_RAD_SMALL ) species_restricted = list(BODYTYPE_SKRELL) refittable = FALSE @@ -75,13 +75,13 @@ item_state = "kala_helm" contained_sprite = TRUE armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, + melee = ARMOR_MELEE_RESISTANT, + bullet = ARMOR_BALLISTIC_MEDIUM, + laser = ARMOR_LASER_PISTOL, + energy = ARMOR_ENERGY_MINOR, bomb = ARMOR_BOMB_PADDED, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + rad = ARMOR_RAD_SMALL ) species_restricted = list(BODYTYPE_SKRELL) refittable = FALSE @@ -115,9 +115,27 @@ desc = "A sleek skrell voidsuit that slightly shimmers as it moves. This one has a Nralakk Federation emblem on it. This one belongs to a Qukala engineer." icon_state = "kala_eng" item_state = "kala_eng" + armor = list( + melee = ARMOR_MELEE_RESISTANT, + bullet = ARMOR_BALLISTIC_MEDIUM, + laser = ARMOR_LASER_PISTOL, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_SHIELDED + ) /obj/item/clothing/head/helmet/space/void/kala/engineering name = "qukala engineer voidsuit helmet" desc = "A sleek skrell voidsuit helmet that slightly shimmers as it moves. This one has a Nralakk Federation emblem on it. This one belongs to a Qukala engineer." icon_state = "kala_helm_eng" item_state = "kala_helm_eng" + armor = list( + melee = ARMOR_MELEE_RESISTANT, + bullet = ARMOR_BALLISTIC_MEDIUM, + laser = ARMOR_LASER_PISTOL, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_SHIELDED + ) diff --git a/code/modules/clothing/spacesuits/void/alien/unathi.dm b/code/modules/clothing/spacesuits/void/alien/unathi.dm index 295ab271498..7da9d9d5d7d 100644 --- a/code/modules/clothing/spacesuits/void/alien/unathi.dm +++ b/code/modules/clothing/spacesuits/void/alien/unathi.dm @@ -247,12 +247,12 @@ icon_state = "rig-tarwapirate-helmet" item_state = "rig-tarwapirate-helmet" armor = list( - melee = ARMOR_MELEE_RESISTANT, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_SMALL, - bomb = ARMOR_BOMB_PADDED, + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_CARBINE, + laser = ARMOR_LASER_PISTOL, + bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED + rad = ARMOR_RAD_SHIELDED //it has diona growing on and in it to absorb rads ) light_overlay = "helmet_light_green" @@ -262,44 +262,18 @@ This one appears to have been reinforced." icon_state = "rig-tarwacaptain-helmet" item_state = "rig-tarwacaptain-helmet" - armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_CARBINE, - laser = ARMOR_LASER_PISTOL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED - ) /obj/item/clothing/suit/space/void/unathi_pirate/kazu name = "techraider voidsuit" desc = "This appears to be an Unathi-fitted voidsuit. It has been modified and reinforced with sleeker plates of advanced materials, recognisable to a keen eye as pieces of Solarian and Skrell military-grade suits. It's surprisingly light and quite popular among the members of the Unathi fleet known as Kazu's Techraiders." icon_state = "rig-kazupirate" item_state = "rig-kazupirate" - armor = list( //taken from qukala voidsuit - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED - ) /obj/item/clothing/head/helmet/space/void/unathi_pirate/kazu name = "techraider helmet" desc = "An advanced helmet made to fit in a large assembly. Its multi-optic visor is reminiscent of some Vaurca designs." icon_state = "rig-kazupirate-helmet" item_state = "rig-kazupirate-helmet" - armor = list( - melee = ARMOR_MELEE_KNIVES, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_MEDIUM, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED - ) light_overlay = "helmet_light_jargon_rig" /obj/item/clothing/suit/space/void/unathi_pirate/kazu/captain @@ -308,30 +282,13 @@ Various improvements have been made to this specific suit, implying it's probably made for higher-ranking crew." icon_state = "rig-kazucaptain" item_state = "rig-kazucaptain" - armor = list( //looked at combat hardsuits then toned them down slightly. still an upgrade but not ridiculous. - melee = ARMOR_MELEE_KEVLAR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED - ) /obj/item/clothing/head/helmet/space/void/unathi_pirate/kazu/captain name = "techraider captain's helmet" desc = "A reinforced and advanced helmet made to fit in a large assembly. Its multi-optic visor is reminiscent of Vaurca designs." icon_state = "rig-kazucaptain-helmet" item_state = "rig-kazucaptain-helmet" - armor = list( - melee = ARMOR_MELEE_KEVLAR, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED - ) + /obj/item/clothing/suit/space/void/unathi_pirate/hiskyn name = "hiskyn revanchist voidsuit" @@ -351,25 +308,9 @@ desc = "A bastardized version of an older Dominian voidsuit mixed with parts taken from the infamous Raider suit used by pirate Unathi, popular among members of the Hiskyn Revanchist fleet. The result is a tough and somewhat sluggish suit. This one is even more reinforced, and is probably made for a Captain or some kind of high-ranking crew member" icon_state = "rig-hiskyncaptain" item_state = "rig-hiskyncaptain" - armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_CARBINE, - laser = ARMOR_LASER_PISTOL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT - ) /obj/item/clothing/head/helmet/space/void/unathi_pirate/hiskyn/captain name = "hiskyn revanchist captain's helmet" desc = "A reinforced mix of older Dominian and homemade Unathi pirate hardware in a single helmet; made to fit in a larger assembly." icon_state = "rig-hiskyncaptain-helmet" item_state = "rig-hiskyncaptain-helmet" - armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_CARBINE, - laser = ARMOR_LASER_PISTOL, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_RESISTANT - ) diff --git a/html/changelogs/RustingWithYou - suitnerfs.yml b/html/changelogs/RustingWithYou - suitnerfs.yml new file mode 100644 index 00000000000..4aa2e7e3556 --- /dev/null +++ b/html/changelogs/RustingWithYou - suitnerfs.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Alters stats on Qukala & Techraider voidsuits to be in-line with standard combat suit values."