Devil fixes #18520
Merged
Devil fixes #18520
Conversation
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
…dom books) can be ordered. Re-factors bookshelf pre-stocking
…ment. This is done by simply having burial garments in the same tile as it.
| @@ -474,7 +474,7 @@ | |||
| /obj/item/weapon/twohanded/pitchfork/demonic/pickup(mob/user) | |||
| if(istype(user, /mob/living)) | |||
| var/mob/living/U = user | |||
| if(!U.mind.devilinfo) | |||
| if(U.mind && (!U.mind.devilinfo || (U.mind.soulOwner == U.mind))) //Burn hands unless they are a devil or have sold their soul | |||
There was a problem hiding this comment.
Did you mean !U.mind.soulowner?
There was a problem hiding this comment.
No, by default, you own your own soul.
Added new rules for devils to follow (No coercing signing with violence, no intentionally harming other devils directly)
| var/c = category? " AND category='[sanitizeSQL(category)]'" :"" | ||
| var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("library")] WHERE isnull(deleted)[c] GROUP BY title ORDER BY rand() LIMIT [book_count];") // isdeleted copyright (c) not me | ||
| var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("library")] WHERE isnull(deleted)[c] GROUP BY title ORDER BY rand() LIMIT [amount];") // isdeleted copyright (c) not me |
There was a problem hiding this comment.
Why are you touching the library sql?
There was a problem hiding this comment.
I renamed a variable. This code was originally in /obj/structure/bookcase/random/initialize(), but is now in a completely separate proc.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Numerous small fixes/changes/balances to devils.
Notable changes:
It now requires more souls to increase. It is now 3,7,12 souls, up from 3,6,9.
Devils now have extra rules, no coercing into signing contracts with violence, and no intentionally physically harming another devil.
Burial garment banishment now works on true devils. <--- Unreported issue, can I use that fix for the mergetoken?
Renamed all demon files to devil
Updated religious supplies to have burial garments.
Burial garments re-added to box/meta
Increased infernal fireball cooldown
Soulsellers can now use a pitchfork without being harmed.
Added new book crate, which includes a codex gigas to cargo.