diff --git a/_maps/shuttles/pirate_Interdyne.dmm b/_maps/shuttles/pirate_Interdyne.dmm index 76696efb091..267771b9765 100644 --- a/_maps/shuttles/pirate_Interdyne.dmm +++ b/_maps/shuttles/pirate_Interdyne.dmm @@ -324,11 +324,8 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 }, -/obj/machinery/suit_storage_unit/medical, -/obj/item/mod/module/defibrillator/combat, -/obj/item/mod/module/tether, +/obj/machinery/suit_storage_unit/interdyne, /obj/item/screwdriver/nuke, -/obj/item/mod/module/surgical_processor/preloaded, /turf/open/floor/iron/dark, /area/shuttle/pirate) "bl" = ( @@ -356,11 +353,8 @@ /area/shuttle/pirate) "br" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, -/obj/machinery/suit_storage_unit/medical, -/obj/item/mod/module/defibrillator/combat, -/obj/item/mod/module/tether, +/obj/machinery/suit_storage_unit/interdyne, /obj/item/screwdriver/nuke, -/obj/item/mod/module/surgical_processor/preloaded, /turf/open/floor/iron/dark, /area/shuttle/pirate) "bu" = ( @@ -443,11 +437,8 @@ /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ dir = 4 }, -/obj/machinery/suit_storage_unit/medical, -/obj/item/mod/module/defibrillator/combat, -/obj/item/mod/module/tether, +/obj/machinery/suit_storage_unit/interdyne, /obj/item/screwdriver/nuke, -/obj/item/mod/module/surgical_processor/preloaded, /turf/open/floor/iron/dark, /area/shuttle/pirate) "bX" = ( diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 2621e080118..d5d0e9c732e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -138,6 +138,11 @@ storage_type = /obj/item/tank/jetpack/oxygen/harness mod_type = /obj/item/mod/control/pre_equipped/nuclear +/obj/machinery/suit_storage_unit/interdyne + mask_type = /obj/item/clothing/mask/gas/syndicate + storage_type = /obj/item/tank/jetpack/oxygen/harness + mod_type = /obj/item/mod/control/pre_equipped/interdyne + /obj/machinery/suit_storage_unit/void_old suit_type = /obj/item/clothing/suit/space/nasavoid/old helmet_type = /obj/item/clothing/head/helmet/space/nasavoid/old diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index b18805f38d5..1562cd3a3ee 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -1161,6 +1161,88 @@ acid = 100 wound = 25 +/datum/mod_theme/interdyne + name = "interdyne" + desc = "A corpse-snatching and rapid-retrieval modsuit, resulting from a lucrative tech exchange between Interdyne Pharmaceutics and Cybersun Industries." + extended_desc = "While Waffle Co. and Azik Interstellar provide the means, Donk Co., Tiger Cooperative, Animal Rights Consortium and \ + Gorlex Marauders willing or easly bribable brawn, S.E.L.F. and MI13 information, the clear syndicate tech providers would be Interdyne and Cybersun, \ + their combined knowledge in technologies rivaled by only most enigmatic of aliens, and certainly not by any Nanotrasen scientist. \ + This model is one of rare fruits created by their joint operations, mashing scrapped designs with super soldier enhancements. \ + Already light, when powered on, this modsuits injects the wearer seemlessly with muscle-enhancing supplements, while adding piston strenght \ + to their legs. Combination of these mechanisms is very energy draining - but results in next to no speed reduction for the wearer.\ + Over the years, many a rich person, including Nanostrasen officials with premium subscriptions, had their life or genes rescued thanks to \ + unrivaled speed of this suit model. Equally as many, however, mysteriously dissapeared in the flash of these white suits after they forgot \ + to pay off said subscriptions in due time or publicly communicated unfavourable opinions on Intrudyne's gene-modding tech and ethics. " + default_skin = "interdyne" + armor_type = /datum/armor/mod_theme_interdyne + resistance_flags = FIRE_PROOF|ACID_PROOF + max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT + charge_drain = DEFAULT_CHARGE_DRAIN * 2 + slowdown_inactive = 0.0 + slowdown_active = -0.5 + inbuilt_modules = list(/obj/item/mod/module/quick_carry/advanced, /obj/item/mod/module/organ_thrower) + allowed_suit_storage = list( + /obj/item/ammo_box, + /obj/item/ammo_casing, + /obj/item/assembly/flash, + /obj/item/healthanalyzer, + /obj/item/melee/baton, + /obj/item/melee/baton/telescopic, + /obj/item/melee/energy/sword, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, + /obj/item/reagent_containers/cup/tube, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/hypospray, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/syringe, + /obj/item/restraints/handcuffs, + /obj/item/sensor_device, + /obj/item/shield/energy, + /obj/item/stack/medical, + /obj/item/storage/bag/bio, + /obj/item/storage/bag/chemistry, + /obj/item/storage/pill_bottle, + ) + skins = list( + "interdyne" = list( + HELMET_FLAGS = list( + UNSEALED_LAYER = NECK_LAYER, + UNSEALED_CLOTHING = SNUG_FIT, + SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT|HEADINTERNALS, + UNSEALED_INVISIBILITY = HIDEFACIALHAIR, + SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|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_interdyne + melee = 30 + bullet = 30 + laser = 30 + energy = 30 + bomb = 20 + bio = 100 + fire = 100 + acid = 100 + wound = 30 + /datum/mod_theme/enchanted name = "enchanted" desc = "The Wizard Federation's relatively low-tech MODsuit. Is very protective, though." diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index c541b3e54ea..b5de82895ac 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -288,6 +288,20 @@ /obj/item/mod/module/visor/diaghud, ) + +/obj/item/mod/control/pre_equipped/interdyne + theme = /datum/mod_theme/interdyne + applied_cell = /obj/item/stock_parts/cell/super + applied_modules = list( + /obj/item/mod/module/defibrillator/combat, + /obj/item/mod/module/flashlight, + /obj/item/mod/module/health_analyzer, + /obj/item/mod/module/injector, + /obj/item/mod/module/surgical_processor/preloaded, + /obj/item/mod/module/storage/syndicate, + /obj/item/mod/module/tether + ) + /obj/item/mod/control/pre_equipped/enchanted theme = /datum/mod_theme/enchanted applied_core = /obj/item/mod/core/infinite diff --git a/icons/mob/clothing/modsuit/mod_clothing.dmi b/icons/mob/clothing/modsuit/mod_clothing.dmi index 180a65f5cc9..537b1ffd3eb 100644 Binary files a/icons/mob/clothing/modsuit/mod_clothing.dmi and b/icons/mob/clothing/modsuit/mod_clothing.dmi differ diff --git a/icons/obj/clothing/modsuit/mod_clothing.dmi b/icons/obj/clothing/modsuit/mod_clothing.dmi index ed85ade5249..7eb92f1c351 100644 Binary files a/icons/obj/clothing/modsuit/mod_clothing.dmi and b/icons/obj/clothing/modsuit/mod_clothing.dmi differ