Commit Graph

9074 Commits

Author SHA1 Message Date
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
joep van der velden
5e14214e7b adsf 2019-03-23 16:15:08 +01:00
variableundefined
64c0cf7a0b Merge pull request #11074 from farie82/refactor-pickup-and-fix-bomb
Refactored pickup code and fixed the bomb guardian bug
2019-03-23 20:04:15 +08:00
variableundefined
1a59687c7a Merge pull request #11091 from Mitchs98/Dionaname
Fixes Diona Naming for ID's.
2019-03-22 17:56:21 +08:00
variableundefined
d6c31bc580 Merge pull request #11043 from UmeFuu/UmeFuu-Hairs
Ume fuu hairs
2019-03-22 17:42:48 +08:00
Unknown
40237e7067 Capitalizes all parts of Diona Name
Fixes Diona Naming for ID's.
2019-03-22 02:37:41 -05:00
joep van der velden
e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
joep van der velden
675ef68422 uses move resist now 2019-03-17 14:41:31 +01:00
variableundefined
c7b560f842 Merge pull request #11045 from Kyep/ventcrawl_buckle
Fixes buckled ventcrawl
2019-03-17 15:23:16 +08:00
variableundefined
efa369162c Merge pull request #10853 from Ty-Omaha/ssd-miasma
SSD Miasma
2019-03-16 09:22:46 +08:00
Kyep
ca773c32dc Fixes ventcrawl while buckled to something 2019-03-15 03:33:48 -07:00
UmeFuu
81ec0cfe8c Adds new hairs (code)
What does this PR do:
Adds about eleven new hairs, some of them are edits from other hairs requested by some people, credits to the original spriter/s
2019-03-14 04:37:38 -03:00
variableundefined
6a2067f9c4 Merge pull request #10795 from Quantum-M/alienOrgans
[Ready for Review]Adds different looking organs to each species, some blood color changes, and MMI changes
2019-03-14 15:04:29 +08:00
Couls
379735e899 Consistency fixes 2019-03-12 18:58:50 -04:00
variableundefined
bd87257e73 Merge pull request #11012 from Tails2091/simple-help
Adds Missing simple_animal Emote Help Text
2019-03-10 09:07:51 +08:00
Tails2091
8eadbdcd59 Adds missing simple_animal help text 2019-03-09 17:57:05 -05:00
Ty-Omaha
d89e62df67 update 2019-03-08 18:20:25 -05:00
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
B.A.L
7b8c33466d Undo blood color 2019-02-28 17:34:03 -07: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