Commit Graph

19538 Commits

Author SHA1 Message Date
Twinmold
37a8d796a6 One Less Line
All this does is turns the sanity check into a not check rather than an
empty positive check.
2019-03-31 17:39:40 -05:00
Twinmold
f65bfef89e Fixes Sending Faxes Using Toner
As the code currently stands, whenever you send a fax to Central Command
or the Syndicate, it makes a non-existant copy of the fax using toner
from your own machine. This fix removes unnecessary code and no longer
requires toner to send a fax.

Fixes: #11172

🆑 Twinmold
Fix: No longer costs toner to send a fax to Central Command
/🆑
2019-03-31 16:45:43 -05: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
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
Fox McCloud
d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
variableundefined
024a393fe9 Merge pull request #11057 from farie82/no-more-force-on-dview
Should make it so that dview can not bump into alive people anymore
2019-03-17 22:11:50 +08:00
joep van der velden
675ef68422 uses move resist now 2019-03-17 14:41:31 +01:00
variableundefined
570678a41f Merge pull request #10896 from Jazz23/Xenobio-Addition
Xenobio TG port
2019-03-17 20:36:16 +08:00
variableundefined
f6927792ea Merge pull request #10953 from AffectedArc07/prisonconsole-fixed
Prisonconsole fixed
2019-03-17 19:23:17 +08:00
joep van der velden
1131133d59 Confirmation 2019-03-17 10:17:39 +01:00
variableundefined
c7b560f842 Merge pull request #11045 from Kyep/ventcrawl_buckle
Fixes buckled ventcrawl
2019-03-17 15:23:16 +08:00
AffectedArc07
ce34a6ccb1 Merge branch 'master' into prisonconsole-fixed 2019-03-16 17:54:31 +00:00
variableundefined
efa369162c Merge pull request #10853 from Ty-Omaha/ssd-miasma
SSD Miasma
2019-03-16 09:22:46 +08:00
Fox McCloud
f01af6ae20 Implements Goon Smoke 2019-03-15 19:09:29 -04:00