-
Notifications
You must be signed in to change notification settings - Fork 439
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* let's do first step to rework that piece of .. * step 2 - remove fucken devilinfo from mind * step 3 - eat zuzya (clean mind and living procs) * toy gigax, fake devil datum * UPD * UPD * some fixes * UPD * попытка зарезолвить конфликт дубль 1 * дубль 2 * fastfix * double 3 * Delete code/game/gamemodes/devil/devilinfo.dm * CLRF to LF * Resurrection rework * catsmile * fix inconsistent * fix.. again * improve * resurrection bugfixes * полностью модульные бейны * фикс пробелов * fixes. again * fix nr2 * again * omagad is THAT objectivos????? * fix * UPD * forgotten moments fixed * identitation fix * fix again * ranks are now separated datum * fix * fix again * forgotten things * some fixes * NO_DEATH TRAIT * bugfixes + rewrite toy gigas * whoops. * UPD + bugfix * fastfix * fastfix and trailing * metabolism UPD * the last fix, i hope * попытка исправить cast * resurrection rework * fix * fix again... * UPD * модульная информация о димоне * fixes * UPD * fix inconsistent * the last fixes * UPD * fix inconsistent * cleanup * runtime fixes * Global list liquidation - full modular devil bans, devil obligations * inconsistent fix * fix * UPD * fastfix * UPD * UPD * fix inconsistent * fix again * rewrite codex gigas + resolve merge conflict * rewrite sintouched to antagonist datum * dme * inconsistent * last fixes * rewrite sintouched give objectives * les go final * fix * fix inconsistent * fix * i love inconsistent * finallyyyyyyyy * тепеь финал * forgotten moments and ama ready * clean unused * forgotten moments * forgotten moments fix * improve * improve x2 * fix * wtf * Rewrite add reagent signal * early* * improve * first fixes * fix vocal cords * more fixes * упс * optimize * fiix * mor fix * get_all_objectives * OnUnarmedAttack * 1 * 2 * 3 * conflicts * fix * fix x2 * dme * smol fix * <br> * improve * fix inconsistent * fix x2 * trailing....
- Loading branch information
Showing
53 changed files
with
1,918 additions
and
1,440 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| GLOBAL_LIST_INIT(whiteness, list( | ||
| /obj/item/clothing/under/color/white = 2, | ||
| /obj/item/clothing/under/rank/bartender = 1, | ||
| /obj/item/clothing/under/rank/chef = 1, | ||
| /obj/item/clothing/under/rank/chief_engineer = 1, | ||
| /obj/item/clothing/under/rank/scientist = 1, | ||
| /obj/item/clothing/under/rank/chemist = 1, | ||
| /obj/item/clothing/under/rank/chief_medical_officer = 1, | ||
| /obj/item/clothing/under/rank/geneticist = 1, | ||
| /obj/item/clothing/under/rank/virologist = 1, | ||
| /obj/item/clothing/under/rank/nursesuit = 1, | ||
| /obj/item/clothing/under/rank/medical = 1, | ||
| /obj/item/clothing/under/rank/psych = 1, | ||
| /obj/item/clothing/under/rank/orderly = 1, | ||
| /obj/item/clothing/under/rank/security/brigphys = 1, | ||
| /obj/item/clothing/under/rank/internalaffairs = 1, | ||
| /obj/item/clothing/under/rank/ntrep = 1, | ||
| /obj/item/clothing/under/det = 1, | ||
| /obj/item/clothing/under/wedding/bride_white = 1, | ||
| /obj/item/clothing/under/mafia/white = 1, | ||
| /obj/item/clothing/under/noble_clothes = 1, | ||
| /obj/item/clothing/under/sl_suit = 1, | ||
| /obj/item/clothing/under/burial = 1 | ||
| )) | ||
|
|
||
| #define ENRAGED_THRESHOLD 4 | ||
| #define BLOOD_THRESHOLD 7 | ||
| #define TRUE_THRESHOLD 10 | ||
|
|
||
| #define BASIC_DEVIL_REGEN_THRESHOLD 10 SECONDS | ||
| #define ENRAGED_DEVIL_REGEN_THRESHOLD 10 SECONDS | ||
| #define BLOOD_LIZARD_REGEN_THRESHOLD 5 SECONDS | ||
| #define TRUE_DEVIL_REGEN_THRESHOLD 3 SECONDS | ||
|
|
||
| #define BASIC_DEVIL_REGEN_AMOUNT 20 | ||
| #define ENRAGED_DEVIL_REGEN_AMOUNT 40 | ||
| #define BLOOD_LIZARD_REGEN_AMOUNT 60 | ||
| #define TRUE_DEVIL_REGEN_AMOUNT 80 | ||
|
|
||
| #define BASIC_DEVIL_RANK /datum/devil_rank/basic_devil | ||
| #define ENRAGED_DEVIL_RANK /datum/devil_rank/enraged_devil | ||
| #define BLOOD_LIZARD_RANK /datum/devil_rank/blood_lizard | ||
| #define TRUE_DEVIL_RANK /datum/devil_rank/true_devil | ||
|
|
||
| #define BANE_SALT "salt" | ||
| #define BANE_LIGHT "light" | ||
| #define BANE_IRON "iron" | ||
| #define BANE_WHITECLOTHES "whiteclothes" | ||
| #define BANE_SILVER "silver" | ||
| #define BANE_HARVEST "harvest" | ||
| #define BANE_TOOLBOX "toolbox" | ||
|
|
||
| #define OBLIGATION_FOOD "food" | ||
| #define OBLIGATION_FIDDLE "fiddle" | ||
| #define OBLIGATION_DANCEOFF "danceoff" | ||
| #define OBLIGATION_GREET "greet" | ||
| #define OBLIGATION_PRESENCEKNOWN "presenceknown" | ||
| #define OBLIGATION_SAYNAME "sayname" | ||
| #define OBLIGATION_ANNOUNCEKILL "announcekill" | ||
| #define OBLIGATION_ANSWERTONAME "answername" | ||
|
|
||
| #define BAN_HURTWOMAN "hurtwoman" | ||
| #define BAN_HURTMAN "hurtman" | ||
| #define BAN_CHAPEL "chapel" | ||
| #define BAN_HURTPRIEST "hurtpriest" | ||
| #define BAN_AVOIDWATER "avoidwater" | ||
| #define BAN_STRIKEUNCONCIOUS "strikeunconcious" | ||
| #define BAN_HURTLIZARD "hurtlizard" | ||
| #define BAN_HURTANIMAL "hurtanimal" | ||
|
|
||
| #define BANISH_WATER "water" | ||
| #define BANISH_COFFIN "coffin" | ||
| #define BANISH_FORMALDYHIDE "embalm" | ||
| #define BANISH_RUNES "runes" | ||
| #define BANISH_CANDLES "candles" | ||
| #define BANISH_DESTRUCTION "destruction" | ||
| #define BANISH_FUNERAL_GARB "funeral" | ||
|
|
||
| #define BANE_TOOLBOX_DAMAGE_MODIFIER 2.5 | ||
| #define BANE_HARVEST_DAMAGE_MULTIPLIER 2 | ||
|
|
||
| GLOBAL_LIST_EMPTY(allDevils) | ||
| //These are also used in the codex gigas, so let's declare them globally. | ||
| GLOBAL_LIST_INIT(devil_pre_title, list("Dark ", "Hellish ", "Fallen ", "Fiery ", "Sinful ", "Blood ", "Fluffy ")) | ||
| GLOBAL_LIST_INIT(devil_title, list("Lord ", "Prelate ", "Count ", "Viscount ", "Vizier ", "Elder ", "Adept ")) | ||
| GLOBAL_LIST_INIT(devil_syllable, list("hal", "ve", "odr", "neit", "ci", "quon", "mya", "folth", "wren", "geyr", "hil", "niet", "twou", "phi", "coa")) | ||
| GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", ", the Lord of all things", ", Jr.")) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /datum/element/devil_banishment | ||
| element_flags = ELEMENT_DETACH_ON_HOST_DESTROY|ELEMENT_BESPOKE | ||
| id_arg_index = 2 | ||
|
|
||
| var/linked_timer | ||
|
|
||
| /datum/element/devil_banishment/Attach(datum/target) | ||
| . = ..() | ||
| var/mob/living/carbon/human = target | ||
|
|
||
| if(!istype(human) || !human.mind?.has_antag_datum(/datum/antagonist/devil)) | ||
| return ELEMENT_INCOMPATIBLE | ||
|
|
||
| RegisterSignal(human, COMSIG_LIVING_EARLY_DEATH, PROC_REF(pre_death)) | ||
|
|
||
| /datum/element/devil_banishment/Detach(datum/target) | ||
| . = ..() | ||
|
|
||
| UnregisterSignal(target, COMSIG_LIVING_EARLY_DEATH) | ||
|
|
||
| /datum/element/devil_banishment/proc/pre_death(datum/source, gibbed) | ||
| SIGNAL_HANDLER | ||
|
|
||
| if(gibbed || linked_timer) | ||
| return | ||
|
|
||
| var/mob/living/carbon/human = source | ||
| var/datum/antagonist/devil/devil = human?.mind?.has_antag_datum(/datum/antagonist/devil) | ||
|
|
||
| if(!devil?.info) | ||
| return | ||
|
|
||
| playsound(get_turf(human), 'sound/magic/vampire_anabiosis.ogg', 50, 0, TRUE) | ||
| linked_timer = addtimer(CALLBACK(src, PROC_REF(try_banishment), human, devil), devil.rank.regen_threshold / 2, TIMER_LOOP | TIMER_STOPPABLE | TIMER_DELETE_ME) | ||
|
|
||
| /datum/element/devil_banishment/proc/try_banishment(mob/living/carbon/human, datum/antagonist/devil/devil) | ||
| if(human.health >= human.maxHealth) | ||
| stop_banishment_check() | ||
| return | ||
|
|
||
| if(!devil.info.banish.check_banishment()) | ||
| return | ||
|
|
||
| human.dust() | ||
|
|
||
| /datum/element/devil_banishment/proc/stop_banishment_check() | ||
| if(!linked_timer) | ||
| return | ||
|
|
||
| deltimer(linked_timer) | ||
| linked_timer = null |
Oops, something went wrong.