Commit Graph

22296 Commits

Author SHA1 Message Date
Unknown
f7406e3d12 Post-release Bugfixing
- Teshari can now wear hardsuits again
- Virgo 3B Weather now applies to the Plains Expedition Area
2019-04-06 02:41:12 -04:00
Unknown
34d695c301 Disables rosettes temporarily 2019-04-05 20:48:12 -04:00
Unknown
8b7ae56e83 Last Minute Fixes
- Fixes Virgo species being able to wear hardsuits.
- Adds new rosette markings and sprites
- Adds new status display icon for code yellow
2019-04-05 20:08:06 -04:00
Novacat
7047fd7195 Merge pull request #4911 from Novacat/nova-survival
Lynx Fixes Runtimes Pt 2
2019-04-05 17:19:28 -04:00
Novacat
d7c7c073a5 Merge pull request #4868 from Novacat/nova-weapons
Adds liquidprotein rations
2019-04-05 17:17:53 -04:00
Spades
688e5184cb Merge pull request #4910 from Heroman3003/reverting-it-all-not-really
Un-kevinzes nanoui and chemistry subsystems back into processes for greater good
2019-04-05 16:33:29 -04:00
Neerti
a30e229316 Fixes ghosts being counted as contributors for cataloguers. (#6032) 2019-04-05 15:08:10 -04:00
Unknown
cfe9682a34 Lynx Fixes Runtimes Pt 2 2019-04-05 00:11:04 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Novacat
07bc5814b2 Merge pull request #4903 from Heroman3003/research-re-do
Moves Anomaly Lab to research outpost, replaces with Chemistry set
2019-04-04 20:52:01 -04:00
Screemonster
629318de74 Refactors regeneration of ravenous races 2019-04-04 06:46:25 +01:00
Heroman3003
80c759ca1c Finishing touches 2019-04-04 10:35:39 +10:00
Spades
3a06becdf3 Merge pull request #4879 from Novacat/nova-ert
Adds Mlems to Default Species
2019-04-03 20:29:22 -04:00
Unknown
6d3be92c8d Removes frost oil from pizza
Fixes #4846
2019-04-03 15:11:06 -04:00
Unknown
a6732daecc Fixes egg implants 2019-04-03 15:11:06 -04:00
Unknown
a475400b92 Adds Tentaclehead/mouth sprites
...This was easy to fix? I wonder why the author never fixed it...
2019-04-03 15:11:06 -04:00
Unknown
a45ddb17f6 Adds tie hair verb to Xenochimera 2019-04-03 15:11:06 -04:00
Layla Crosse/Occula Drenn
73cbcfb1e5 Adds Dragonfly wings and a Chameleon tail. 2019-04-02 23:38:03 -04:00
Novacat
9c71233738 Merge pull request #4899 from Heroman3003/fixing-the-swapparoo
Fixes passive and mostly passive mobs blocking the way all the time
2019-04-02 12:19:02 -04:00
Neerti
868d0dd190 Merge pull request #6029 from InterroLouis/master
Fixes Voidsuit Typo
2019-04-02 07:57:28 -04:00
Heroman
9b56460487 Fixes a typo 2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9 Fixes passive and mostly passive mobs blocking the way all the time 2019-04-02 09:27:24 +10:00
Novacat
392ae0e127 Merge pull request #4898 from Heroman3003/flavorful-typo-fix
Fixes a misnaming on Contamination Flavor selection menu
2019-03-31 23:08:45 -04:00
Heroman3003
a6cfb63856 slightly adjusts a wording on selection of contamination flavor 2019-04-01 12:39:08 +10:00
Novacat
c1b091978d Merge pull request #4893 from Heroman3003/stepping-fixes
Adds proper exiting to step-code for non-human mobs on non-help intent
2019-03-31 19:28:12 -04:00
mistyLuminescence
5dc4686ad9 Unidentified Auto Tweak 2: Electric Boogaloo (#5990)
* Remakes #5983 by request.
2019-03-31 19:19:59 -04:00
Heroman
704e489bdb Adds proper exiting to step-code for non-human mobs on non-help intent 2019-04-01 07:01:38 +10:00
Unknown
71ac951395 Merge remote-tracking branch 'VOREStation/master' into nova-weapons 2019-03-31 14:35:10 -04:00
Unknown
465b77bdaa Fixes an oversight 2019-03-31 13:14:24 -04:00
Unknown
692d8265ba Something reverted one of my changes 2019-03-31 12:45:36 -04:00
Unknown
c229c6b8c9 Removed Sergal lick wounds 2019-03-31 12:43:07 -04:00
Novacat
45f2d681c3 Merge pull request #4698 from Wickedtemp/patch-1
Rebalances Healbelly
2019-03-31 12:35:04 -04:00
Novacat
eee1976200 Merge pull request #4646 from Novacat/nova-heterochromia
Reduces costs of common NIFSofts
2019-03-31 12:34:54 -04:00
Wickedtemp
181bde4835 Nutrition at 2
Puts nutrition at 2 with Ace's approval
2019-03-31 10:19:03 -05:00
Novacat
da63d0bacf Merge branch 'master' into nova-weapons 2019-03-30 23:00:48 -04:00
Novacat
9f1e3c4aa6 Update drinks.dm 2019-03-30 20:16:38 -04:00
Unknown
9fa575698b Conflict Resolution 2019-03-30 20:13:49 -04:00
Neerti
5967a92f02 Lynx Fixes Runtimes 2019-03-30 18:51:00 -04:00
Novacat
2c07c85138 Adds New Alert Levels (#6019)
* Adds New Alert Levels
2019-03-30 18:29:12 -04:00
Unknown
399d2c79d1 Next time, take the easy route 2019-03-30 17:33:54 -04:00
Unknown
aadf578cdb Makes this thing compile 2019-03-30 17:26:32 -04:00
Unknown
4297e186ca Conflict Resolution 2019-03-30 16:47:18 -04:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Unknown
d24cef8c0a Hardsyncs Icons
...It seems like the mirrorbot is not porting icon changes over properly...
2019-03-30 15:40:06 -04:00
Novacat
63c6e7f308 Ports Stasis Cages from Baystation (#6017)
* Ports Stasis Cages from Baystation
2019-03-30 14:55:52 -04:00
Novacat
d0672ec8a1 Merge branch 'master' into nova-ert 2019-03-30 13:01:14 -04:00
Spades
a2ca1346c8 Merge pull request #4880 from Novacat/nova-pathfinder
Miscellaneous Fixes.
2019-03-30 10:06:03 -04:00
Spades
3882cb8176 Merge pull request #4867 from Novacat/nova-survival
Species Tweaks
2019-03-30 09:58:29 -04:00
Novacat
34d80b4df8 Merge pull request #4885 from VOREStation/upstream-merge-5999
[MIRROR] Winter coat suit storage expansion
2019-03-30 04:37:12 -04:00
Novacat
8a0b50e391 Merge pull request #4882 from VOREStation/upstream-merge-6002
[MIRROR] Belt-Worn RIGs
2019-03-30 04:25:24 -04:00