Commit Graph

19548 Commits

Author SHA1 Message Date
variableundefined 78281ca05b Merge pull request #11138 from ingles98/plasma_golem_log
Plasma Golems now report to the admins after they explode (Also logs it)
2019-03-29 19:25:07 +08:00
variableundefined 95982791c0 Merge pull request #11130 from Arkatos1/Blob_UI
New Blob UI! [TG Port]
2019-03-29 19:22:15 +08:00
variableundefined 19f3765095 Merge pull request #11110 from Mitchs98/xeno1
Disallows xeno larva from pulling.
2019-03-29 19:19:44 +08:00
variableundefined 5069a0175a Merge pull request #11106 from Mitchs98/food
Adds Shrimp & Fish Skewers and Cheeseburgers.
2019-03-29 19:18:15 +08:00
Fox McCloud a5403c192a fixed errors 2019-03-28 17:54:39 -04:00
Fox McCloud d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Arkatos1 095b1c25ea Code improvement 2019-03-27 15:22:09 +01:00
Arkatos1 ea2cc23111 Added reagent description when blob does chemical reroll, adds complementary color to all reagents, marker now uses complementary colors of reagents, minor formatting 2019-03-26 20:51:06 +01:00
Arkatos1 c0b5359cbd Added descriptions to all blob reagents, and added them to the Blob Help. Reorganized Blob Help a little. 2019-03-26 18:38:09 +01:00
Filipe Reis 729a311569 Plasma Golems now report to the admins after they explode (Also logs it) 2019-03-26 15:11:14 +00:00
variableundefined bbf19c1ae2 Merge pull request #11121 from farie82/diona-fix
Diona nymphs are now eatable and punchable
2019-03-25 22:39:10 +08:00
Fox McCloud ae7a141d28 fixes smoke 2019-03-24 18:44:01 -04:00
joep van der velden b24555ab64 Diona nymphs are now eatable and punchable 2019-03-24 21:46:45 +01:00
Fox McCloud dd3d32d897 Reagent Garbage Collection Edge Case 2019-03-24 16:32:10 -04:00
variableundefined 6570c43e41 Merge pull request #11093 from Emanthealmighty/Collarchange
Can now put a collar any animal that has gained sentience.
2019-03-24 17:56:41 +08:00
variableundefined 0081bfcb04 Merge pull request #11094 from Emanthealmighty/Terrorspiderchange
Terror Spiders can no longer be offered sentience potions.
2019-03-24 17:56:02 +08:00
variableundefined ec46fdc510 Merge pull request #11090 from Tails2091/Animal_Sounds
Added Emotes and Sounds to Corgis and Cats. Moved Animal Sounds to Creature Folder.
2019-03-24 17:55:01 +08:00
variableundefined 7192280996 Merge pull request #11075 from AffectedArc07/alphabetisation-for-all
Alphabetical preferences menu
2019-03-24 17:51:50 +08:00
variableundefined 85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs
[Goonchem] Pills, Bottles, Patches, and Pillbottles
2019-03-24 17:51:00 +08:00
variableundefined 4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature
[Goonchem] Reagent Temperature and Pyrotechnics
2019-03-24 17:50:07 +08:00
Unknown 2d59383fff Disallows larva from pulling. 2019-03-23 21:19:59 -05:00
Unknown 2fc549ffcd Adds a few food. 2019-03-23 14:29:02 -05: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
FalseIncarnate 3c03834571 Benjaminfallout Fluff Item
Adds Benjaminfallout's fluff item: a personalized ring.

Ckey: `benjaminfallout`
Character Name: `Pretzel's Ring"

![ring image](https://i.gyazo.com/b709324b79e2845cae16eb305d7d5cc3.png)

Approved by Kyet
2019-03-22 23:14:52 -04:00
Fox McCloud f14359a0dd effects fixes smoke layer 2019-03-22 14:33:36 -04:00
Fox McCloud 4f99cc91d3 Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature 2019-03-22 14:07:46 -04:00
Eman 9cf063d6ef Terror Spiders can no longer be offered sentience potions.
Gateway mission terror spiders can currently be effortlessly gibbed by giving them a sentience potion and waiting for them to "become sentient", except that when that happens, they explode. Easily abusable, eh? This commit changes this.
2019-03-22 17:07:42 +01:00
Eman 515fb58163 Can now collar any animal that has gained sentience.
This makes it so that upon becoming sentient, either by the xenobiology sentience/transference potion or by the random sentience event, it is possible to put a collar on you.
2019-03-22 16:52:14 +01: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 eee376ba0d Merge pull request #11052 from Fox-McCloud/goon-smoke
[Goonchem] Implements Goon Smoke
2019-03-22 17:45:11 +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
Fox McCloud 85b9fe2ebe lower fire damage 2019-03-21 16:28:46 -04:00
Tails2091 46e550d025 Cat and Mouse choose from emote_hear list 2019-03-21 14:41:35 -04:00
Tails2091 a34f1054ce Add Cat/Corgi emotes and sounds
Organized creature sounds into creature sound folder.
2019-03-21 14:35:00 -04:00
Fox McCloud aba98f6cb2 fake hotspots 2019-03-20 17:11:30 -04:00
Fox McCloud 45ccc65450 Merge pull request #11085 from Dave-TH/I_know_kung_fu
Fixes Krav Maga Disarms
2019-03-20 15:20:40 -04:00
Dave 6328051e45 Fixes Krav Maga Disarms 2019-03-20 12:47:46 -04:00
Fox McCloud 23954aece6 that's a lot of fire 2019-03-20 00:19:12 -04:00
Fox McCloud 122c17a006 oh no fox lost it 2019-03-19 18:23:04 -04:00
Fox McCloud eedc8afa8e reagents mob temp 2019-03-19 14:58:53 -04:00
Fox McCloud ea752e7191 safety 2019-03-19 03:10:47 -04:00
Fox McCloud de09634df1 fixes black powder 2019-03-19 01:53:30 -04:00
Fox McCloud e98f1b36e2 this for now 2019-03-19 00:15:59 -04:00
Fox McCloud 277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
AffectedArc07 c5f5fef912 Alphabetical prefs 2019-03-18 17:28:01 +00: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 9631eef2aa Fixed the middle mouse exploit 2019-03-18 14:53:41 +01:00
Fox McCloud db7baf3915 Merge remote-tracking branch 'upstream/master' into pill-bottles-and-patch-packs 2019-03-17 23:27:52 -04:00