Skip to content

Commit

Permalink
https://github.com/tgstation/tgstation/pull/64668
Browse files Browse the repository at this point in the history
  • Loading branch information
Tsar-Salat committed Aug 18, 2024
1 parent 6386955 commit 8c8da77
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,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
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mod/mod_theme.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, BLEED = 25)
armor = list(MELEE = 20, BULLET = 10, LASER = 20, ENERGY = 20, BOMB = 55, BIO = 100, FIRE = 100, ACID = 100, BLEED = 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,
Expand Down
6 changes: 2 additions & 4 deletions code/modules/mod/mod_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,19 +146,18 @@
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
theme = /datum/mod_theme/syndicate
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,
Expand All @@ -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,
Expand Down
19 changes: 10 additions & 9 deletions code/modules/mod/modules/modules_antag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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()
. = ..()
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 8c8da77

Please sign in to comment.