Commit Graph

604 Commits

Author SHA1 Message Date
AzuleUtama dc7a6ca809 Fixes ORM Exploit 2018-11-30 11:41:22 +00:00
variableundefined 63490c8378 Merge pull request #10330 from tigercat2000/multilingual
Multilingualism
2018-11-28 10:48:19 +08:00
variableundefined 598d4db1f7 Merge pull request #10338 from MarsM0nd/valid_salad_coin
Small refactor for coins
2018-11-25 08:38:11 +08:00
Mars 02054901eb Quick fix for the antagtoken coin 2018-11-24 20:06:17 +01:00
tigercat2000 e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
variableundefined 9a29dbf9f2 Merge pull request #10198 from farie82/apply-repair-logic
Applies repairing time to mining bots
2018-11-12 18:13:46 +08:00
variableundefined 557540974f Merge pull request #10192 from farie82/Mining-bot-shoot
Mining bots KA blasts now do weakened damage in pressured zones
2018-11-12 08:41:45 +08:00
joep van der velden 4150d645c9 makes you harm mining bots with welders on anything but help 2018-11-11 10:55:32 +01:00
joep van der velden 7028e77b08 Applies repairing time to mining bots 2018-11-11 10:47:24 +01:00
joep van der velden bf2325ee94 Mining bots KA blasts now do weakened damage in pressured zones 2018-11-10 18:51:12 +01:00
tigercat2000 97461b3f3d Merge pull request #10078 from variableundefined/FermentationBarrel
[READY] Port Fel's fermentation barrel from tg
2018-11-07 23:09:08 -08:00
joep van der velden 469832b0d2 Mining bots now work upon being health upgraded 2018-11-07 20:23:46 +01:00
Fox McCloud ecb9c11433 Updates Components Again 2018-11-02 16:23:46 -04:00
variableundefined 7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
Fox McCloud f2e82da756 Merge pull request #9864 from variableundefined/ManualRevert
Manually revert Purpose's smoothing PR
2018-10-19 19:16:00 -04:00
Mark Mak 91dcf447ec Merge pull request #9888 from Fox-McCloud/spark-refactor
Refactors Spark Spread Activation
2018-10-19 08:41:03 +08:00
Fox McCloud 3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
variableundefined 34aadd6b25 Manually revert Purpose's smooth plating PR's smoothing component 2018-10-16 08:57:10 +08:00
Mars 984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
variableundefined 4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000 98c77fc466 Merge pull request #9343 from variableundefined/OreTGPort
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
variableundefined 108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
Desolate f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Mars d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
variableundefined 9a2b530917 Merge pull request #9716 from SamHPurp/smooth-plating
Adds smoothing to plating, add shadows to give depth.
2018-10-09 10:25:34 +08:00
variableundefined 6b1b38d4f1 Port over tg ore stack and stack merging
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
2018-10-09 10:06:03 +08:00
Purpose 4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Purpose c6432d5053 resolving conflicts 2018-10-08 21:09:00 +01:00
Crazylemon64 3db4229918 First big chunk of the refactor
mid-refactor of `take_overall_damage`

Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs

Allows the dead to examine

Removes the `blinded` var

Refactor cyborg components so vision loss is instant

Robot life/death updates instantly

Adds instant updates for damage overlays and HUD icons for humans

Final reconciliation with the species refactor

Adds a stat debugging system and debugging logs

Also fixes instant death on species change

"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would

I used it to fix people dying instantly when changing species due to
temporary deletion of the brain

Fox's requests

Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
Purpose 63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Desolate 4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Purpose c74b0c3ba4 smooooooooth 2018-10-06 13:16:55 +01:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy Lemon ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
Purpose c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
Purpose 037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Purpose efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
variableundefined bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
Mars f2532e74ba Merge conflict fix 2018-08-28 11:28:13 +02:00
Mars b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Kyep c1c98e46ef failure messages, depot outgoing redspace portal 2018-08-16 00:57:59 -07:00
Mars 4d3c3b29e4 Quick Regex replace action
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
2018-08-15 23:57:46 +02:00
Kyep 477912dc72 CrazyLemon 2, more small stuff 2018-08-06 21:19:10 -07:00
Kyep 62b7f6b55b split jaunter change also 2018-08-02 09:39:00 -07:00
Kyep 102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Kyep 7a493a5151 neca-inspired loot list adjustments 2018-07-31 17:48:02 -07:00
Crazylemon64 b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
Fox McCloud 7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00