Commit Graph

9046 Commits

Author SHA1 Message Date
variableundefined
c8a8b2218d Merge pull request #10981 from Kyep/spider_venom
Reworks Giant Spider Venom
2019-03-08 22:28:13 +08:00
variableundefined
3d0667a1f7 Merge pull request #10988 from Jazz23/Golem-Fix
Removes golem shell after species swap
2019-03-08 22:14:16 +08:00
variableundefined
0b79e58a8e Merge pull request #10992 from Aurorablade/PSHairFluff
Pinapple salad hair fluff
2019-03-08 21:41:02 +08:00
Aurorablade
389f055a5b Fixes a pathing format error that i should know better then not to do. 2019-03-06 20:22:02 -05:00
variableundefined
cbc45451bc Merge pull request #10994 from Agameofscones/lang_key_fix
Fixes Neo-Russkiya Lang key
2019-03-07 09:11:36 +08:00
variableundefined
6549234b8c Merge pull request #10968 from Fox-McCloud/his-grace
His Grace Binds His Will
2019-03-07 08:49:05 +08:00
Gwydion Brain
23ba90fffc Initial
I broke pls fix
2019-03-05 13:09:40 -08:00
Aurorablade
ca629f4bd3 Pinapplehairfluff 2019-03-04 22:10:22 -05:00
variableundefined
c12a43913b Merge pull request #10921 from Nicaragua1/General_Griefsky
Genewul Giftskee is less annoying
2019-03-04 19:02:47 +08:00
Jazz23
29840da88b Removes golem shell after species swap. 2019-03-03 21:08:04 -08:00
variableundefined
e109e4fcaa Merge pull request #10939 from Agameofscones/elysian-russian
Neo-Russkiya
2019-03-03 23:04:36 +08:00
variableundefined
8236d9e061 Merge pull request #10956 from craftxbox/ai-doorknob-tweak
AI Doorknob tweak
2019-03-03 22:39:46 +08:00
Kyep
d231367960 reworks giant spider venom 2019-03-02 19:30:20 -08:00
Fox McCloud
6bd0ecfab0 tweaks 2019-03-02 10:03:09 -05:00
Dave
ebe99e8986 Applies what my mom taught me about conflict resolution 2019-03-01 18:51:04 -05:00
variableundefined
2ab3f9943a Merge pull request #10929 from Nicaragua1/robotic_arms_bots
Robotic l/r arms bots
2019-02-27 22:54:37 +08:00
craftxbox
de64a857e7 make the open nearest door button more obvious it exists and isnt a part of previous href 2019-02-26 19:52:53 -03:30
Nicaragua
55c418b61e removed null 2019-02-26 16:35:12 -03:00
variableundefined
2ddc16970c Merge pull request #10947 from Fox-McCloud/adds-upgraded-heart
Adds Upgraded Cybernetic Heart
2019-02-26 17:01:50 +08:00
variableundefined
3e1e196dd0 Merge pull request #10911 from farie82/Beepsky-use-doafter
Beepsky now uses do after
2019-02-26 16:36:27 +08:00
variableundefined
8266a732bf Merge pull request #10885 from datlo/freegolemtweaks
Free Golems tweaks
2019-02-26 08:43:47 +08:00
variableundefined
356feaca7d Merge pull request #10944 from Kyep/ts_princess_and_white_update
Terror spider princess and white update
2019-02-26 08:10:26 +08:00
variableundefined
9d66e0e426 Merge pull request #10932 from Ralta/ianshield
Adds Blueshield Beret to Ian clothing
2019-02-26 08:06:35 +08:00
Gwydion Brain
dde9789a7f Drops Elysiun 2019-02-25 00:07:02 -08:00
Fox McCloud
b8a9f127bf Adds Upgraded Cybernetic Heart 2019-02-25 01:15:53 -05:00
Kyep
c631f6b9cb updates name of black terror venom 2019-02-23 23:25:22 -08:00
Kyep
69327008fd fix bug where princess name did not update 2019-02-23 23:25:10 -08:00
Gwydion Brain
b8d393e462 Cleans last Trad-Rus diff 2019-02-22 19:30:17 -08:00
Gwydion Brain
0ae6419a76 Syntax Updates
whitespace cleanup


whitespace 2 electric boogaloo


Grammar Fix ups


Module Fix


Lore Accuracy (tm)


Spacing Adjustments


Adjusts verbs, reduces redundancy


otherone


Two exceptionally import syllables


Typos


Removes Trad Rus

Removes Trad-Rus, as it was redundant
Renames Elysian to Elysiun
Changes descriptions of both languages to better fit common usage.
Changes Russkiya lang key to >
Travis Catch

I'm a dummy
2019-02-22 19:24:21 -08:00
Gwydion Brain
a0bd91596a Initial
Langs
2019-02-21 18:08:19 -08:00
Ralta
3ae3fae026 Added Blueshield armor sprite, allows Ian to wear Blueshield vest 2019-02-21 01:04:19 +00:00
Ralta
7a7dcf29c9 Adds Blueshield Beret to Ian clothing
Allows Ian to wear the Officer's Beret and the Navy Blue Officer's Beret in order to become Blueshield Ian, protector of Command and biter of ankles.
2019-02-20 23:16:01 +00:00
Nicaragua
12275100e5 Merge branch 'robotic_arms_bots' of https://github.com/Nicaragua1/Paradise into robotic_arms_bots 2019-02-19 19:37:14 -03:00
Nicaragua
47fa6ce819 fix missing ! hmm 2019-02-19 19:37:04 -03:00
Nicaragua
d2bcf5862a Merge branch 'master' into robotic_arms_bots 2019-02-19 19:30:08 -03:00
Nicaragua
b810e4d9e1 All bots drop the correct arm and each construction method (bots that have robotics arms) 2019-02-19 19:22:44 -03:00
Nicaragua
ef807518ac Cleanbot now drops correct arm 2019-02-19 17:46:00 -03:00
joep van der velden
e44cab464d invoke_async then 2019-02-18 21:12:14 +01:00
Nicaragua
4fa47adbd2 Genewul Giftskee is less annoying
makes Genewul Giftskee less annoying
2019-02-17 13:00:25 -03:00
variableundefined
f27f73e15b Merge pull request #10916 from Nicaragua1/General_Griefsky
fix secbots construction names
2019-02-17 12:40:10 +08:00
Nicaragua
6d40ca21d1 honkbot not dropping oil 2019-02-16 20:11:16 -03:00
Nicaragua
089c5a50ba return parent 2019-02-16 19:35:56 -03:00
Nicaragua
8f8faeeb93 fix name 2019-02-16 19:31:11 -03:00
variableundefined
8689bc4437 Merge pull request #10901 from aleksix/ai-cryo-fix
AI's Wipe Core now properly ghosts the player
2019-02-17 06:30:52 +08:00
joep van der velden
29b20ec201 Beepsky now uses do after 2019-02-16 12:34:13 +01:00
variableundefined
4521747046 Merge pull request #10750 from Nicaragua1/General_Griefsky
General Griefsky
2019-02-16 18:41:35 +08:00
datlo
33eb050f3d Merge branch 'master' into freegolemtweaks 2019-02-15 16:04:43 +00:00
Unknown
5ab0af3b25 Medical QoL PR 2019-02-15 00:10:08 -05:00
Alex Gospodchikov
b8a5facf6a Changed ghostize(0) to ghostize(FALSE) 2019-02-14 18:36:21 +03:00
Alex Gospodchikov
f2e5b92580 Forgot to remove an earlier note from the comments 2019-02-14 18:13:34 +03:00