diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 452eb305096..927db80dd0c 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -208,7 +208,7 @@ r_hand = /obj/item/shield/energy /datum/outfit/nuclear_operative_elite/post_equip(mob/living/carbon/human/H, visualsOnly) - var/obj/item/mod/module/armor_booster/elite/booster = locate() in H.back + var/obj/item/mod/module/armor_booster/booster = locate() in H.back booster.active = TRUE H.update_inv_back() var/obj/item/shield/energy/shield = locate() in H.held_items diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index a8772395415..e61f26f9b25 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -706,15 +706,15 @@ '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 = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 55, BIO = 100, FIRE = 100, ACID = 100, WOUND = 25) + armor = list(MELEE = 20, BULLET = 10, LASER = 20, ENERGY = 20, 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 siemens_coefficient = 0 - slowdown_inactive = 0.75 - slowdown_active = 0.25 + slowdown_inactive = 1 + slowdown_active = 0.5 ui_theme = "syndicate" - inbuilt_modules = list(/obj/item/mod/module/armor_booster/elite) + inbuilt_modules = list(/obj/item/mod/module/armor_booster) skins = list( "elite" = list( HELMET_LAYER = null, diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index d75836afe30..8f2e7ba975c 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -146,11 +146,11 @@ applied_cell = /obj/item/stock_parts/cell/super initial_modules = list( /obj/item/mod/module/storage/syndicate, - /obj/item/mod/module/welding, - /obj/item/mod/module/tether, + /obj/item/mod/module/jetpack, /obj/item/mod/module/pathfinder, /obj/item/mod/module/flashlight, /obj/item/mod/module/dna_lock, + /obj/item/mod/module/holster, ) /obj/item/mod/control/pre_equipped/nuclear @@ -158,7 +158,6 @@ applied_cell = /obj/item/stock_parts/cell/hyper initial_modules = list( /obj/item/mod/module/storage/syndicate, - /obj/item/mod/module/welding, /obj/item/mod/module/jetpack/advanced, /obj/item/mod/module/flashlight, /obj/item/mod/module/holster, @@ -170,7 +169,6 @@ applied_cell = /obj/item/stock_parts/cell/bluespace initial_modules = list( /obj/item/mod/module/storage/syndicate, - /obj/item/mod/module/welding, /obj/item/mod/module/emp_shield, /obj/item/mod/module/jetpack/advanced, /obj/item/mod/module/flashlight, diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index 7bc64049383..395e6abce1a 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -1,6 +1,6 @@ //Antag modules for MODsuits -///Armor Booster - Grants your suit more armor and speed in exchange for EVA protection. +///Armor Booster - Grants your suit more armor and speed in exchange for EVA protection. Also acts as a welding screen. /obj/item/mod/module/armor_booster name = "MOD armor booster module" desc = "A retrofitted series of retractable armor plates, allowing the suit to function as essentially power armor, \ @@ -11,7 +11,7 @@ module_type = MODULE_TOGGLE active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3 removable = FALSE - incompatible_modules = list(/obj/item/mod/module/armor_booster) + incompatible_modules = list(/obj/item/mod/module/armor_booster, /obj/item/mod/module/welding) cooldown_time = 0.5 SECONDS overlay_state_inactive = "module_armorbooster_off" overlay_state_active = "module_armorbooster_on" @@ -24,10 +24,11 @@ /// List of parts of the suit that are spaceproofed, for giving them back the pressure protection. var/list/spaceproofed = list() -/obj/item/mod/module/armor_booster/generate_worn_overlay(mutable_appearance/standing) - overlay_state_inactive = "[initial(overlay_state_inactive)]-[mod.skin]" - overlay_state_active = "[initial(overlay_state_active)]-[mod.skin]" - return ..() +/obj/item/mod/module/armor_booster/on_suit_activation() + mod.helmet.flash_protect = FLASH_PROTECTION_WELDER + +/obj/item/mod/module/armor_booster/on_suit_deactivation() + mod.helmet.flash_protect = initial(mod.helmet.flash_protect) /obj/item/mod/module/armor_booster/on_activation() . = ..() @@ -66,10 +67,10 @@ clothing_part.clothing_flags |= STOPSPRESSUREDAMAGE spaceproofed = list() -/obj/item/mod/module/armor_booster/elite - name = "MOD elite armor booster module" - armor_values = list(MELEE = 60, BULLET = 60, LASER = 50, ENERGY = 60) - added_slowdown = -0.25 +/obj/item/mod/module/armor_booster/generate_worn_overlay(mutable_appearance/standing) + overlay_state_inactive = "[initial(overlay_state_inactive)]-[mod.skin]" + overlay_state_active = "[initial(overlay_state_active)]-[mod.skin]" + return ..() ///Energy Shield - Gives you a rechargeable energy shield that nullifies attacks. /obj/item/mod/module/energy_shield diff --git a/icons/mob/clothing/mod.dmi b/icons/mob/clothing/mod.dmi index 256d0d773e0..d3dfe988e9c 100644 Binary files a/icons/mob/clothing/mod.dmi and b/icons/mob/clothing/mod.dmi differ diff --git a/icons/obj/clothing/modsuit/mod_clothing.dmi b/icons/obj/clothing/modsuit/mod_clothing.dmi index 686079b9b3e..bb459bdad30 100644 Binary files a/icons/obj/clothing/modsuit/mod_clothing.dmi and b/icons/obj/clothing/modsuit/mod_clothing.dmi differ