Skip to content
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 7 commits into from Oct 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions code/game/gamemodes/gang/gang_pen.dm
Expand Up @@ -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)
Copy link
Contributor

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

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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you should be getting rid of this, though

Expand All @@ -120,4 +118,4 @@
qdel(src)
return
imp = new /obj/item/weapon/implant/gang(src,gang)
..()
..()
10 changes: 5 additions & 5 deletions code/game/gamemodes/gang/recaller.dm
Expand Up @@ -142,8 +142,8 @@
else
dat += "C4 Explosive<br>"

dat += "(10 Influence) "
if(points >= 10)
dat += "(15 Influence) "
if(points >= 15)
dat += "<a href='?src=\ref[src];purchase=implant'>Implant Breaker</a><br>"
else
dat += "Implant Breaker<br>"
Expand Down Expand Up @@ -252,10 +252,10 @@
else
pointcost = 50
if("implant")
if(gang.points >= 10)
if(gang.points >= 15)
item_type = /obj/item/weapon/implanter/gang
usr << "<span class='notice'>The <b>implant breaker</b> is a single-use device that destroys all implants within the target before trying to recruit them to your gang. Also works on enemy gangsters.</span>"
pointcost = 10
pointcost = 15
if("gangtool")
if(gang.points >= 10)
if(usr.mind == gang.bosses[1])
Expand Down Expand Up @@ -447,4 +447,4 @@
outfits = 1

/obj/item/device/gangtool/spare/lt
promotable = 1
promotable = 1
36 changes: 36 additions & 0 deletions html/changelogs/Kor-gang.yml
@@ -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."