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

Abduction Update 2.5 #9185

Merged
merged 8 commits into from May 2, 2015
Merged

Abduction Update 2.5 #9185

merged 8 commits into from May 2, 2015

Conversation

AnturK
Copy link
Member

@AnturK AnturK commented Apr 26, 2015

I probably should have waited a moment with that one.

@WJohn
Copy link
Contributor

WJohn commented Apr 27, 2015

Could you fix #9194 in this PR too?

@GunHog
Copy link
Contributor

GunHog commented Apr 27, 2015

All of the Abductor tech needs to have origin techs. If the Abductors are unrobust and lose their equipment in a fight against the crew, the crew should be able to deconstruct them for mad Science levels! It is highly advanced alien technology, surely that would mean something?

@AnturK
Copy link
Member Author

AnturK commented Apr 27, 2015

Sure, i'll add some tech levels to the gear

@AnturK
Copy link
Member Author

AnturK commented Apr 27, 2015

For the love of god never mix spaces and tabs for indentation

@Jordie0608 Jordie0608 added the Fix Rewrites a bug so it appears in different circumstances label Apr 28, 2015
@AnturK
Copy link
Member Author

AnturK commented Apr 30, 2015

About the tech values : anything that's below top-tier is not really a reward with our current system.

@peoplearestrange
Copy link
Contributor

There's an issue with monking Abductors. If they are monkied they have no way to get back to the ship or ever be de-monkied. I'm not sure if other "alien" mobs can be monkied (such as lings, blobs, shadowlings) but it seems a little implausible that their DNA would be the same as humans.

Also what does probing actually do with the "Baton tool"? Having to not be on help intent is kinda counter intuitive, but I'm assuming thats what you're saying is being changed in the PR?

AnturK and others added 8 commits May 2, 2015 12:54
@AnturK
Copy link
Member Author

AnturK commented May 2, 2015

Merge conflict fixed. Not sure why but the floor icon file was reverted some way back.

Jordie0608 added a commit that referenced this pull request May 2, 2015
@Jordie0608 Jordie0608 merged commit 6008404 into tgstation:master May 2, 2015
@AnturK AnturK deleted the aliens_stole_my_branch_name branch March 26, 2016 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Rewrites a bug so it appears in different circumstances
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ayyylien shuttle table on the left is not correctly connected. Abductor baton seems to stop working
6 participants