Commit Graph

1001 Commits

Author SHA1 Message Date
JaySparrow
a661c1d42b Forgot the chaos level
aaaaa
2020-10-12 21:55:38 -05:00
JaySparrow
ebf705f33e Dynamic Tweaks
Just work damn you
2020-10-12 21:32:32 -05:00
JaySparrow
3e6df3e4ff Merge branch 'master' into Dynamic2 2020-10-12 18:40:57 -05:00
QuoteFox
92d1fbaf1f Merge pull request #570 from ArchieBeepBoop/enginemapfixes
Some map fixes + changes
2020-10-12 15:35:06 +01:00
QuoteFox
4b28162d04 Merge pull request #582 from ArchieBeepBoop/newthings
More Atmos - Relief Valves & Passive Vents
2020-10-12 15:34:40 +01:00
Ghom
5a0991e7e1 Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
2020-10-11 19:26:08 -03:00
Ghom
7c0c874db7 Merge pull request #10722 from Putnam3145/fix-relief
Relief valve fixes
2020-10-11 19:25:09 -03:00
Ghom
473d2944d3 Merge pull request #10568 from r4d6/Passive-Vents
Add passive vents
2020-10-11 19:07:29 -03:00
Ghom
3d7ab5c63d Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
2020-10-11 19:06:36 -03:00
JaySparrow
132d3bded9 A few rebalances and fixes
I'm mostly backing up changes because I'm about to do a giant overhaul and refactor on a hunch.

Why do I do this to myself?
2020-10-11 09:13:25 -05:00
Cydia
121919db3a Merge remote-tracking branch 'upstream/master' 2020-10-11 01:58:21 -05:00
Cydia
297f2f804d new lipstick wip 2020-10-11 00:52:41 -05:00
Dahlular
78f702f74e Merge pull request #578 from ToonClyde/Mmmm-yes-Carbon-Nanotubes
tasty carbon nanotube noodles
2020-10-10 23:28:33 -06:00
Dahlular
e2e313b3ed Merge pull request #571 from ArchieBeepBoop/shuttleloanfixes
Shuttle Loan Fixes
2020-10-10 23:19:46 -06:00
Dip
06f95d9668 who the fuck thought this was a good idea 2020-10-10 23:13:47 -03:00
ToonClyde
19de1094e0 tasty carbon nanotube noodles 2020-10-10 18:07:51 -07:00
Dip
2381dd7504 belt + typo fix 2020-10-10 17:42:10 -03:00
QuoteFox
1316ccdf1e Merge pull request #576 from KathrinBailey/Tile-Floofing
Tile Floofing
2020-10-10 07:49:29 +01:00
QuoteFox
b97338a6b4 Merge pull request #575 from ArchieBeepBoop/aitarget2
Functional Ai Target sanity check
2020-10-10 07:48:38 +01:00
QuoteFox
4f9dcf8a83 Merge pull request #573 from ArchieBeepBoop/teg_crate
TEG Cargo Crate
2020-10-10 07:48:20 +01:00
KathrinBailey
fdafeb94d8 tile floofing 2020-10-10 06:36:58 +01:00
Dip
c69842819c ai target 2020-10-09 17:20:47 -03:00
ToonClyde
4cb2430518 Deer Rework 2020-10-09 02:16:08 -07:00
Dip
73aed90893 HMMMM 2020-10-09 03:19:08 -03:00
Dip
89e8e6cb12 Shuttle Loan Fixes 2020-10-08 17:52:24 -03:00
Dip
c0e6f28077 found the issue 2020-10-08 16:37:43 -03:00
QuoteFox
2b11cac977 Merge pull request #566 from ArchieBeepBoop/actualpool
Pool Mini Fixes
2020-10-08 04:56:08 +01:00
QuoteFox
c2166b771a Merge pull request #565 from ArchieBeepBoop/anotherpatch
I'm fucking retarded. (Another function patch)
2020-10-08 04:55:49 +01:00
Dip
68a9d0938f pool mini fixes 2020-10-08 00:38:42 -03:00
Dip
b513d3ba77 i am dumb 2020-10-07 23:56:44 -03:00
Dahlular
f614124405 Merge pull request #557 from ArchieBeepBoop/rtg
Fully Upgraded Advanced RTG Machine Preset
2020-10-07 19:40:51 -06:00
Dahlular
2d3ed9da8a Merge pull request #563 from ArchieBeepBoop/actualpool
POOL
2020-10-07 19:37:44 -06:00
Dahlular
f2676a398d Merge pull request #562 from ArchieBeepBoop/anotherpatch
Exiles Patch + New Functions
2020-10-07 19:35:43 -06:00
Dahlular
12bf86ed76 Merge pull request #561 from ArchieBeepBoop/patch
Eldritch Affairs Patch
2020-10-07 19:34:19 -06:00
Dip
4bae4c2dbd TYPO 2020-10-07 20:07:23 -03:00
Ghom
779cc787a3 Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL
2020-10-07 18:40:10 -03:00
Dip
c6e3bf8f60 Exile Patch + New Time Function 2020-10-07 17:38:25 -03:00
Dip
aea562bbe9 Eldritch Affairs Patch 2020-10-07 05:50:53 -03:00
Dahlular
107d47a1e8 Merge pull request #560 from ArchieBeepBoop/examinerefactor
Examine Code Refactor
2020-10-06 21:02:05 -06:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
Dahlular
fb81e033fd Merge pull request #559 from ArchieBeepBoop/cats
Stop Catsplosion
2020-10-06 20:36:13 -06:00
Dip
460ccc2a7f Stop Catsplosion 2020-10-06 16:28:33 -03:00
Dip
d5602e1948 Exiles 2020-10-06 15:46:02 -03:00
Dip
78a8cb6e77 indentation aaaaa 2020-10-06 05:12:38 -03:00
Dip
4742579822 fully upgraded RTG preset add 2020-10-06 05:07:38 -03:00
Dahlular
c433514622 Merge pull request #555 from ArchieBeepBoop/mobholderefactor
Mob Holder fixes + Micro Grab Fix
2020-10-05 21:50:56 -06:00
Dahlular
62e59d9f95 Merge pull request #551 from ArchieBeepBoop/carpchanges
Space Carp Updates
2020-10-05 21:45:55 -06:00
Dip
18a97324d0 runtime 2020-10-05 11:48:11 -03:00
Dip
52eaf9ed92 BOY 2020-10-05 11:07:52 -03:00
Dip
e7fcbd07cb monkeys holding monkeys 2020-10-05 09:57:07 -03:00