Commit Graph

914 Commits

Author SHA1 Message Date
Fox McCloud
5810d28571 Refactors Simple Mob Creation: Adjusts Which Mobs are Available (#12325) 2019-09-17 16:06:43 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Fox McCloud
1b1bd00c06 Updates Status Effects: Fixes Blood Drunk Status Effect, Buffs Regenerative Core (#12320) 2019-09-17 07:56:50 -04:00
Fox McCloud
d015c0c2b2 even-still-though-time-itself-be-shattered 2019-09-16 01:35:25 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
variableundefined
f6fe4a1520 Merge pull request #12291 from Fox-McCloud/hierophant-update
Hierophant Update
2019-09-14 22:31:38 -04:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud
bdcdfc04f0 Hierophant Update 2019-09-13 19:35:41 -04:00
AzuleUtama
30547d2bae Fixes 'Name' design in R&D console 2019-09-13 20:12:39 +01:00
Dave
454ea46587 Let's be honest, the miners are going to die either way 2019-09-13 01:08:55 -04:00
variableundefined
e571d30f74 Merge pull request #12266 from Fox-McCloud/hydro-update
Hydroponics Update: Growable Ash Flora
2019-09-12 22:40:01 -04:00
variableundefined
db211cfc54 Deconflict 2019-09-11 23:00:13 -04:00
Fox McCloud
5e4521bc82 Hydroponics Update: Growable Ash Flora 2019-09-11 05:52:57 -04:00
variableundefined
18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -04:00
Fox McCloud
5943ad2902 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-10 07:09:30 -04:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
variableundefined
69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
variableundefined
1270c56ef7 Merge pull request #12236 from Fox-McCloud/vending-machien-refactor-fix
Refactors Vending Machines and Fixes Restocking Exploit
2019-09-09 15:54:08 -04:00
Fox McCloud
d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
Fox McCloud
fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Fox McCloud
4162226cb1 Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split 2019-09-08 02:07:06 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Fox McCloud
0119d350b4 Lavaland Update Part 2: Mobs 2019-09-07 02:26:31 -04:00
Fox McCloud
d79f983732 Lavaland Update: Mechs and Scanners 2019-09-06 18:45:30 -04:00
Fox McCloud
133795d75c more updates 2019-08-31 00:17:37 -04:00
Fox McCloud
86dfb4c823 Simple Mob Update 2019-08-30 20:32:08 -04:00
Fox McCloud
9c8905f9ca Refactors Lazarus Capsules 2019-08-29 23:34:19 -04:00
variableundefined
e636c8e80a Merge pull request #12142 from Fox-McCloud/blood-drunk
Fixes Blooddrunk Buff
2019-08-29 22:30:24 -04:00
Fox McCloud
2bdb6f448f Fixes Blooddrunk Buff 2019-08-29 22:12:02 -04:00
variableundefined
549e6ee72e Merge pull request #12105 from Fox-McCloud/ports-tendril-loot
Adds Book of Babel and Jacob's Ladder
2019-08-29 20:43:18 -04:00
Fox McCloud
a70084a63f makes it so you can actually get the items 2019-08-27 18:49:25 -04:00
variableundefined
e6a190ae72 Merge pull request #12093 from Fox-McCloud/sandbags-and-barricades
Adds Sandbags Reworks Security Barricades
2019-08-27 18:01:20 -04:00
Fox McCloud
a4f187ac38 Adds Book of Babel and Jacob's Ladder 2019-08-27 16:04:54 -04:00
Fox McCloud
1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
Fox McCloud
899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00
Fox McCloud
9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
Fox McCloud
855c8b3a98 derp 2019-08-25 15:18:07 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Fox McCloud
9b9d5461ef Re-organizes Lavaland Files; Makes some Balacne tweaks 2019-08-24 03:58:05 -04:00
Fox McCloud
89f273414e Merge pull request #12057 from TDSSS/mining-hardsuit-fix
Mining hardsuit fix
2019-08-22 23:30:03 -04:00
TDSSS
79c6f1f078 I'm a dummy and can't copy-paste right 2019-08-23 03:32:04 +02:00
TDSSS
c4b944ad13 spacing 2019-08-23 03:28:36 +02:00
TDSSS
3540ab2bfc Makes mining hardsuits come with helmets again 2019-08-23 03:26:43 +02:00
variableundefined
07e9cf10a3 Merge pull request #12024 from Fox-McCloud/crusher-trophies
Ports Crusher Trophies
2019-08-22 18:55:54 -04:00
Fox McCloud
01a68b8895 Ports TG's Fultons 2019-08-18 18:22:07 -04:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update
Major Lavaland Update
2019-08-16 22:22:49 -06:00
Fox McCloud
e2f7f6f055 science radio 2019-08-16 23:58:27 -04:00
variableundefined
98b821c120 Merge pull request #11637 from datlo/lavalandgolemsintospace
Move free golems to lavaland, let them move shuttle still
2019-08-12 17:42:40 +08:00