Repede
e5c52d5819
Merge branch 'master' into Guest-Pass-Fix
2019-11-23 01:58:52 -05:00
Shadow
1e4fa13f67
TSS Changes+Update
2019-11-23 00:19:38 -06:00
Shadow
81835fe63f
Return!
2019-11-22 17:34:51 -06:00
izac112
6d1258bc11
Edit
2019-11-19 22:58:59 +01:00
izac112
f43601eecd
Changes it from "an additional hour" to "an additional four hours"
2019-11-19 22:55:33 +01:00
Repede
d97f049b1c
Adds Strix Hades plushie as a selection, ingame plush.
2019-11-17 21:20:27 -05:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Meghan-Rossi
03c82caa71
Makes Monster Tamer give nutrition
...
Seems to have been intended anyway but wasn't working because the nutriment factor was zero. Made it work similar to protein since it's made with protein
2019-11-16 14:35:38 +00:00
Novacat
2ee3dcbb27
Merge pull request #6136 from Heroman3003/gateway-faux-fix
...
Switches to an alternative system for gateway map use.
2019-11-15 12:46:55 -05:00
Unknown
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
Novacat
f99e631634
Merge pull request #6179 from lbnesquik/Kath-Fish-Update
...
Ensure that EVERY mob give at least SOME nutrition when digested.
2019-11-15 12:00:19 -05:00
Novacat
4763d548ab
Merge pull request #6184 from Meghan-Rossi/collartweak
...
Adds a way to set the tag of loadout collars as part of the loadout
2019-11-15 11:59:56 -05:00
Novacat
30d11b091e
Merge pull request #6191 from Sk1Tz/master
...
Added neckfluff for facial hair option.
2019-11-15 11:58:23 -05:00
Heroman
d313f4d7ac
Fixes tails and fine manipulation
2019-11-15 13:46:40 +10:00
Heroman
871305583d
Fixes riftwalkers not having darksight
2019-11-15 13:15:56 +10:00
Sk1Tz
3ba8cf4403
Added neckfluff for facial hair option
2019-11-14 21:13:42 -05:00
Heroman3003
7f4979e1a3
Fixes lack of proper restriction
2019-11-15 11:49:20 +10:00
Heroman3003
ab603cffa4
Finishes up the main shadekin features
2019-11-15 11:13:31 +10:00
Heroman3003
62889c39d9
Removes deprecated code
2019-11-15 08:38:53 +10:00
Novacat
f60b2094a0
Merge pull request #6173 from Very-Soft/vendortime
...
New vending machines
2019-11-13 13:42:19 -05:00
Novacat
99f2964f73
Merge pull request #6129 from Rykka-Stormheart/shep-dev-chat-update
...
Earlyport of Chat Refactor from Polaris
2019-11-13 13:33:22 -05:00
Rykka
581e7c7764
Reduce volume, reduce loop time
2019-11-13 05:31:33 -07:00
Rykka
2aeaad8c71
Merge branch 'master' into shep-dev-chat-update
2019-11-13 05:02:33 -07:00
Rykka
45abd9ae01
Testfix/reset filediff
2019-11-13 05:00:38 -07:00
Meghan-Rossi
a09456b541
Adds a way to set the tag of loadout collars as part of the loadout
2019-11-13 03:42:03 +00:00
Schnayy
cf0344d059
Merge pull request #6522 from Mechoid/BotanyAgain2
...
Botany Fix, again? [Why]
2019-11-12 16:18:35 -05:00
Novacat
d3e1710674
Merge pull request #6182 from TheFurryFeline/TFF-Let_The_Plushies_Live!-Virgo_Edition
...
Mouse Plushie Sprite Change
2019-11-12 12:27:37 -05:00
TheFurryFeline
aaa40000d0
Mouse Plushie Sprite Change
...
Title, changes a custom item's sprite to look more alive... Sorta.... Just doesn't make it look like it's a hecking dead mouse. Ported from https://github.com/CHOMPstation/CHOMPstation/pull/824
2019-11-12 10:34:24 -05:00
Meghan-Rossi
f8c214ea67
Fix box of service keys being called "box of command keys"
2019-11-12 08:55:43 +00:00
Shadow
48ba6c652d
Changes character's name for fluff item
2019-11-11 22:56:25 -06:00
lbnesquik
25705fc655
Ensure that EVERY mob give at least SOME nutrition when digested.
...
This is a little hacky but this means the majority of the system doesn't have to be touched and retested.
2019-11-11 16:40:31 +01:00
Novacat
6269866d8f
Merge pull request #6178 from VOREStation/upstream-merge-6521
...
[MIRROR] Stop protein's affect_ingest calling nutriment's affect_ingest twice
2019-11-10 22:25:11 -05:00
Novacat
dcd5900f83
Update Chemistry-Reagents-Food-Drinks.dm
2019-11-10 22:04:40 -05:00
Anewbe
c9abdaabe9
Stop protein's affect_ingest calling nutriment's affect_ingest twice
2019-11-10 21:49:51 -05:00
Atermonera
20ee2c0ed2
Merge pull request #6519 from Mechoid/BotanyBugs
...
Fix Fruit Runtime
2019-11-10 18:52:11 -05:00
Heroman
991ab37daf
Progress
2019-11-11 06:04:55 +10:00
Soft
7e1a5db6c8
New vending machines
2019-11-09 04:20:29 -05:00
Novacat
929ff8077c
Merge pull request #6171 from EllyBrown/master
...
Elly Brown (bacon12366) fluff item.
2019-11-08 16:35:08 -05:00
EllyBrown
96e1934a90
Add files via upload
2019-11-08 21:37:33 +02:00
Novacat
af52f4e7c3
Merge pull request #6094 from Novacat/nova-pathfinder
...
Rarer events, more event variety
2019-11-08 13:32:45 -05:00
Novacat
5e5e972e0b
Merge pull request #6165 from Meghan-Rossi/fluffstuff
...
Fluff items
2019-11-08 13:29:34 -05:00
Novacat
357f30cf88
Merge pull request #6162 from VOREStation/upstream-merge-6514
...
[MIRROR] Setup for New Library
2019-11-08 13:16:40 -05:00
EllyBrown
7d3ff451fb
Add files via upload
2019-11-08 19:36:36 +02:00
Unknown
a5c86a507d
More compatibility updates
2019-11-08 10:50:42 -05:00
Unknown
7931795ddd
Compatability, Re-enables old library
2019-11-08 10:47:32 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Novacat
80874ede4b
Merge pull request #6155 from Very-Soft/no-bepis
...
Changes the cola machine sprite to something more generic and flashy
2019-11-07 02:12:28 -05:00
Novacat
dbe5a63061
Merge pull request #6166 from VOREStation/upstream-merge-6503
...
[MIRROR] Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 20:04:55 -05:00
Novacat
078b965682
Update say.dm
2019-11-05 19:34:56 -05:00
Novacat
b8eac49b8d
Update pai.dm
2019-11-05 19:34:12 -05:00
