From 3f9d794545142affc265a61a07e9b8a5bb63724d Mon Sep 17 00:00:00 2001 From: TimChi Date: Thu, 4 Jul 2024 15:24:59 +0300 Subject: [PATCH 01/10] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=20?= =?UTF-8?q?=D0=BA=20=D0=BC=D0=BE=D1=80=D0=B6=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/datums/diseases/viruses/babylon_feve.dm | 94 ++++++++++++++++++++ code/modules/events/disease_outbreak.dm | 3 +- paradise.dme | 2 + 3 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 code/datums/diseases/viruses/babylon_feve.dm diff --git a/code/datums/diseases/viruses/babylon_feve.dm b/code/datums/diseases/viruses/babylon_feve.dm new file mode 100644 index 00000000000..1bff5e6dd2a --- /dev/null +++ b/code/datums/diseases/viruses/babylon_feve.dm @@ -0,0 +1,94 @@ +/* +/datum/disease/virus/babylonian_fever + name = "Babylonian Fever" + agent = "Babylon fever agent" + desc = "If left untreated, the subject will be in a state of disorientation and will forget all the languages he knew." + max_stages = 3 + spread_flags = AIRBORNE + visibility_flags = HIDDEN_HUD + cure_text = "Mannitol & Mitocholide" + cures = list("mannitol", "mitocholide") + cure_prob = 30 + permeability_mod = 0.75 + severity = MEDIUM + var/list/known_languages + +/datum/disease/virus/babylonian_fever/New() + ..() + if(!affected_mob) + return + known_languages = affected_mob.languages + +/datum/disease/virus/babylonian_fever/stage_act() + if(!..()) + return FALSE + + switch(stage) + if(1) + remove_languages() + if(2, 3) + if(prob(stage)) + affected_mob.adjustBrainLoss(0.5) + return + +/datum/disease/virus/babylonian_fever/has_cure() + if(..()) + affected_mob.add_language(known_languages) + return TRUE + + +/datum/disease/virus/babylonian_fever/proc/remove_languages() + for(var/la in affected_mob.languages) + affected_mob.remove_language(la) +*/ + +/datum/disease/virus/babylonian_fever + name = "Babylonian Fever" + agent = "Babylon fever agent" + desc = "If left untreated, the subject will be in a state of disorientation and will forget all the languages he knew." + max_stages = 3 + spread_flags = AIRBORNE + visibility_flags = HIDDEN_HUD + cure_text = "Mannitol & Mitocholide" + cures = list("mannitol", "mitocholide") + cure_prob = 30 + permeability_mod = 0.75 + severity = MEDIUM + var/known_languages = list() + +/datum/disease/virus/babylonian_fever/stage_act() + if(!..()) + return FALSE + switch(stage) + if(1) + if(affected_mob.languages && !LAZYLEN(known_languages)) + for(var/datum/language/lan in affected_mob.languages) + LAZYADD(known_languages, lan) + affected_mob.remove_language(lan.name) + if(2, 3) + if(prob(stage)) + affected_mob.adjustBrainLoss(0.5) + if(prob(stage)) + affected_mob.say(pick( + "Ммм... гхм...", + "А-а-а... эээ...", + "Брр... бл... бл...", + "Гх... гх... гх...", + "Ааа... ааа... ааа...", + "Ух... ух... ух...", + "Хм... хм... хм...", + "Шш... шш... шш...", + "Ыы... ыы... ыы...", + "Оо... оо... оо...", + "Ээ... ээ... ээ...", + "Ии... ии... ии...", + ) + ) + return FALSE + +/datum/disease/virus/babylonian_fever/has_cure() + if(..()) + if(LAZYLEN(known_languages)) + for(var/datum/language/lan in known_languages) + affected_mob.add_language(lan.name) + return TRUE diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 3f59d40402e..7c8c186ad65 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -22,7 +22,8 @@ 1; /datum/disease/virus/pierrot_throat, 1; /datum/disease/virus/pierrot_throat/advanced, 1; /datum/disease/virus/tuberculosis, - 1; /datum/disease/virus/wizarditis + 1; /datum/disease/virus/wizarditis, + 2; /datum/disease/virus/babylonian_fever ) if(virus_type == /datum/disease/virus/advance) //creates only contagious viruses, that are always visible in Pandemic diff --git a/paradise.dme b/paradise.dme index 1883762f469..afb5aca0ec6 100644 --- a/paradise.dme +++ b/paradise.dme @@ -430,6 +430,7 @@ #include "code\datums\diseases\vampire.dm" #include "code\datums\diseases\viruses\_virus.dm" #include "code\datums\diseases\viruses\anxiety.dm" +#include "code\datums\diseases\viruses\babylon_feve.dm" #include "code\datums\diseases\viruses\beesease.dm" #include "code\datums\diseases\viruses\brainrot.dm" #include "code\datums\diseases\viruses\cadaver.dm" @@ -1066,6 +1067,7 @@ #include "code\game\objects\items\documents.dm" #include "code\game\objects\items\flag.dm" #include "code\game\objects\items\gems.dm" +#include "code\game\objects\items\gib_on_examine.dm" #include "code\game\objects\items\hand_item.dm" #include "code\game\objects\items\hourglass.dm" #include "code\game\objects\items\latexballoon.dm" From 0fcbaede2a062a8cb2e0b72ef7c29a5b239c3f69 Mon Sep 17 00:00:00 2001 From: TimChi Date: Mon, 15 Jul 2024 11:32:18 +0300 Subject: [PATCH 02/10] =?UTF-8?q?=D0=92=D0=B8=D1=80=D1=83=D1=81=20=D0=B8?= =?UTF-8?q?=D0=B4=D0=B8=20=D0=BD=D0=B0=D1=85=D1=83=D0=B9=20=D1=81=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B5=D0=B3=D0=BE=20master220?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/datums/diseases/viruses/babylon_feve.dm | 94 -------------------- code/modules/events/disease_outbreak.dm | 3 +- paradise.dme | 2 - 3 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 code/datums/diseases/viruses/babylon_feve.dm diff --git a/code/datums/diseases/viruses/babylon_feve.dm b/code/datums/diseases/viruses/babylon_feve.dm deleted file mode 100644 index 1bff5e6dd2a..00000000000 --- a/code/datums/diseases/viruses/babylon_feve.dm +++ /dev/null @@ -1,94 +0,0 @@ -/* -/datum/disease/virus/babylonian_fever - name = "Babylonian Fever" - agent = "Babylon fever agent" - desc = "If left untreated, the subject will be in a state of disorientation and will forget all the languages he knew." - max_stages = 3 - spread_flags = AIRBORNE - visibility_flags = HIDDEN_HUD - cure_text = "Mannitol & Mitocholide" - cures = list("mannitol", "mitocholide") - cure_prob = 30 - permeability_mod = 0.75 - severity = MEDIUM - var/list/known_languages - -/datum/disease/virus/babylonian_fever/New() - ..() - if(!affected_mob) - return - known_languages = affected_mob.languages - -/datum/disease/virus/babylonian_fever/stage_act() - if(!..()) - return FALSE - - switch(stage) - if(1) - remove_languages() - if(2, 3) - if(prob(stage)) - affected_mob.adjustBrainLoss(0.5) - return - -/datum/disease/virus/babylonian_fever/has_cure() - if(..()) - affected_mob.add_language(known_languages) - return TRUE - - -/datum/disease/virus/babylonian_fever/proc/remove_languages() - for(var/la in affected_mob.languages) - affected_mob.remove_language(la) -*/ - -/datum/disease/virus/babylonian_fever - name = "Babylonian Fever" - agent = "Babylon fever agent" - desc = "If left untreated, the subject will be in a state of disorientation and will forget all the languages he knew." - max_stages = 3 - spread_flags = AIRBORNE - visibility_flags = HIDDEN_HUD - cure_text = "Mannitol & Mitocholide" - cures = list("mannitol", "mitocholide") - cure_prob = 30 - permeability_mod = 0.75 - severity = MEDIUM - var/known_languages = list() - -/datum/disease/virus/babylonian_fever/stage_act() - if(!..()) - return FALSE - switch(stage) - if(1) - if(affected_mob.languages && !LAZYLEN(known_languages)) - for(var/datum/language/lan in affected_mob.languages) - LAZYADD(known_languages, lan) - affected_mob.remove_language(lan.name) - if(2, 3) - if(prob(stage)) - affected_mob.adjustBrainLoss(0.5) - if(prob(stage)) - affected_mob.say(pick( - "Ммм... гхм...", - "А-а-а... эээ...", - "Брр... бл... бл...", - "Гх... гх... гх...", - "Ааа... ааа... ааа...", - "Ух... ух... ух...", - "Хм... хм... хм...", - "Шш... шш... шш...", - "Ыы... ыы... ыы...", - "Оо... оо... оо...", - "Ээ... ээ... ээ...", - "Ии... ии... ии...", - ) - ) - return FALSE - -/datum/disease/virus/babylonian_fever/has_cure() - if(..()) - if(LAZYLEN(known_languages)) - for(var/datum/language/lan in known_languages) - affected_mob.add_language(lan.name) - return TRUE diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 7c8c186ad65..3f59d40402e 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -22,8 +22,7 @@ 1; /datum/disease/virus/pierrot_throat, 1; /datum/disease/virus/pierrot_throat/advanced, 1; /datum/disease/virus/tuberculosis, - 1; /datum/disease/virus/wizarditis, - 2; /datum/disease/virus/babylonian_fever + 1; /datum/disease/virus/wizarditis ) if(virus_type == /datum/disease/virus/advance) //creates only contagious viruses, that are always visible in Pandemic diff --git a/paradise.dme b/paradise.dme index 1424e9ae748..1231a23a82d 100644 --- a/paradise.dme +++ b/paradise.dme @@ -445,7 +445,6 @@ #include "code\datums\diseases\vampire.dm" #include "code\datums\diseases\viruses\_virus.dm" #include "code\datums\diseases\viruses\anxiety.dm" -#include "code\datums\diseases\viruses\babylon_feve.dm" #include "code\datums\diseases\viruses\beesease.dm" #include "code\datums\diseases\viruses\brainrot.dm" #include "code\datums\diseases\viruses\cadaver.dm" @@ -1085,7 +1084,6 @@ #include "code\game\objects\items\documents.dm" #include "code\game\objects\items\flag.dm" #include "code\game\objects\items\gems.dm" -#include "code\game\objects\items\gib_on_examine.dm" #include "code\game\objects\items\hand_item.dm" #include "code\game\objects\items\hourglass.dm" #include "code\game\objects\items\latexballoon.dm" From 73fc3e38df7fe67c8a1a64e9508c05a7b8bb9f47 Mon Sep 17 00:00:00 2001 From: TimChi <123629996+timchigaming@users.noreply.github.com> Date: Sun, 13 Oct 2024 15:07:45 +0300 Subject: [PATCH 03/10] =?UTF-8?q?=F0=9F=92=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/__DEFINES/traits/declarations.dm | 2 +- code/_globalvars/traits.dm | 1 + .../antagonists/vampire/vampire_powers/bestia_powers.dm | 4 ++-- code/modules/mob/living/carbon/brain/MMI.dm | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index 4fad591bac3..5eb4638b76a 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -55,6 +55,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FAKEDEATH "fakedeath" //Makes the owner appear as dead to most forms of medical examination #define TRAIT_XENO_HOST "xeno_host" //Tracks whether we're gonna be a baby alien's mummy. #define TRAIT_LEGION_TUMOUR "legion_tumour" //used in huds for special icon +#define TRAIT_NOSPELLS "spells_casting_block" // Used to prevent movement spells from being used as a brain /// Are we immune to shocks? #define TRAIT_SHOCKIMMUNE "shock_immunity" /// Are we immune to specifically tesla / SM shocks? @@ -167,7 +168,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// This trait makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted. #define TRAIT_NODROP "nodrop" - ///Movement type traits for movables. See elements/movetype_handler.dm #define TRAIT_MOVE_GROUND "move_ground" #define TRAIT_MOVE_FLYING "move_flying" diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 4fd7d215a46..fdb538e3143 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -74,6 +74,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_IMMOBILIZED" = TRAIT_IMMOBILIZED, "TRAIT_INCAPACITATED" = TRAIT_INCAPACITATED, "TRAIT_IWASBATONED" = TRAIT_IWASBATONED, + "TRAIT_NOSPELLS" = TRAIT_NOSPELLS, "TRAIT_GUSTPROTECTION" = TRAIT_GUSTPROTECTION, "TRAIT_JESTER" = TRAIT_JESTER, "TRAIT_KNOCKEDOUT" = TRAIT_KNOCKEDOUT, diff --git a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm index bfa05bb94b6..a0163a1c17f 100644 --- a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm @@ -723,7 +723,7 @@ /obj/effect/proc_holder/spell/vampire/lunge/can_cast(mob/living/carbon/user = usr, charge_check = TRUE, show_message = FALSE) - if(user.incapacitated(INC_IGNORE_RESTRAINED|INC_IGNORE_GRABBED) || user.buckled || (iscarbon(user) && user.legcuffed)) + if(user.incapacitated(INC_IGNORE_RESTRAINED|INC_IGNORE_GRABBED) || user.buckled || (iscarbon(user) && user.legcuffed) || HAS_TRAIT(user, TRAIT_CANNOT_CAST_SPELLS)) if(show_message) to_chat(user, span_warning("You can't use this ability right now!")) return FALSE @@ -962,7 +962,7 @@ to_chat(user, span_warning("You are too weak to use this ability!")) return FALSE - if(!isturf(user.loc)) + if(!isturf(user.loc) || HAS_TRAIT(user, TRAIT_ISMMI)) if(show_message) to_chat(user, span_warning("You can't use this ability inside [user.loc]!")) return FALSE diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 95668af8f1d..f1fd8eb1ea6 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -88,6 +88,7 @@ brainmob.set_stat(CONSCIOUS) brainmob.set_invis_see(initial(brainmob.see_invisible)) held_brain = brain + ADD_TRAIT(brainmob, TRAIT_NOSPELLS, UNIQUE_TRAIT_SOURCE(src)) // Dont use spells, little brain. alien = istype(brain, /obj/item/organ/internal/brain/xeno) update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) if(radio_action) @@ -191,6 +192,7 @@ brainmob = null//Set mmi brainmob var to null held_brain.forceMove(dropspot) held_brain = null + REMOVE_TRAIT(brainmob, TRAIT_NOSPELLS, UNIQUE_TRAIT_SOURCE(src)) update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) From d59f11c3c29b743e797831d2d4aed9e6ebe891dd Mon Sep 17 00:00:00 2001 From: TimChi <123629996+timchigaming@users.noreply.github.com> Date: Sun, 13 Oct 2024 15:38:02 +0300 Subject: [PATCH 04/10] =?UTF-8?q?=F0=9F=94=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/datums/spell.dm | 3 +++ code/datums/spells/wizard.dm | 1 - .../antagonists/vampire/vampire_powers/bestia_powers.dm | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index e566ce73c8a..dd93a925b47 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -605,6 +605,9 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) to_chat(user, span_warning("You shouldn't have this spell! Something's wrong.")) return FALSE + if(HAS_TRAIT(user, TRAIT_NOSPELLS)) + return FALSE + if(!centcom_cancast) //Certain spells are not allowed on the centcom zlevel var/turf/user_turf = get_turf(user) if(user_turf && is_admin_level(user_turf.z)) diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 7a4d403aa4d..868ec6b857a 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -382,7 +382,6 @@ action.button_icon_state = "fireball[active]" action.UpdateButtonIcon() - /obj/effect/proc_holder/spell/fireball/cast(list/targets, mob/living/user = usr) var/target = targets[1] //There is only ever one target for fireball var/turf/T = user.loc diff --git a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm index a0163a1c17f..4e47ea75ff4 100644 --- a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm @@ -723,7 +723,7 @@ /obj/effect/proc_holder/spell/vampire/lunge/can_cast(mob/living/carbon/user = usr, charge_check = TRUE, show_message = FALSE) - if(user.incapacitated(INC_IGNORE_RESTRAINED|INC_IGNORE_GRABBED) || user.buckled || (iscarbon(user) && user.legcuffed) || HAS_TRAIT(user, TRAIT_CANNOT_CAST_SPELLS)) + if(user.incapacitated(INC_IGNORE_RESTRAINED|INC_IGNORE_GRABBED) || user.buckled || (iscarbon(user) && user.legcuffed)) if(show_message) to_chat(user, span_warning("You can't use this ability right now!")) return FALSE @@ -962,7 +962,7 @@ to_chat(user, span_warning("You are too weak to use this ability!")) return FALSE - if(!isturf(user.loc) || HAS_TRAIT(user, TRAIT_ISMMI)) + if(!isturf(user.loc) || HAS_TRAIT(user, TRAIT_NOSPELLS)) if(show_message) to_chat(user, span_warning("You can't use this ability inside [user.loc]!")) return FALSE From 3e06370ed736932a6f9dd58380b62bf0d29178fb Mon Sep 17 00:00:00 2001 From: TimChi <123629996+timchigaming@users.noreply.github.com> Date: Sun, 13 Oct 2024 15:44:02 +0300 Subject: [PATCH 05/10] =?UTF-8?q?=D0=BA=D1=8B=D1=88=D1=8C=20=D0=BD=D0=BE?= =?UTF-8?q?=D1=82=D1=80=D0=B5=D0=B9=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/antagonists/vampire/vampire_powers/bestia_powers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm index 4e47ea75ff4..bfa05bb94b6 100644 --- a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm @@ -962,7 +962,7 @@ to_chat(user, span_warning("You are too weak to use this ability!")) return FALSE - if(!isturf(user.loc) || HAS_TRAIT(user, TRAIT_NOSPELLS)) + if(!isturf(user.loc)) if(show_message) to_chat(user, span_warning("You can't use this ability inside [user.loc]!")) return FALSE From 5f88112965e9a51a8a8b34b8f7e3c7b7e930468a Mon Sep 17 00:00:00 2001 From: TimChi <123629996+timchigaming@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:07:28 +0300 Subject: [PATCH 06/10] Update code/__DEFINES/traits/declarations.dm Co-authored-by: Daeberdir <115735095+Daeberdir@users.noreply.github.com> --- code/__DEFINES/traits/declarations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index 5eb4638b76a..9c6027c571c 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -55,7 +55,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FAKEDEATH "fakedeath" //Makes the owner appear as dead to most forms of medical examination #define TRAIT_XENO_HOST "xeno_host" //Tracks whether we're gonna be a baby alien's mummy. #define TRAIT_LEGION_TUMOUR "legion_tumour" //used in huds for special icon -#define TRAIT_NOSPELLS "spells_casting_block" // Used to prevent movement spells from being used as a brain +#define TRAIT_NO_SPELLS "no_spells" // Used to prevent movement spells from being used as a brain /// Are we immune to shocks? #define TRAIT_SHOCKIMMUNE "shock_immunity" /// Are we immune to specifically tesla / SM shocks? From 66e809e50dfa8c03508a43196e5cf40732a7d2e3 Mon Sep 17 00:00:00 2001 From: TimChi <123629996+timchigaming@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:08:19 +0300 Subject: [PATCH 07/10] Update spell.dm --- code/datums/spell.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index dd93a925b47..175413a3130 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -605,7 +605,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) to_chat(user, span_warning("You shouldn't have this spell! Something's wrong.")) return FALSE - if(HAS_TRAIT(user, TRAIT_NOSPELLS)) + if(HAS_TRAIT(user, TRAIT_NO_SPELLS)) return FALSE if(!centcom_cancast) //Certain spells are not allowed on the centcom zlevel From 517e0be3d43e2c4a5ae949e1ea0de5a0536ad3cc Mon Sep 17 00:00:00 2001 From: TimChi <123629996+timchigaming@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:11:31 +0300 Subject: [PATCH 08/10] Update traits.dm --- code/_globalvars/traits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index fdb538e3143..568cb267fd5 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -74,7 +74,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_IMMOBILIZED" = TRAIT_IMMOBILIZED, "TRAIT_INCAPACITATED" = TRAIT_INCAPACITATED, "TRAIT_IWASBATONED" = TRAIT_IWASBATONED, - "TRAIT_NOSPELLS" = TRAIT_NOSPELLS, "TRAIT_GUSTPROTECTION" = TRAIT_GUSTPROTECTION, "TRAIT_JESTER" = TRAIT_JESTER, "TRAIT_KNOCKEDOUT" = TRAIT_KNOCKEDOUT, @@ -107,6 +106,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NO_SLIP_SLIDE" = TRAIT_NO_SLIP_SLIDE, "TRAIT_NO_SLIP_WATER" = TRAIT_NO_SLIP_WATER, "TRAIT_NO_SPECIES_EXAMINE" = TRAIT_NO_SPECIES_EXAMINE, + "TRAIT_NO_SPELLS" = TRAIT_NO_SPELLS, "TRAIT_NO_TRANSFORM" = TRAIT_NO_TRANSFORM, "TRAIT_OBESITY" = TRAIT_OBESITY, "TRAIT_OPEN_MIND" = TRAIT_OPEN_MIND, From 2400a8df3391ace8020ffb57e25340dc21c5338a Mon Sep 17 00:00:00 2001 From: TimChi <123629996+timchigaming@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:12:21 +0300 Subject: [PATCH 09/10] Update MMI.dm --- code/modules/mob/living/carbon/brain/MMI.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index f1fd8eb1ea6..2eea83689d9 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -88,7 +88,7 @@ brainmob.set_stat(CONSCIOUS) brainmob.set_invis_see(initial(brainmob.see_invisible)) held_brain = brain - ADD_TRAIT(brainmob, TRAIT_NOSPELLS, UNIQUE_TRAIT_SOURCE(src)) // Dont use spells, little brain. + ADD_TRAIT(brainmob, TRAIT_NO_SPELLS, UNIQUE_TRAIT_SOURCE(src)) // Dont use spells, little brain. alien = istype(brain, /obj/item/organ/internal/brain/xeno) update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) if(radio_action) @@ -192,7 +192,7 @@ brainmob = null//Set mmi brainmob var to null held_brain.forceMove(dropspot) held_brain = null - REMOVE_TRAIT(brainmob, TRAIT_NOSPELLS, UNIQUE_TRAIT_SOURCE(src)) + REMOVE_TRAIT(brainmob, TRAIT_NO_SPELLS, UNIQUE_TRAIT_SOURCE(src)) update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) From 71acf18ef5fee8929e37aac25a702a532e1f7455 Mon Sep 17 00:00:00 2001 From: TimChi <123629996+timchigaming@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:00:14 +0300 Subject: [PATCH 10/10] Update MMI.dm --- code/modules/mob/living/carbon/brain/MMI.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 2eea83689d9..7bf60ec50dc 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -189,10 +189,10 @@ GLOB.alive_mob_list -= brainmob//Get outta here held_brain.brainmob = brainmob//Set the brain to use the brainmob held_brain.brainmob.cancel_camera() + REMOVE_TRAIT(brainmob, TRAIT_NO_SPELLS, UNIQUE_TRAIT_SOURCE(src)) brainmob = null//Set mmi brainmob var to null held_brain.forceMove(dropspot) held_brain = null - REMOVE_TRAIT(brainmob, TRAIT_NO_SPELLS, UNIQUE_TRAIT_SOURCE(src)) update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)