mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-09 17:13:36 +00:00
29c9aca1a8
Fixes more compile errors. Down to 65 now. updates << into to_chat Down to 60 errors, also starts to port the codex gigas and law 666 for cyborg devils. Fixes more compile errors. Down to 41 now. Replaces timers with spawns, and <<s with to_chats 40 compile errors. Down to 34 compile errors. whoops, actually down to 34 now. Down to 25 compile errors. Down to 15 compile errors, I'llprobably need some help at this point. Woo! Down to 7 compile errors. Ported over devil hud. Number of errors up to 19. WOO! It compiles. It's completely untested, but it compiles. Adds devils to traitor panel Implements iron, silver and salt banes. implements flashing lights bane Selling your soul prevents cloning, and some other methods of revival. Implements harvest bane Merged and sorted icons/obj/bureaucracy.dmi Adds toy codex gigas Fixes compile errors, adds codex gigas sprite. Lots of bug fixes. Contracts work, devil revival is more consistant, etc Adds missing icons for flaming contracts, summon pitchfork, summon wealth, employment cabinet, and sintouch. Converts DEEP LORE explanations from hell to inferno incorporated. Banishes the compile errors. Devils come from hell again. replaces offer drink obligation with a much more lore appropriate devil's fiddle reference Also fixes contract bashing brain damage chance. Undoes some changes I accidentally did to example config files. Fixes up a few remaining bugs. Puts in the codex gigas and employment contract cabinets. -- Lemon - I kinda skipped this one, I'll patch it back in later because map conflicts are suffering incarnate Solves the devil law problem in a REALLY hacky snowflake way. Fixes a few methods in which a hellbound can be revived. Devils respawn with a limited number of appropriate items, instead of COMPLETELY naked upon corpse destruction. Also adds lines to example config. Updates devil laws to be less hacky. Objective to sintouch x mortals now greentexts correctly. Contracts no longer cause brain damage. I didn't realize it was lethal on this codebase. Oops. Splits dust(visual_only) into dust() and dust_animation() procs Fixes some defines. Adds undef statements to improve compile times. Fixes race changes from demonic form changes. Fixes small runtime error. (Which somehow didn't break anything?) Implements lots of small changes/corrections suggested by CrazyLemon64 I still need to test these changes, along with other potential issues he brought up. Fixes harvest bane and power contracts. Also adds a few </span> tag enders. Corrects some edge cases with revival contracts. Fixes compile error. Reverts unneccecary change to item/weapon/reagent_containers Cleans up the code for readability. Prevents cloning of hellbound individuals. Latejoins now properly have employment contracts added to employment cabinets (provided they still exist) Infernal contracts are no longer rendered unreadable by fire and alcohol. All fireproof paper remains readable after being fireballed, not just infernal contracts. (Though infernal contracts are the only fireproof paper atm) Fixes an edge case problem with cloning. Adds is_revivable proc to mind. Removes snowflake code involving preventing soulseller resurrection. Indulges in the sin of sloth, and copies tg's lazy list macros Proc calls that transform the user no longer go to a null target Fixes devil UI, human regression will keep appearance, and adds danceoff Devil's base forms no longer suffocate inside the devil Fixes runtimes, gets stuff working The arch devil can now blast down walls with their pitchfork EXTERMINATE ALL SPIRITS Activates devil clause in voice of god Fawks Mcclood Feature P A R I T Y Fixes devil bugs from testing - Does a death refactor to make sure that diabolical resurrection works - Walls no longer leave girders when blasted by the devil - Getting a new body gives you a rudimentary amount of equipment to work with to get out of maintenance or whereever Does all the icons in a single commit on their own because icon conflicts suck Starting point of extra devil rebalance/fixes Ports devil friends Also oops tramples all over Fethas' corpse PR that's still up I need to take care of that one Styling fixes
58 lines
1.8 KiB
Plaintext
58 lines
1.8 KiB
Plaintext
#define CONTRACT_POWER "Power"
|
|
#define CONTRACT_WEALTH "Wealth"
|
|
#define CONTRACT_PRESTIGE "Prestige"
|
|
#define CONTRACT_MAGIC "Magic"
|
|
#define CONTRACT_REVIVE "Revive"
|
|
#define CONTRACT_KNOWLEDGE "Knowledge"
|
|
#define CONTRACT_UNWILLING "Unwilling"
|
|
// FIXME: Implement these
|
|
#define CONTRACT_ETALENT "Engineering Talent"
|
|
#define CONTRACT_CTALENT "Chemistry Talent"
|
|
#define CONTRACT_RETURNDEAD "Return Dead"
|
|
#define CONTRACT_AUGMENT "Cybernetic Augmentations"
|
|
#define CONTRACT_CANDY "Endless Candy"
|
|
#define CONTRACT_ECHANCE "An Extra Chance"
|
|
#define CONTRACT_ATECH "Advanced Technology"
|
|
#define CONTRACT_DEVILSMACHINE "Devil's Machinery"
|
|
#define CONTRACT_YOUTH "Eternal Youth"
|
|
#define CONTRACT_FOOD "Food"
|
|
#define CONTRACT_SPACE "Space Gear"
|
|
#define CONTRACT_CALAMITY "Calamity"
|
|
|
|
#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 LORE 1
|
|
#define LAW 2
|