Commit Graph
38992 Commits
Author SHA1 Message Date
Muffindrake eb830751ee Fix refined MAT_LEAD 0 nutrition, gem_eater typos 2020-09-02 01:31:36 +02:00
VerkisterandGitHub bf5ea9e217 Merge pull request #8747 from VOREStation/Verkister-patch-1
Buffs/fixes darksight traits.
2020-09-01 20:56:19 +03:00
NovacatandGitHub 4b46195b95 Merge pull request #8951 from VOREStation/upstream-merge-7602
[MIRROR] Fix jetpack ion trail
2020-09-01 08:02:42 -04:00
NovacatandGitHub dba5a14b5f Merge pull request #8952 from Heroman3003/constructible-vorelaws
Constructible vorelaws
2020-09-01 08:02:26 -04:00
Heroman 732448d389 Fixes indent errors 2020-09-01 20:37:56 +10:00
Heroman3003andGitHub 33f85fc4d6 Makes the vorelaw boards makeable 2020-09-01 16:34:24 +10:00
Heroman3003andGitHub 045be423b3 .dm 2020-09-01 16:27:42 +10:00
Heroman3003andGitHub 00913ff339 Adds boards for AI vore laws 2020-09-01 16:26:39 +10:00
NovacatandGitHub c06ccac8a5 Merge pull request #8935 from Cyantime/jetpackfuel
Jetpack cleanup, don't use fuel when unneeded
2020-09-01 01:05:04 -04:00
AtermoneraandVirgoBot 3daa38aade Merge pull request #7602 from Cyantime/patch-2
Fix jetpack ion trail
2020-09-01 01:05:03 -04:00
NovacatandGitHub b6cc3bd705 Merge pull request #8950 from VOREStation/upstream-merge-7600
[MIRROR] Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one.
2020-09-01 00:52:53 -04:00
NovacatandGitHub 77f39209a1 Merge pull request #8947 from VOREStation/upstream-merge-7593
[MIRROR] Increases number of things that survive overmap ztransit
2020-09-01 00:52:36 -04:00
NovacatandGitHub 8bce0ae786 Merge pull request #8946 from VOREStation/upstream-merge-7591
[MIRROR] Stops meson/etc use with overmap consoles
2020-09-01 00:52:25 -04:00
NovacatandGitHub 070a3489fe Merge pull request #8940 from VOREStation/upstream-merge-7583
[MIRROR] FBP Internals Additions
2020-09-01 00:51:59 -04:00
NovacatandGitHub d5f18ddb2e Merge pull request #8933 from VOREStation/upstream-merge-7552
[MIRROR] Adds hailer gas (face) masks.
2020-08-31 23:57:14 -04:00
NovacatandGitHub fe29585641 Merge pull request #8944 from VOREStation/upstream-merge-7589
[MIRROR] Adds toe-less jackboots to xenowear
2020-08-31 23:56:31 -04:00
NovacatandGitHub 47acb763e0 Merge pull request #8941 from VOREStation/upstream-merge-7587
[MIRROR] Fixes Teshari dresses
2020-08-31 23:56:20 -04:00
AtermoneraandVirgoBot ca2ce6adea Merge pull request #7600 from lbnesquik/Kot-Scanner-ore
Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one.
2020-08-31 23:54:19 -04:00
NovacatandGitHub 68f64d3d84 Update ship.dm 2020-08-31 23:53:59 -04:00
AtermoneraandVirgoBot aa1575c27f Merge pull request #7593 from Cyantime/patch-3
Increases number of things that survive overmap ztransit
2020-08-31 23:41:07 -04:00
NovacatandGitHub f90777ead5 Merge pull request #8939 from VOREStation/upstream-merge-7573
[MIRROR] Distillery Upkeep, Chemistry Tweakening
2020-08-31 23:40:47 -04:00
CyantimeandVirgoBot 6d5c14c448 Stops meson/etc use with overmap consoles 2020-08-31 23:39:49 -04:00
Unknown c024404024 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7552 2020-08-31 23:39:16 -04:00
AtermoneraandVirgoBot 2a3a5483b0 Merge pull request #7589 from listerla/toelessjackboots
Adds toe-less jackboots to xenowear
2020-08-31 23:37:18 -04:00
AtermoneraandVirgoBot 500d859fd6 Merge pull request #7587 from listerla/teshclothesfix
Fixes Teshari dresses
2020-08-31 23:35:51 -04:00
AtermoneraandVirgoBot a5c829ea53 FBP Internals Additions 2020-08-31 23:25:13 -04:00
MechoidandVirgoBot 97831abf14 Distillery Upkeep, Chemistry Tweakening (#7573)
* Distillery For Chemistry

* Synthplasma, Synthblood but not horrifically strong.

* Rectify, I said, damnit!

* Distillery for Chem. Now with STRONG DMM.

* changeling
2020-08-31 22:37:18 -04:00
AtermoneraandVirgoBot 18060684ac Stop in the name of the law, open tag. 2020-08-31 22:36:05 -04:00
NovacatandGitHub 52a8917379 Merge pull request #8937 from Heroman3003/fullnotfat
Makes the fullness alert more accurate
2020-08-31 22:05:36 -04:00
Heroman3003andGitHub 41814c6a82 Fixes indents 2020-09-01 11:30:14 +10:00
Heroman3003andGitHub fee5eb895a Makes the fullness alert more accurate 2020-09-01 11:27:53 +10:00
Cyantime 99009e6266 Jetpack cleanup, don't use fuel when unneeded 2020-08-31 21:13:04 -04:00
AtermoneraandVirgoBot fb4d02df3d Merge pull request #7561 from Mechoid/ProjectileUpkeep
Projectile Upkeep
2020-08-31 18:23:39 -04:00
AtermoneraandVirgoBot 87221b5e66 Adds hailer gas (face) masks. 2020-08-31 18:10:57 -04:00
NovacatandGitHub 86ff95f90d Merge pull request #8923 from lbnesquik/Kot-Carg-Inducer
Add an Inducer crate to cargo. Relatively expensive at 90.
2020-08-31 16:51:06 -04:00
NovacatandGitHub 1fcb6bf337 Merge pull request #8896 from Rykka-Stormheart/shep-dev-airlock-sound-prefs
Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
2020-08-31 15:29:13 -04:00
ShadowLarkens cd5e2976c5 Merge remote-tracking branch 'upstream/master' into rconsolefix 2020-08-31 11:19:53 -07:00
NovacatandGitHub 4910e26bf8 Merge pull request #8919 from lbnesquik/Flyinginnggn
Make flying not cost your entire fat reserves
2020-08-31 00:39:26 -04:00
ShadowLarkens dedb854338 Fixes emergent exploit of iteration order in crew monitors 2020-08-30 19:05:05 -07:00
NovacatandGitHub d10cb4aed1 Merge pull request #8913 from Heroman3003/datefix
Changes the dates of bank account creation to be more reasonable
2020-08-30 17:14:02 -04:00
NovacatandGitHub 197d6d347f Merge pull request #8921 from lbnesquik/Kot-nif
Improve quick nif
2020-08-30 17:13:06 -04:00
lbnesquik af8b409555 Add an Inducer crate to cargo. Relatively expensive at 90. 2020-08-30 21:40:09 +02:00
NovacatandGitHub 1abe8718e5 Merge pull request #8915 from VOREStation/upstream-merge-7579
[MIRROR] Makes borg cell replacement take priority over petting
2020-08-30 15:29:47 -04:00
NovacatandGitHub 5c4dedece2 Merge pull request #8914 from VOREStation/upstream-merge-7577
[MIRROR] Vendor enhancement fixes
2020-08-30 15:29:33 -04:00
NovacatandGitHub ac15f36943 Update robot.dm 2020-08-30 14:59:10 -04:00
lbnesquik 196580141b Improve quick nif
You can now choose which nif you want to give them
2020-08-30 20:53:23 +02:00
lbnesquik 305320d173 Make flying not cost your entire fat reserves 2020-08-30 20:33:39 +02:00
CyantimeandVirgoBot 46ebeba6b3 Fix doppler array iconstates (#7581) 2020-08-30 02:52:33 -04:00
Heroman3003andVirgoBot 8174488f34 Makes borg cell replacement take priority over petting 2020-08-30 02:50:16 -04:00
CerebulonandVirgoBot 7c57c7c0bd Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-30 02:49:00 -04:00