Commit Graph

19523 Commits

Author SHA1 Message Date
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
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
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
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
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
9d821534a5 Merge pull request #10845 from Quantum-M/bureaucraticUpdate
Updates stamps and adds contract sprites.
2019-03-14 15:04:40 +08: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
variableundefined
dcd9ea8278 Merge pull request #11030 from Couls/shesi-fluff-fix
Update shesi's fluff sprites and add in a custom winter hood
2019-03-14 14:43:48 +08:00
Aurorablade
238b73121f Asset logging 2019-03-14 00:42:17 -04:00
Couls
379735e899 Consistency fixes 2019-03-12 18:58:50 -04:00
Couls
cc7d2606be Update shesi's fluff sprites and add in a custom winter hood to go with the coat 2019-03-12 18:24:04 -04:00
rb303
2db1ea7e34 Fix conflicts 2019-03-11 03:04:47 +00:00
rb303
f1716ed14a fixes conflicts 2019-03-11 02:55:21 +00:00
Couls
4e1e55b9e9 Fix spacing errors 2019-03-10 18:00:49 -04:00
Couls
9037aa2d87 Hotfix
send proper message about karma gains, display a message about whether it's enabled or not at roundstart for less confusion
2019-03-10 16:05:02 -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
variableundefined
62412c1611 Merge pull request #11006 from Kyep/mystery_antags
Event Role Feature
2019-03-09 22:17:05 +08:00