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
Implant Breaker Changes #12038
Merged
Merged
Implant Breaker Changes #12038
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e412a23
Merge remote-tracking branch 'tgstation/master'
imtakingabreakdontatme 4b9bdca
Implant Breaker
imtakingabreakdontatme 9b7c31c
Deconverts
KorPhaeron 6c1307f
Oops
KorPhaeron 9aaeb87
Deconverts
KorPhaeron 076a49b
15 points
KorPhaeron 22ca839
Changelog
imtakingabreakdontatme File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -98,15 +98,13 @@ | |
if(ticker.mode.remove_gangster(target.mind,0,1)) | ||
success = 1 //Was not a gang boss, convert as usual | ||
else | ||
success = 1 //Not a gangster, convert as usual | ||
success = 1 | ||
|
||
if(!target.mind) | ||
return 0 | ||
|
||
if(ishuman(target)) | ||
if(success && ticker.mode.add_gangster(target.mind,gang,0)) | ||
target.Paralyse(5) | ||
else | ||
if(!success) | ||
target.visible_message("<span class='warning'>[target] seems to resist the implant!</span>", "<span class='warning'>You feel the influence of your enemies try to invade your mind!</span>") | ||
|
||
qdel(src) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think you should be getting rid of this, though |
||
|
@@ -120,4 +118,4 @@ | |
qdel(src) | ||
return | ||
imp = new /obj/item/weapon/implant/gang(src,gang) | ||
..() | ||
..() |
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,36 @@ | ||
################################ | ||
# Example Changelog File | ||
# | ||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. | ||
# | ||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) | ||
# When it is, any changes listed below will disappear. | ||
# | ||
# Valid Prefixes: | ||
# bugfix | ||
# wip (For works in progress) | ||
# tweak | ||
# soundadd | ||
# sounddel | ||
# rscadd (general adding of nice things) | ||
# rscdel (general deleting of nice things) | ||
# imageadd | ||
# imagedel | ||
# spellcheck (typo fixes) | ||
# experiment | ||
# tgs (TG-ported fixes?) | ||
################################# | ||
|
||
# Your name. | ||
author: Kor | ||
|
||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. | ||
delete-after: True | ||
|
||
# Any changes you've made. See valid prefix list above. | ||
# INDENT WITH TWO SPACES. NOT TABS. SPACES. | ||
# SCREW THIS UP AND IT WON'T WORK. | ||
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. | ||
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. | ||
changes: | ||
- tweak: "Gang implanters now only break implants/deconvert gangsters, meaning you will have to use a pen to convert them afterwards." |
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.
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.
add_gangster() was really all you needed to remove