cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 03:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,929 Commits 8 Branches 26 Tags
03c82caa71fb6c828a99fd339a68c76e0855d7df
Commit Graph

23360 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Atermonera
0c3ef8137f Merge pull request #6512 from Verkister/patch-29 
Sanity check for orphaned ai_holder runtimes
 2019-11-05 19:25:58 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Meghan-Rossi
6bee95ef01 Fluff items 
Removes Tasald's coat and loyalty implanter as requested in #6147
Adds Tasald's Cartographer's Uniform as approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1627
adds medals:
Xander Bevin - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1579
Nick Sloan - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1575
Erik Ramadwood - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1624
Nolan Conaway - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1622

Resolves #6147
 2019-11-05 11:28:37 +00:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491) 
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
 2019-11-04 21:38:02 -05:00
Mechoid
551dd02a80 Setup for New Library 2019-11-04 21:25:18 -05:00
Heroman
f1e945b548 implements sprites 2019-11-05 08:25:58 +10:00
Schnayy
d4e38581cc Adds new FBP brand + sprite. (#6513) 2019-11-03 13:34:52 -05:00
Verkister
91c8018a59 Merge branch 'master' into littlefunfixes 2019-11-01 20:52:20 +02:00
Novacat
4e58ae7609 Merge pull request #6151 from VOREStation/upstream-merge-6507 
[MIRROR] [READY] Recolourable energy weapons.
 2019-11-01 13:33:02 -04:00
Novacat
412ce591ca Merge pull request #6153 from VOREStation/upstream-merge-6509 
[MIRROR] Fixes adding verbs to mobs in varedit.
 2019-11-01 13:02:49 -04:00
Atermonera
c9b595f564 Merge pull request #6509 from Verkister/patch-27 
Fixes adding verbs to mobs in varedit.
 2019-11-01 12:41:36 -04:00
Atermonera
3bfc63143e Merge pull request #6508 from Verkister/patch-26 
Fixes simplemobs wandering when grabbed.
 2019-11-01 12:39:20 -04:00
lolman360
ae859c49e9 [READY] Recolourable energy weapons. (#6507) 2019-11-01 12:38:06 -04:00
Verkister
5f432b24c0 or is it 2019-11-01 08:17:01 +02:00
Verkister
9079262d08 oop 2019-10-31 17:52:13 +02:00
Verkister
d181812987 Fixes high endurance bodies dying in grower pod 
The math that was supposed to protect low endurance bodies had been mistakenly calculating the clone damage reduction with a double-negative, causing the opposite effect. The cloneloss added on top of the maxhealth apparently was intended to get a reduction of 25hp, but because the number it was being reduced from was already negative, it was instead causing a high endurance body (125 maxhealth) receive a total of 125+75 cloneloss
 2019-10-31 17:14:53 +02:00