diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm index 9f8237cbc20..ffe1ed3164b 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm @@ -3403,9 +3403,6 @@ /area/ruin/space/has_grav/port_tarkon/engineering) "lS" = ( /obj/structure/safe/floor, -/obj/item/mod/module/armor_booster/retractplates{ - desc = "A complex set of actuators, micro-seals and a simple guide on how to install it, This... \"Modification\" allows the plating around the joints to retract, giving minor protection and a bit better mobility. There also seems to be a small, wireless microphone... how odd." - }, /obj/item/gun/ballistic/shotgun/doublebarrel, /obj/effect/turf_decal/tile/red/real_red/half{ dir = 4 diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index 3eee7969e9c..fc19501c23a 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -357,7 +357,7 @@ desc = "A module that collects ash from the terrain, covering the suit in a protective layer, this layer is \ lost when moving across standard terrain." icon_state = "ash_accretion" - removable = FALSE + removable = TRUE // BUBBER EDIT CHANGE - ORIGINAL: removable = FALSE incompatible_modules = list(/obj/item/mod/module/ash_accretion) overlay_state_inactive = "module_ash" use_mod_colors = TRUE diff --git a/modular_skyrat/master_files/code/modules/mod/mod_theme.dm b/modular_skyrat/master_files/code/modules/mod/mod_theme.dm index a6111794343..c8017166b4b 100644 --- a/modular_skyrat/master_files/code/modules/mod/mod_theme.dm +++ b/modular_skyrat/master_files/code/modules/mod/mod_theme.dm @@ -304,54 +304,6 @@ acid = 25 wound = 5 -/datum/mod_theme/syndicate // Bloodred Syndicate - armor_type = /datum/armor/mod_theme_syndicate - -/datum/armor/mod_theme_syndicate - melee = 20 - bullet = 25 - laser = 15 - energy = 20 - bomb = 40 - bio = 100 - fire = 50 - acid = 90 - wound = 25 - -/obj/item/mod/module/armor_booster - // Half of the old armor is on the MODsuit, the other half is from the booster - armor_mod = /datum/armor/mod_module_armor_boost_override - -/datum/armor/mod_module_armor_boost_override - melee = 20 - bullet = 25 - laser = 15 - energy = 20 - -/datum/mod_theme/elite // Elite Syndiate - armor_type = /datum/armor/mod_theme_elite - -/datum/armor/mod_theme_elite - melee = 30 - bullet = 30 - laser = 25 - energy = 30 - bomb = 60 - bio = 100 - fire = 100 - acid = 100 - wound = 25 - -/obj/item/mod/module/armor_booster/elite - // Ditto - half on suit, half on booster - armor_mod = /datum/armor/mod_module_armor_boost_elite - -/datum/armor/mod_module_armor_boost_elite - melee = 30 - bullet = 30 - laser = 25 - energy = 30 - /datum/mod_theme/prototype // Charlie Station armor_type = /datum/armor/mod_theme_prototype diff --git a/modular_skyrat/master_files/code/modules/mod/modules/modules_antag.dm b/modular_skyrat/master_files/code/modules/mod/modules/modules_antag.dm deleted file mode 100644 index ed914d910f7..00000000000 --- a/modular_skyrat/master_files/code/modules/mod/modules/modules_antag.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/mod/module/armor_booster - supports_variations_flags = CLOTHING_SNOUTED_VARIATION - has_head_sprite = TRUE - head_only_when_active = TRUE - head_only_when_inactive = TRUE diff --git a/modular_skyrat/modules/Midroundtraitor/code/datum_traitor.dm b/modular_skyrat/modules/Midroundtraitor/code/datum_traitor.dm index aa47e065cc0..a50e8b10708 100644 --- a/modular_skyrat/modules/Midroundtraitor/code/datum_traitor.dm +++ b/modular_skyrat/modules/Midroundtraitor/code/datum_traitor.dm @@ -21,8 +21,5 @@ r_hand = /obj/item/gun/ballistic/automatic/c20r /datum/outfit/lone_infiltrator_preview/post_equip(mob/living/carbon/human/equipped_person, visualsOnly) - var/obj/item/mod/module/armor_booster/booster = locate() in equipped_person.back - booster.active = TRUE - equipped_person.update_worn_back() var/obj/item/shield/energy/e_shield = locate() in equipped_person.contents e_shield.icon_state = "[initial(e_shield.icon_state)]_on" diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm index 4b89e118377..a73a7327e1d 100644 --- a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm +++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm @@ -8,12 +8,10 @@ /obj/item/mod/module/status_readout/operational, /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/meson, - /obj/item/mod/module/armor_booster/retractplates, ) default_pins = list( /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/meson, - /obj/item/mod/module/armor_booster/retractplates, ) insignia_type = /obj/item/mod/module/insignia/engineer additional_modules = /obj/item/mod/module/dispenser/barrinade @@ -28,12 +26,10 @@ /obj/item/mod/module/status_readout/operational, /obj/item/mod/module/jetpack, /obj/item/mod/module/active_sonar, - /obj/item/mod/module/armor_booster/retractplates, ) default_pins = list( /obj/item/mod/module/jetpack, /obj/item/mod/module/active_sonar, - /obj/item/mod/module/armor_booster/retractplates, ) insignia_type = /obj/item/mod/module/insignia/commander additional_modules = /obj/item/mod/module/dispenser/landmine @@ -48,12 +44,10 @@ /obj/item/mod/module/status_readout/operational, /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/night, - /obj/item/mod/module/armor_booster/retractplates, ) default_pins = list( /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/night, - /obj/item/mod/module/armor_booster/retractplates, ) insignia_type = /obj/item/mod/module/insignia/security additional_modules = /obj/item/mod/module/dispenser/smoke @@ -68,12 +62,10 @@ /obj/item/mod/module/status_readout/operational, /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/medhud, - /obj/item/mod/module/armor_booster/retractplates, ) default_pins = list( /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/medhud, - /obj/item/mod/module/armor_booster/retractplates, ) insignia_type = /obj/item/mod/module/insignia/medic additional_modules = /obj/item/mod/module/dispenser/legion_core diff --git a/modular_skyrat/modules/company_imports/code/objects/nakamura_modsuits/accretion_incompatibility.dm b/modular_skyrat/modules/company_imports/code/objects/nakamura_modsuits/accretion_incompatibility.dm deleted file mode 100644 index d3293a9d9a8..00000000000 --- a/modular_skyrat/modules/company_imports/code/objects/nakamura_modsuits/accretion_incompatibility.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/item/mod/module/ash_accretion - incompatible_modules = list(/obj/item/mod/module/ash_accretion, /obj/item/mod/module/armor_booster) - removable = TRUE diff --git a/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm b/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm index 65adecb4d49..48f1c6f73bf 100644 --- a/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm +++ b/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm @@ -15,7 +15,6 @@ /obj/item/mod/module/tether, ) default_pins = list( - /obj/item/mod/module/armor_booster, /obj/item/mod/module/tether, ) @@ -30,7 +29,6 @@ /obj/item/mod/module/storage/syndicate, ) default_pins = list( - /obj/item/mod/module/armor_booster, /obj/item/mod/module/jetpack, /obj/item/mod/module/baton_holster, ) @@ -45,7 +43,6 @@ /obj/item/mod/module/storage/syndicate, ) default_pins = list( - /obj/item/mod/module/armor_booster, /obj/item/mod/module/jetpack, /obj/item/mod/module/baton_holster/preloaded, /obj/item/mod/module/scorpion_hook, diff --git a/modular_skyrat/modules/contractor/code/items/modsuit/modules.dm b/modular_skyrat/modules/contractor/code/items/modsuit/modules.dm index 549e9d28779..5aa81c3d8ea 100644 --- a/modular_skyrat/modules/contractor/code/items/modsuit/modules.dm +++ b/modular_skyrat/modules/contractor/code/items/modsuit/modules.dm @@ -46,19 +46,6 @@ /obj/item/mod/module/chameleon/contractor // zero complexity module to match pre-TGification complexity = 0 -/obj/item/mod/module/armor_booster/contractor // Much flatter distribution because contractor suit gets a shitton of armor already - armor_mod = /datum/armor/contract_booster - space_slowdown = 0.5 //Bulky as shit - desc = "An embedded set of armor plates, allowing the suit's already extremely high protection \ - to be increased further. However, the plating, while deployed, will slow down the user \ - and make the suit unable to vacuum seal so this extra armor provides zero ability for extravehicular activity while deployed." - -/datum/armor/contract_booster - melee = 20 - bullet = 20 - laser = 20 - energy = 20 - /obj/item/mod/module/springlock/contractor name = "MOD magnetic deployment module" desc = "A much more modern version of a springlock system. \ diff --git a/modular_skyrat/modules/contractor/code/items/modsuit/theme.dm b/modular_skyrat/modules/contractor/code/items/modsuit/theme.dm index a59b2301861..ac77b03e73a 100644 --- a/modular_skyrat/modules/contractor/code/items/modsuit/theme.dm +++ b/modular_skyrat/modules/contractor/code/items/modsuit/theme.dm @@ -17,7 +17,7 @@ siemens_coefficient = 0 slowdown_deployed = 0 ui_theme = "syndicate" - inbuilt_modules = list(/obj/item/mod/module/armor_booster/contractor, /obj/item/mod/module/chameleon/contractor) + inbuilt_modules = list(/obj/item/mod/module/chameleon/contractor) allowed_suit_storage = list( /obj/item/flashlight, /obj/item/tank/internals, @@ -71,10 +71,10 @@ ) /datum/armor/mod_theme_contractor - melee = 15 - bullet = 20 - laser = 15 - energy = 15 + melee = 35 + bullet = 40 + laser = 35 + energy = 35 bomb = 35 bio = 100 fire = 80 diff --git a/modular_skyrat/modules/mapping/code/misc.dm b/modular_skyrat/modules/mapping/code/misc.dm index 62c594b6f10..1b411e87676 100644 --- a/modular_skyrat/modules/mapping/code/misc.dm +++ b/modular_skyrat/modules/mapping/code/misc.dm @@ -7,21 +7,6 @@ icon_state = "luna" inhand_icon_state = "luna" - -/obj/item/mod/module/armor_booster/retractplates - name = "MOD retractive plates module" - desc = "A complex set of actuators, micro-seals and a simple guide on how to install it, This... \"Modification\" allows the plating around the joints to retract, giving minor protection and a bit better mobility." - removable = TRUE - complexity = 1 - space_slowdown = 0.66 - armor_mod = /datum/armor/retractive_plates - -/datum/armor/retractive_plates - melee = 20 - bullet = 25 - laser = 15 - energy = 20 - /obj/machinery/vending/security/noaccess req_access = null diff --git a/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm b/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm index c3662ee9b18..1603a8b05f4 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm @@ -84,9 +84,6 @@ /datum/opposing_force_equipment/modsuit_modules/cloak_mod item_type = /obj/item/mod/module/stealth/ninja -/datum/opposing_force_equipment/modsuit_modules/armor_booster - item_type = /obj/item/mod/module/armor_booster - /datum/opposing_force_equipment/modsuit_modules/magnetic_harness item_type = /obj/item/mod/module/magnetic_harness diff --git a/modular_zubbers/code/datums/armor_overrides.dm b/modular_zubbers/code/datums/armor_overrides.dm deleted file mode 100644 index f4df16b6e18..00000000000 --- a/modular_zubbers/code/datums/armor_overrides.dm +++ /dev/null @@ -1,133 +0,0 @@ -// Buffs security modsuit armor (relative), adds armour boosters to every sec and command and corporate modsuit, halves all default armour values -/datum/mod_theme/security - armor_type = /datum/armor/mod_theme_security - inbuilt_modules = list(/obj/item/mod/module/armor_booster/nanotrasen/security) - -/datum/armor/mod_theme_security - melee = 20 - bullet = 15 - laser = 15 - energy = 20 - bomb = 30 - bio = 100 - fire = 100 - acid = 100 - wound = 10 - -/obj/item/mod/control/pre_equipped/security/Initialize(mapload, new_theme, new_skin, new_core) - default_pins += /obj/item/mod/module/armor_booster/nanotrasen/security - applied_modules -= /obj/item/mod/module/headprotector - . = ..() - -/datum/mod_theme/safeguard //HoS - armor_type = /datum/armor/mod_theme_safeguard - inbuilt_modules = list(/obj/item/mod/module/armor_booster/nanotrasen/security/safeguard) - -/datum/armor/mod_theme_safeguard - melee = 20 - bullet = 15 - laser = 15 - energy = 20 - bomb = 30 - bio = 100 - fire = 100 - acid = 95 - wound = 25 - -/obj/item/mod/control/pre_equipped/safeguard/Initialize(mapload, new_theme, new_skin, new_core) - default_pins += /obj/item/mod/module/armor_booster/nanotrasen/security/safeguard - applied_modules -= /obj/item/mod/module/headprotector - . = ..() - -/datum/mod_theme/magnate // Captain - armor_type = /datum/armor/mod_theme_magnate - inbuilt_modules = list(/obj/item/mod/module/armor_booster/nanotrasen/magnate) - -/datum/armor/mod_theme_magnate - melee = 20 - bullet = 20 - laser = 20 - energy = 20 - bomb = 50 - bio = 100 - fire = 100 - acid = 100 - wound = 20 - -/obj/item/mod/control/pre_equipped/magnate/Initialize(mapload, new_theme, new_skin, new_core) - default_pins += /obj/item/mod/module/armor_booster/nanotrasen/magnate - applied_modules -= /obj/item/mod/module/headprotector - . = ..() - -/datum/mod_theme/responsory // ERT - armor_type = /datum/armor/mod_theme_responsory - inbuilt_modules = list(/obj/item/mod/module/armor_booster/nanotrasen/security) - -/datum/armor/mod_theme_responsory - melee = 20 - bullet = 15 - laser = 15 - energy = 20 - bomb = 50 - bio = 100 - fire = 100 - acid = 90 - wound = 15 - -/obj/item/mod/control/pre_equipped/responsory/Initialize(mapload, new_theme, new_skin, new_core) - applied_modules -= list( - /obj/item/mod/module/welding, - /obj/item/mod/module/armor_booster/retractplates, - /obj/item/mod/module/armor_booster, //none of them use these and im not sure if its redundant, better to be safe than not. - ) - default_pins += /obj/item/mod/module/armor_booster/nanotrasen/security - . = ..() - -/datum/mod_theme/corporate // Centcom Commander - armor_type = /datum/armor/mod_theme_corporate - inbuilt_modules = list(/obj/item/mod/module/armor_booster/nanotrasen/corporate) - -/datum/armor/mod_theme_corporate - melee = 25 - bullet = 25 - laser = 25 - energy = 25 - bomb = 50 - bio = 100 - fire = 100 - acid = 100 - wound = 15 - -/obj/item/mod/control/pre_equipped/corporate/Initialize(mapload, new_theme, new_skin, new_core) - default_pins += /obj/item/mod/module/armor_booster/nanotrasen/corporate - . = ..() - -// Blueshield Armor -/datum/mod_theme/blueshield - armor_type = /datum/armor/mod_theme_blueshield - inbuilt_modules = list(/obj/item/mod/module/armor_booster/nanotrasen/blueshield) - -/datum/armor/mod_theme_blueshield // Not really great for fighting. - melee = 20 - bullet = 10 - laser = 10 - energy = 15 - bomb = 50 - bio = 100 - fire = 100 - acid = 100 - wound = 20 - -/obj/item/mod/control/pre_equipped/blueshield/ - applied_cell = /obj/item/stock_parts/power_store/cell/high - applied_modules = list( - /obj/item/mod/module/storage, - /obj/item/mod/module/magnetic_harness, - /obj/item/mod/module/flashlight, - /obj/item/mod/module/jetpack, - /obj/item/mod/module/quick_carry, - ) - -/obj/item/mod/control/pre_equipped/blueshield/Initialize(mapload, new_theme, new_skin, new_core) - default_pins += /obj/item/mod/module/armor_booster/nanotrasen/blueshield - . = ..() diff --git a/modular_zubbers/code/modules/mod/modules.dm b/modular_zubbers/code/modules/mod/modules.dm index 6e03547a964..d9942523866 100644 --- a/modular_zubbers/code/modules/mod/modules.dm +++ b/modular_zubbers/code/modules/mod/modules.dm @@ -1,61 +1,3 @@ -/obj/item/mod/module/armor_booster/nanotrasen //An "armour booster" for security grade modsuits, to reduce the effectiveness of armoured combat in EVA. - desc = "A retrofitted series of retractable armor plates, allowing the suit to function as essentially power armor, \ - giving the user incredible protection against conventional firearms, or everyday attacks in close-quarters. \ - However, the additional plating cannot deploy alongside parts of the suit used for vacuum sealing, \ - so this extra armor provides zero ability for extravehicular activity while deployed. \ - This module has been partially reverse engineered from competing combat MOD technology, \ - and does not help reduce the bulkiness of many of the suits it is installed in." - space_slowdown = 0 //This is to nerf your armour, not buff your modsuit speed - icon = 'icons/obj/clothing/suits/armor.dmi' - icon_state = "heavy" //SWAT suit icon, because I want to change the action buttons and these aren't meant to be obtainable outside the suits - -//every security, command, etc mod theme has its own armour booster now, taking half the armour values of their current modsuit armour -//see modular_zubbers/code/datums/armor_overrides for modsuit changes -/obj/item/mod/module/armor_booster/nanotrasen/security //secoff modsuits, ERT modsuits also - armor_mod = /datum/armor/mod_module_armor_boost_security - -/datum/armor/mod_module_armor_boost_security - melee = 20 - bullet = 15 - laser = 15 - energy = 20 - -/obj/item/mod/module/armor_booster/nanotrasen/security/safeguard //HoS - desc = "A retrofitted series of retractable armor plates, allowing the suit to function as essentially power armor, \ - giving the user incredible protection against conventional firearms, or everyday attacks in close-quarters. \ - However, the additional plating cannot deploy alongside parts of the suit used for vacuum sealing, \ - so this extra armor provides zero ability for extravehicular activity while deployed. \ - This module has been partially reverse engineered from competing combat MOD technology, \ - though Apadyne has partially mitigated some of the excess power towards improved actuators in the suit." - space_slowdown = 0.5 //better actuators on the HoS model - -/obj/item/mod/module/armor_booster/nanotrasen/magnate //Captain - armor_mod = /datum/armor/mod_module_armor_boost_magnate - -/datum/armor/mod_module_armor_boost_magnate - melee = 20 - bullet = 20 - laser = 20 - energy = 20 - -/obj/item/mod/module/armor_booster/nanotrasen/corporate //CENTCOM - armor_mod = /datum/armor/mod_module_armor_boost_corporate - -/datum/armor/mod_module_armor_boost_corporate - melee = 25 - bullet = 25 - laser = 25 - energy = 25 - -/obj/item/mod/module/armor_booster/nanotrasen/blueshield - armor_mod = /datum/armor/mod_module_armor_boost_blueshield - -/datum/armor/mod_module_armor_boost_blueshield - melee = 20 - bullet = 10 - laser = 10 - energy = 15 - /obj/item/mod/module/mind_swap name = "MOD Neural Transference module" desc = "Swaps the MOD wearer's and Assistant AI's neural pathways." diff --git a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm index bafb259c756..a9cb7b439d1 100644 --- a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm +++ b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm @@ -47,7 +47,6 @@ /obj/item/mod/module/waddle, ) default_pins = list( - /obj/item/mod/module/armor_booster, /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, ) diff --git a/tgstation.dme b/tgstation.dme index ff9883e3ff5..286665e5376 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7130,7 +7130,6 @@ #include "modular_skyrat\master_files\code\modules\mod\mod_theme.dm" #include "modular_skyrat\master_files\code\modules\mod\mod_types.dm" #include "modular_skyrat\master_files\code\modules\mod\modules\_module.dm" -#include "modular_skyrat\master_files\code\modules\mod\modules\modules_antag.dm" #include "modular_skyrat\master_files\code\modules\mod\modules\modules_security.dm" #include "modular_skyrat\master_files\code\modules\mod\modules\modules_supply.dm" #include "modular_skyrat\master_files\code\modules\modular_computers\computers\item\computer.dm" @@ -7617,7 +7616,6 @@ #include "modular_skyrat\modules\company_imports\code\objects\donk\donkfish_box.dm" #include "modular_skyrat\modules\company_imports\code\objects\jarnsmiour\special_metals.dm" #include "modular_skyrat\modules\company_imports\code\objects\microstar\mcr_attachment_kits.dm" -#include "modular_skyrat\modules\company_imports\code\objects\nakamura_modsuits\accretion_incompatibility.dm" #include "modular_skyrat\modules\company_imports\code\objects\nakamura_modsuits\plate_compression_tech.dm" #include "modular_skyrat\modules\company_imports\code\objects\vitezstvi\ammo_boxes.dm" #include "modular_skyrat\modules\connecting_computer\code\_computer.dm" @@ -8863,7 +8861,6 @@ #include "modular_zubbers\code\controllers\subsystem\processing\sol_subsystem.dm" #include "modular_zubbers\code\datums\action.dm" #include "modular_zubbers\code\datums\akula_overrides.dm" -#include "modular_zubbers\code\datums\armor_overrides.dm" #include "modular_zubbers\code\datums\deadline_alert.dm" #include "modular_zubbers\code\datums\department_security.dm" #include "modular_zubbers\code\datums\ert.dm"