-
Notifications
You must be signed in to change notification settings - Fork 566
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adds the Military Chaplain #4142
Adds the Military Chaplain #4142
Conversation
Why all of this in the PR? |
if(job == JOB_CHAPLAIN)//Chaplain is forbidden to use weaponry, regardless of the variable! | ||
to_chat(src, SPAN_WARNING("Your holy vow does not allow you to use this!")) | ||
return FALSE |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be something more generic, like a trait given on job assignment
if(alpha < 255) | ||
to_chat(src, SPAN_WARNING("Your cloak does not allow you to use this!")) | ||
return FALSE |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cloaks should definitely give a trait
to_chat(user, SPAN_WARNING("Your programming does not allow you to use firearms.")) | ||
else | ||
to_chat(user, SPAN_WARNING("You are unable to use firearms.")) | ||
if(!H.can_use_weapon()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we're losing a lot of text feedback for this & the below 2 sections
To be clear before the next testmerge this needs: |
Reordered job list isn't necessary in this PR. |
No, it does not. Humans that use guns get a generic "You cannot use firearms" text. It checks if your species is synthetic, and if it is, it only then says your programming restricts it. |
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
Closed pending overhaul |
Preface - This needs atomisation I know. 😔
About the pull request
This is still a work in progress, at least so far as the starting equipment is concerned.
Using the lovely chaplain's office from #3887.
Explain why it's good for the game
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>
tags.Changelog
🆑 theselfish, forest2001
add: Added the Military Chaplain. Office is located in the maintenance corridor next to the memorial garden.
maptweak: Moved some bits around in this corridor, including creating a mini substation for the Chaplain's Office, Chapel, and that region of maintenance.
add: Slightly re-ordered the job list to put Mess Tech under the Quartermaster properly.
code: Tidied up the Preferences menu to be wider rather than longer.
imageadd: Added spawn landmark icons for Auxiliary Officer and Chaplain.
imageadd: Added Squad and Security HUD icons for Chaplain.
code: Created a proc that checks for allow_gun_usage to reduce code duplication.
/:cl: