diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 251e32eb752..eba6ecf9a99 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -15,12 +15,12 @@ var/extended_desc = "A third-generation, modular civilian class suit by Nakamura Engineering, \ this suit is a staple across the galaxy for civilian applications. These suits are oxygenated, \ spaceworthy, resistant to fire and chemical threats, and are immunized against everything between \ - a sneeze and a bioweapon. However, their combat applications are incredibly minimal due to no \ - armor plating being installed by default, and their actuators only lead to slightly greater speed than normal." + a sneeze and a bioweapon. However, their combat applications are incredibly minimal due to the amount of \ + armor plating being installed by default, and their actuators only lead to slightly greater speed than industrial suits." /// Default skin of the MOD. var/default_skin = "standard" /// Armor shared across the MOD pieces. - var/armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 25, ACID = 25, WOUND = 10) + var/armor = list(MELEE = 10, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, BIO = 100, FIRE = 25, ACID = 25, WOUND = 5) /// Resistance flags shared across the MOD pieces. var/resistance_flags = NONE /// Atom flags shared across the MOD pieces. @@ -110,7 +110,7 @@ a shock-resistant outer layer, making the suit nigh-invulnerable against even the extremes of high-voltage electricity. \ However, the capacity for modification remains the same as civilian-grade suits." default_skin = "engineering" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 100, FIRE = 100, ACID = 25, WOUND = 10) + armor = list(MELEE = 10, BULLET = 5, LASER = 20, ENERGY = 10, BOMB = 10, BIO = 100, FIRE = 100, ACID = 25, WOUND = 10) resistance_flags = FIRE_PROOF max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT siemens_coefficient = 0 @@ -157,7 +157,7 @@ corrosive gasses and liquids, useful in the world of pipes. \ However, the capacity for modification remains the same as civilian-grade suits." default_skin = "atmospheric" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 100, FIRE = 100, ACID = 75, WOUND = 10) + armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 15, BOMB = 10, BIO = 100, FIRE = 100, ACID = 75, WOUND = 10) resistance_flags = FIRE_PROOF max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT slowdown_inactive = 1.5 @@ -205,7 +205,7 @@ The paint used is almost entirely immune to corrosives, and certainly looks damn fine. \ These come pre-installed with magnetic boots, using an advanced system to toggle them on or off as the user walks." default_skin = "advanced" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 100, FIRE = 100, ACID = 90, WOUND = 10) + armor = list(MELEE = 15, BULLET = 5, LASER = 20, ENERGY = 15, BOMB = 50, BIO = 100, FIRE = 100, ACID = 90, WOUND = 10) resistance_flags = FIRE_PROOF max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT siemens_coefficient = 0 @@ -269,7 +269,7 @@ so much so that it comes default fueled by equally-enigmatic plasma fuel rather than a simple recharge. \ Additionally, the systems have been put to near their maximum load, allowing for far less customization than others." default_skin = "mining" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 100, FIRE = 100, ACID = 75, WOUND = 15) + armor = list(MELEE = 15, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 30, BIO = 100, FIRE = 100, ACID = 75, WOUND = 15) resistance_flags = FIRE_PROOF|LAVA_PROOF max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT @@ -338,7 +338,7 @@ /datum/mod_theme/loader name = "loader" - desc = "An unsealed experimental motorized harness manufactured by Scarborough Arms for quick and efficient munition supplies" + desc = "An unsealed experimental motorized harness manufactured by Scarborough Arms for quick and efficient munition supplies." extended_desc = "This powered suit is an experimental spinoff of in-atmosphere Engineering suits. \ This fully articulated titanium exoskeleton is Scarborough Arms' suit of choice for their munition delivery men, \ and what it lacks in EVA protection, it makes up for in strength and flexibility. The primary feature of \ @@ -349,7 +349,7 @@ the user being able to run at greater speeds for much longer distances and times than an unsuited equivalent. \ A lot of people would say loading cargo is a dull job. You could not disagree more." default_skin = "loader" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 10, FIRE = 25, ACID = 25, WOUND = 5) + armor = list(MELEE = 15, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 10, BIO = 10, FIRE = 25, ACID = 25, WOUND = 10) max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT permeability_coefficient = 0.5 @@ -397,7 +397,7 @@ it is incredibly acid-resistant. It is slightly more demanding of power than civilian-grade models, \ and weak against fingers tapping the glass." default_skin = "medical" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 100, FIRE = 60, ACID = 75, WOUND = 10) + armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 10, BIO = 100, FIRE = 60, ACID = 75, WOUND = 5) charge_drain = DEFAULT_CHARGE_DRAIN * 1.5 slowdown_inactive = 1 slowdown_active = 0.5 @@ -476,7 +476,7 @@ all while being entirely immune against chemical and thermal threats. \ It is slightly more demanding of power than civilian-grade models, and weak against fingers tapping the glass." default_skin = "rescue" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 100, FIRE = 100, ACID = 100, WOUND = 10) + armor = list(MELEE = 10, BULLET = 10, LASER = 5, ENERGY = 5, BOMB = 10, BIO = 100, FIRE = 100, ACID = 100, WOUND = 5) resistance_flags = FIRE_PROOF|ACID_PROOF max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT charge_drain = DEFAULT_CHARGE_DRAIN * 1.5 @@ -534,11 +534,10 @@ Featuring an inbuilt chemical scanning array, this suit uses two layers of plastitanium armor, \ sandwiching an inert layer to dissipate kinetic energy into the suit and away from the user; \ outperforming even the best conventional EOD suits. However, despite its immunity against even \ - missiles and artillery, the armor is no more effective than standard suits against \ - other weapon types and physical damage; and all the explosive resistance mostly working to keep the user intact, \ + missiles and artillery, all the explosive resistance is mostly working to keep the user intact, \ not alive. The user will also find narrow doorframes nigh-impossible to surmount." default_skin = "research" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 100, BIO = 100, FIRE = 100, ACID = 100, WOUND = 15) + armor = list(MELEE = 20, BULLET = 15, LASER = 5, ENERGY = 5, BOMB = 100, BIO = 100, FIRE = 100, ACID = 100, WOUND = 15) resistance_flags = FIRE_PROOF|ACID_PROOF atom_flags = PREVENT_CONTENTS_EXPLOSION_1 max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT @@ -593,7 +592,7 @@ However, the systems used in these suits are more than a few years out of date, \ leading to an overall lower capacity for modules." default_skin = "security" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 25, BIO = 100, FIRE = 75, ACID = 75, WOUND = 20) + armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 25, BIO = 100, FIRE = 75, ACID = 75, WOUND = 15) siemens_coefficient = 0 complexity_max = DEFAULT_MAX_COMPLEXITY - 5 slowdown_inactive = 1 @@ -645,7 +644,7 @@ Heatsinks line the sides of the suit, and greater technology has been used in insulating it against \ both corrosive environments and sudden impacts to the user's joints." default_skin = "safeguard" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 40, BIO = 100, FIRE = 100, ACID = 95, WOUND = 25) + armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 40, BIO = 100, FIRE = 100, ACID = 95, WOUND = 15) resistance_flags = FIRE_PROOF max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT siemens_coefficient = 0 @@ -700,7 +699,7 @@ and bluespace processing to allow for a wide array of onboard modules to be supported, and only the best actuators \ have been employed for speed. The resemblance to a Gorlex Marauder helmet is purely coincidental." default_skin = "magnate" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 100, FIRE = 100, ACID = 100, WOUND = 20) + armor = list(MELEE = 20, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 50, BIO = 100, FIRE = 100, ACID = 100, WOUND = 15) resistance_flags = FIRE_PROOF|ACID_PROOF atom_flags = PREVENT_CONTENTS_EXPLOSION_1 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT @@ -752,7 +751,7 @@ this particular model does not employ manganese bipolar capacitor cleaners, thank the Honkmother. \ All you know is that this suit is mysteriously power-efficient, and far too colorful for the Mime to steal." default_skin = "cosmohonk" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 100, FIRE = 60, ACID = 30, WOUND = 5) + armor = list(MELEE = 5, BULLET = 5, LASER = 20, ENERGY = 20, BOMB = 10, BIO = 100, FIRE = 60, ACID = 30, WOUND = 5) charge_drain = DEFAULT_CHARGE_DRAIN * 0.25 slowdown_inactive = 1.75 slowdown_active = 1.25 @@ -802,7 +801,7 @@ A small tag hangs off of it reading; 'Property of the Gorlex Marauders, with assistance from Cybersun Industries. \ All rights reserved, tampering with suit will void warranty." default_skin = "syndicate" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 35, BIO = 100, FIRE = 50, ACID = 90, WOUND = 25) + armor = list(MELEE = 15, BULLET = 20, LASER = 15, ENERGY = 15, BOMB = 35, BIO = 100, FIRE = 50, ACID = 90, WOUND = 25) atom_flags = PREVENT_CONTENTS_EXPLOSION_1 max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT siemens_coefficient = 0 @@ -878,7 +877,7 @@ 'Property of the Gorlex Marauders, with assistance from Cybersun Industries. \ All rights reserved, tampering with suit will void life expectancy.'" default_skin = "elite" - armor = list(MELEE = 20, BULLET = 10, LASER = 20, ENERGY = 20, BOMB = 55, BIO = 100, FIRE = 100, ACID = 100, WOUND = 25) + armor = list(MELEE = 35, BULLET = 30, LASER = 35, ENERGY = 35, BOMB = 55, BIO = 100, FIRE = 100, ACID = 100, WOUND = 25) resistance_flags = FIRE_PROOF|ACID_PROOF atom_flags = PREVENT_CONTENTS_EXPLOSION_1 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT @@ -935,7 +934,7 @@ default means of power. The hood and platform boots are of unknown usage, but it's speculated that \ wizards trend towards the dramatic." default_skin = "enchanted" - armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 50, BOMB = 35, BIO = 100, FIRE = 100, ACID = 100, WOUND = 30) + armor = list(MELEE = 40, BULLET = 40, LASER = 50, ENERGY = 50, BOMB = 35, BIO = 100, FIRE = 100, ACID = 100, WOUND = 30) resistance_flags = FIRE_PROOF|ACID_PROOF max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT siemens_coefficient = 0 @@ -983,12 +982,10 @@ though it's missing several modern-day luxuries from updated Nakamura Engineering designs. \ Primarily, the suit's myoelectric suit layer is entirely non-existant, and the servos do very little to \ help distribute the weight evenly across the wearer's body, making it slow and bulky to move in. \ - Additionally, the armor plating never finished production aside from the shoulders, forearms, and helmet; \ - making it useless against direct attacks. The internal heads-up display is rendered in nearly unreadable cyan, \ - as the visor suggests, leaving the user unable to see long distances. \ - However, the way the helmet retracts is pretty cool." + The internal heads-up display is rendered in nearly unreadable cyan, as the visor suggests, \ + leaving the user unable to see long distances. However, the way the helmet retracts is pretty cool." default_skin = "prototype" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 100, FIRE = 100, ACID = 75, WOUND = 5) + armor = list(MELEE = 20, BULLET = 5, LASER = 10, ENERGY = 10, BOMB = 50, BIO = 100, FIRE = 100, ACID = 75, WOUND = 5) resistance_flags = FIRE_PROOF complexity_max = DEFAULT_MAX_COMPLEXITY + 5 charge_drain = DEFAULT_CHARGE_DRAIN * 2 @@ -1038,7 +1035,7 @@ it keeps the wearer safe from the harsh void of space while sacrificing no speed whatsoever. \ While wearing it you feel an extreme deference to darkness. " default_skin = "responsory" - armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 50, BIO = 100, FIRE = 100, ACID = 90, WOUND = 15) + armor = list(MELEE = 50, BULLET = 40, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 100, FIRE = 100, ACID = 90, WOUND = 10) atom_flags = PREVENT_CONTENTS_EXPLOSION_1 resistance_flags = FIRE_PROOF max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT @@ -1164,7 +1161,7 @@ counted as a war-crime and reason for immediate execution in over fifty Nanotrasen space stations. \ The resemblance to a Gorlex Marauder helmet is purely coincidental." default_skin = "corporate" - armor = list(MELEE = 35, BULLET = 40, LASER = 40, ENERGY = 50, BOMB = 50, BIO = 100, FIRE = 100, ACID = 100, WOUND = 15) + armor = list(MELEE = 50, BULLET = 40, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 100, FIRE = 100, ACID = 100, WOUND = 15) resistance_flags = FIRE_PROOF|ACID_PROOF atom_flags = PREVENT_CONTENTS_EXPLOSION_1 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT @@ -1214,7 +1211,7 @@ and sometimes hilariously painful side effects of jumping timelines, while providing inbuilt equipment for \ making timeline adjustments to correct a bad course." default_skin = "chrono" - armor = list(MELEE = 60, BULLET = 60, LASER = 60, ENERGY = 60, BOMB = 30, BIO = 100, FIRE = 100, ACID = 100) + armor = list(MELEE = 60, BULLET = 60, LASER = 60, ENERGY = 60, BOMB = 30, BIO = 100, FIRE = 100, ACID = 100, WOUND = 15) resistance_flags = FIRE_PROOF|ACID_PROOF max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT complexity_max = DEFAULT_MAX_COMPLEXITY - 10 diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index 9e18d63a140..9338e463e2d 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -20,7 +20,7 @@ /// Slowdown added to the suit. var/added_slowdown = -0.5 /// Armor values added to the suit parts. - var/list/armor_values = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 40) + var/list/armor_values = list(MELEE = 25, BULLET = 30, LASER = 15, ENERGY = 15) /// List of parts of the suit that are spaceproofed, for giving them back the pressure protection. var/list/spaceproofed = list() diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index 78ea3fe466b..c67900c09d9 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -349,7 +349,7 @@ /// How many tiles we traveled through. var/traveled_tiles = 0 /// Armor values per tile. - var/list/armor_values = list(MELEE = 5.5, BULLET = 1.5, LASER = 2, ENERGY = 2.5, BOMB = 2.5) + var/list/armor_values = list(MELEE = 4, BULLET = 1, LASER = 2, ENERGY = 2, BOMB = 4) /// Speed added when you're fully covered in ash. var/speed_added = 0.5 /// Turfs that let us accrete ash.