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

Fieldterm equip fix #36

Merged
merged 4 commits into from
Mar 5, 2018
Merged

Fieldterm equip fix #36

merged 4 commits into from
Mar 5, 2018

Conversation

MikeJeffers
Copy link

Maintains ratio of accum and health before and after fitting.
Fixes bug from me being terrible. (if you repair or get damaged while fitting, this is also maintained)

LoyalServant
LoyalServant previously approved these changes Mar 5, 2018
@MikeJeffers MikeJeffers merged commit 94b0741 into Development Mar 5, 2018
MikeJeffers added a commit that referenced this pull request Mar 7, 2018
* Gitignore and startup args (#1)

Gitignore and args

* Fix for field terminals.

* fix remote market server error

* gives player equal syndicate protection and molecular instability when teleporting.

* Tweak syndicate protection to be 25% less than instability

* Fix for field terminals. (#2)

* Fix for field terminals.

* fix remote market server error

* gives player equal syndicate protection and molecular instability when teleporting.

* Tweak syndicate protection to be 25% less than instability

* test feature: alter rift system to give us a random jump to the stronghold zone.

* modify rifts slightly.

* Fix player trades

* Give new accounts EP when created.

* ep activity falloff, starting, and target level (#6)

* Update LICENSE (#8)

* Syndicatification of assignments done; tokens and rep (#5)

* Starting nic to 500k; TODO still should move to DB (#4)

* use unicoin on itemshop (#10)

* Fix for #52 where production missions would not advance. (#13)

* add User-Agent to avoid being 403'd by current web server (#14)

* in-game command interface (#16)

* rudimentary in-game command interface

* more commands added.

* more layer editing abilities.

* bugged it!

* add a windows service for the server. (#15)

* Fix for shutdown cancel issue (#48)

* improvements to commands / teleporting.

* release build x64 (#17)

* improvements to the command interface

* we have to teleport someplace!

* rift system + stronghold overhaul.

* forgot to put back random chance.

* more command updates.

* Tutorial Fix -- force send to TMA (#19)

* Loyal dev (#20)

* improvements to commands / teleporting.

* improvements to the command interface

* we have to teleport someplace!

* rift system + stronghold overhaul.

* forgot to put back random chance.

* more command updates.

* return players in zone properly.

* make sure we have stronghold zones enabled.

* properly query and cache insurance records.

* Base mission nic pay balance; beta 3->2x nic; participant bonus 2.5% nic per (#23)

* Loyal outpost bonus issue (#24)

Fix for outpost facility point allocations

* Potential fix for Interzone Teleporters (#25)

* rift exit temp fix for stronghold1

* Price calculator probably should not be a single instance object. (#27)

* Changes to startup sequence to ensure markets are loaded properly after zones are created.

* TransactionScope not completed when settings corp-corp standings (#31)

* Production costing--WIP (#32)

* production costs on bots working, tech levels working

* add docs and notes

* decrease owner facility cost recovery

* standings balance (#33)

* Mitigate account creation spam from the client. (#34)

* closes #72 and #71, re-apply invul, reduce arkhe respawn on player death (#35)

* Fieldterm equip fix (#36)

* closes #72 and #71, re-apply invul, reduce arkhe respawn on player death

*  closes #71 and handles accum state

* Before refresh

* missed add
@MikeJeffers MikeJeffers deleted the fieldterm-equip-fix branch March 14, 2018 02:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants