diff --git a/modular_skyrat/modules/blueshield/code/closet.dm b/modular_skyrat/modules/blueshield/code/closet.dm index 8c7a3c195c9..b66f2d95c4e 100644 --- a/modular_skyrat/modules/blueshield/code/closet.dm +++ b/modular_skyrat/modules/blueshield/code/closet.dm @@ -31,3 +31,4 @@ new /obj/item/storage/medkit/tactical/blueshield(src) new /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano(src) new /obj/item/storage/bag/garment/blueshield(src) + new /obj/item/mod/control/pre_equipped/blueshield(src) diff --git a/modular_skyrat/modules/blueshield/code/modsuit/mod_theme.dm b/modular_skyrat/modules/blueshield/code/modsuit/mod_theme.dm new file mode 100644 index 00000000000..cfb38c35a6a --- /dev/null +++ b/modular_skyrat/modules/blueshield/code/modsuit/mod_theme.dm @@ -0,0 +1,67 @@ +/datum/mod_theme/blueshield + name = "praetorian" + desc = "A prototype of the Magnate-class suit issued to station Blueshields, still boasting exceptional protection worthy of an honor guard." + extended_desc = "A prototype of the Magnate-class suit issued for use with the station Blueshields, \ + it boasts the exceptional protection of it's successor, while sacrificing some of the module capacity.\ + All of the protection of the Magnate, with none of the comfort! The visor uses blue-light to obscure \ + the face of it's wearer, adding to it's imposing figure. Compared to the sleek and luxurious design \ + that came after it, this suit does nothing to hide it's purpose, the reinforced plating layered \ + over the insulated inner armor granting it protection against corrosive liquids, explosive blasts, \ + fires, electrical shocks, and contempt from the rest of the crew." + + default_skin = "praetorian" + armor_type = /datum/armor/mod_theme_blueshield + resistance_flags = FIRE_PROOF|ACID_PROOF + atom_flags = PREVENT_CONTENTS_EXPLOSION_1 + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + siemens_coefficient = 0 + complexity_max = DEFAULT_MAX_COMPLEXITY + 3 + slowdown_inactive = 0.75 + slowdown_active = 0.25 + allowed_suit_storage = list( + /obj/item/ammo_box, + /obj/item/ammo_casing, + /obj/item/restraints/handcuffs, + /obj/item/assembly/flash, + /obj/item/melee/baton, + ) + skins = list( + "praetorian" = list( + MOD_ICON_OVERRIDE = 'modular_skyrat/modules/blueshield/icons/praetorian.dmi', + MOD_WORN_ICON_OVERRIDE = 'modular_skyrat/modules/blueshield/icons/worn_praetorian.dmi', + HELMET_FLAGS = list( + UNSEALED_LAYER = null, + UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS, + UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR, + SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEYES|HIDEFACE|HIDESNOUT, + SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF, + ), + CHESTPLATE_FLAGS = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + SEALED_INVISIBILITY = HIDEJUMPSUIT, + ), + GAUNTLETS_FLAGS = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + CAN_OVERSLOT = TRUE, + ), + BOOTS_FLAGS = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + CAN_OVERSLOT = TRUE, + ), + ), + ) + +/datum/armor/mod_theme_blueshield + melee = 40 + bullet = 30 + laser = 30 + energy = 40 + bomb = 50 + bio = 100 + fire = 100 + acid = 100 + wound = 20 diff --git a/modular_skyrat/modules/blueshield/code/modsuit/mod_type.dm b/modular_skyrat/modules/blueshield/code/modsuit/mod_type.dm new file mode 100644 index 00000000000..a644367333e --- /dev/null +++ b/modular_skyrat/modules/blueshield/code/modsuit/mod_type.dm @@ -0,0 +1,14 @@ +/obj/item/mod/control/pre_equipped/blueshield + theme = /datum/mod_theme/blueshield + applied_cell = /obj/item/stock_parts/cell/super + applied_modules = list( + /obj/item/mod/module/storage/large_capacity, + /obj/item/mod/module/magnetic_harness, + /obj/item/mod/module/flashlight, + /obj/item/mod/module/jetpack, + /obj/item/mod/module/projectile_dampener, + /obj/item/mod/module/quick_carry, + ) + default_pins = list( + /obj/item/mod/module/jetpack, + ) diff --git a/modular_skyrat/modules/blueshield/icons/praetorian.dmi b/modular_skyrat/modules/blueshield/icons/praetorian.dmi new file mode 100644 index 00000000000..1632262e8b8 Binary files /dev/null and b/modular_skyrat/modules/blueshield/icons/praetorian.dmi differ diff --git a/modular_skyrat/modules/blueshield/icons/worn_praetorian.dmi b/modular_skyrat/modules/blueshield/icons/worn_praetorian.dmi new file mode 100644 index 00000000000..373986abe4d Binary files /dev/null and b/modular_skyrat/modules/blueshield/icons/worn_praetorian.dmi differ diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_themes.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_themes.dm index cea674e2920..c2954a320c8 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_themes.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_themes.dm @@ -21,6 +21,9 @@ /datum/mod_theme/magnate hardlight_theme = ROYAL_PURPLE +/datum/mod_theme/blueshield + hardlight_theme = COSMIC_BLUE + /datum/mod_theme/research hardlight_theme = ROYAL_PURPLE diff --git a/modular_skyrat/modules/time_clock/code/console_tgui.dm b/modular_skyrat/modules/time_clock/code/console_tgui.dm index 306a2d9c49c..0060e134a46 100644 --- a/modular_skyrat/modules/time_clock/code/console_tgui.dm +++ b/modular_skyrat/modules/time_clock/code/console_tgui.dm @@ -32,6 +32,7 @@ /obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/skild, \ /obj/item/storage/belt/sabre, \ /obj/item/mod/control/pre_equipped/magnate, \ + /obj/item/mod/control/pre_equipped/blueshield, \ /obj/item/clothing/suit/armor/vest/warden, \ /obj/item/clothing/glasses/hud/security/sunglasses, \ /obj/item/clothing/gloves/krav_maga/sec, \ diff --git a/tgstation.dme b/tgstation.dme index 5b809f546d7..fc3d9ea0a58 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6497,6 +6497,8 @@ #include "modular_skyrat\modules\blueshield\code\medkit.dm" #include "modular_skyrat\modules\blueshield\code\devices\crew.dm" #include "modular_skyrat\modules\blueshield\code\devices\sensor_device.dm" +#include "modular_skyrat\modules\blueshield\code\modsuit\mod_theme.dm" +#include "modular_skyrat\modules\blueshield\code\modsuit\mod_type.dm" #include "modular_skyrat\modules\bluespace_miner\code\bluespace_miner.dm" #include "modular_skyrat\modules\bodyparts\code\_mutant_bodyparts.dm" #include "modular_skyrat\modules\bodyparts\code\akula_bodyparts.dm"