diff --git a/html/changelogs/AutoChangeLog-pr-1751.yml b/html/changelogs/AutoChangeLog-pr-1751.yml new file mode 100644 index 0000000000000..675c1e554bd64 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1751.yml @@ -0,0 +1,4 @@ +author: "projectkepler-ru" +delete-after: True +changes: + - bugfix: "TEG Research cost not being accomodated" \ No newline at end of file diff --git a/modular_skyrat/modules/power/code/teg.dm b/modular_skyrat/modules/power/code/teg.dm index f7be359376a0e..fd49724a5a90a 100644 --- a/modular_skyrat/modules/power/code/teg.dm +++ b/modular_skyrat/modules/power/code/teg.dm @@ -24,5 +24,4 @@ description = "How to get different types of zap." prereq_ids = list("parts_adv") design_ids = list("teg", "circulator") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) - discount_experiments = list(/datum/experiment/scanning/points/machinery_pinpoint_scan/tier2_capacitors = 500) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10) diff --git a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm index ad3a222535506..de541eb663699 100644 --- a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm +++ b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm @@ -17,12 +17,12 @@ /datum/loadout_item/head/idmaberet name = "IDMA Beret" item_path = /obj/item/clothing/head/idma_beret - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok") + ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") /datum/loadout_item/head/idmahelmet name = "IDMA Service Helmet" item_path = /obj/item/clothing/head/helmet/sec/sol/idma_helmet - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok") + ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) @@ -52,13 +52,13 @@ /datum/loadout_item/uniform/miscellaneous/idmasnowfatigue name = "IDMA Service Uniform" item_path = /obj/item/clothing/under/rank/security/idma_fatigue - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok") + ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) /datum/loadout_item/uniform/miscellaneous/idmafatigue name = "IDMA Desert Service Uniform" item_path = /obj/item/clothing/under/rank/security/idma_fatigue/alt - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok") + ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) @@ -69,19 +69,19 @@ /datum/loadout_item/suit/idmavest name = "IDMA Combat Vest" item_path = /obj/item/clothing/suit/armor/vest/idma_vest - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok") + ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) /datum/loadout_item/suit/idmarsuit name = "IDMA Service Jacket" item_path = /obj/item/clothing/suit/hooded/wintercoat/security/idma_jacket - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok") + ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) /datum/loadout_item/suit/idmardjacket name = "Silicon Administrator Vest" item_path = /obj/item/clothing/suit/jacket/vera_jacket - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok") + ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") restricted_roles = list (JOB_RESEARCH_DIRECTOR) // and otherwise if not, specific to the RD /datum/loadout_item/suit/runner_winter @@ -126,7 +126,7 @@ /datum/loadout_item/accessory/idmaarmbands name = "IDMA Armband" item_path = /obj/item/clothing/accessory/armband/idmaarmband - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok") + ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") /* * TOYS diff --git a/tgstation.dme b/tgstation.dme index bab184dcf7891..1522d37464652 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8895,9 +8895,6 @@ #include "modular_zubbers\code\modules\mod\mod_ai.dm" #include "modular_zubbers\code\modules\mod\mod_theme.dm" #include "modular_zubbers\code\modules\mod\mod_types.dm" -#include "modular_zubbers\code\modules\monkeydone\pill.dm" -#include "modular_zubbers\code\modules\monkeydone\reagent.dm" -#include "modular_zubbers\code\modules\monkeydone\recipe.dm" #include "modular_zubbers\code\modules\mod\modules.dm" #include "modular_zubbers\code\modules\modular_items\code\cake_light.dm" #include "modular_zubbers\code\modules\modular_items\code\necklace.dm" @@ -8910,6 +8907,9 @@ #include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\magazines.dm" #include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\pistol.dm" #include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\trappiste_fabriek\ammo.dm" +#include "modular_zubbers\code\modules\monkeydone\pill.dm" +#include "modular_zubbers\code\modules\monkeydone\reagent.dm" +#include "modular_zubbers\code\modules\monkeydone\recipe.dm" #include "modular_zubbers\code\modules\more_crushers\code\miningweapons.dm" #include "modular_zubbers\code\modules\movespeed\modifiers\status_effects.dm" #include "modular_zubbers\code\modules\opposing_force\code\items.dm"