Commit Graph
1720 Commits
Author SHA1 Message Date
LinandDip e0d9a3b354 Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
2020-10-12 23:47:58 -03:00
Dip 739b072a1e Done 2020-10-12 21:10:55 -03:00
Dip ee2bc9ac17 a 2020-10-12 21:09:31 -03:00
Dip e08575067a revert metastation 2020-10-12 21:09:25 -03:00
Dip fe9c29ac3f revert pubby 2020-10-12 21:07:44 -03:00
kevinz000andDip 533a39d199 Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
2020-10-12 21:01:54 -03:00
QuoteFoxandGitHub 92d1fbaf1f Merge pull request #570 from ArchieBeepBoop/enginemapfixes
Some map fixes + changes
2020-10-12 15:35:06 +01:00
QuoteFoxandGitHub 4b28162d04 Merge pull request #582 from ArchieBeepBoop/newthings
More Atmos - Relief Valves & Passive Vents
2020-10-12 15:34:40 +01:00
QuoteFoxandGitHub 8802cef599 Merge pull request #581 from KathrinBailey/Tile-Floofing
Fixes roundstart errors: build_pipeline(), incendiary shells missing sprites, tiles with no airmix in the bar & down to 0 atmos differences at roundstart
2020-10-12 15:34:22 +01:00
GhomandDip 5a0991e7e1 Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
2020-10-11 19:26:08 -03:00
GhomandDip 7c0c874db7 Merge pull request #10722 from Putnam3145/fix-relief
Relief valve fixes
2020-10-11 19:25:09 -03:00
GhomandDip 473d2944d3 Merge pull request #10568 from r4d6/Passive-Vents
Add passive vents
2020-10-11 19:07:29 -03:00
GhomandDip 3d7ab5c63d Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
2020-10-11 19:06:36 -03:00
KathrinBailey 7d1cab2cd8 more atmos differences 2020-10-11 18:17:13 +01:00
KathrinBailey 24d8e5bd2e Roundstart atmos differences
Saves probably 0.2s every round
2020-10-11 17:41:08 +01:00
DahlularandGitHub ac1e0c78d3 Merge pull request #580 from CydiaButt13/master
Adds more lipstick + lipstick to the loadout
2020-10-11 03:07:57 -06:00
KathrinBailey 7311ca0f54 Fixes build_pipeline() errors, some uneccessary roundstart atmos differences and missing icon_state for incendiary 12G rounds. 2020-10-11 08:36:56 +01:00
Cydia 121919db3a Merge remote-tracking branch 'upstream/master' 2020-10-11 01:58:21 -05:00
Cydia ac36a86763 some fixes 2020-10-11 01:10:43 -05:00
Cydia f84f10681e Lipstick to the loadout!! 2020-10-11 01:06:18 -05:00
Cydia 297f2f804d new lipstick wip 2020-10-11 00:52:41 -05:00
DahlularandGitHub 78f702f74e Merge pull request #578 from ToonClyde/Mmmm-yes-Carbon-Nanotubes
tasty carbon nanotube noodles
2020-10-10 23:28:33 -06:00
DahlularandGitHub e2e313b3ed Merge pull request #571 from ArchieBeepBoop/shuttleloanfixes
Shuttle Loan Fixes
2020-10-10 23:19:46 -06:00
DahlularandGitHub 0756155230 Merge pull request #564 from Kabramen/sounding
Sounding Rod
2020-10-10 23:16:24 -06:00
DahlularandGitHub d09f234b88 Merge pull request #579 from ArchieBeepBoop/brainfix
Fixes Pouring Mannitol on Brains that had the Mannitol tooltip
2020-10-10 23:15:42 -06:00
DahlularandGitHub 0e391a1824 Merge pull request #572 from ToonClyde/hotel-management
The Suite Life of Winfre & Marie
2020-10-10 23:11:43 -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
Dip 420f42a4a6 more snowdin fixes 2020-10-10 05:07:13 -03:00
QuoteFoxandGitHub 1316ccdf1e Merge pull request #576 from KathrinBailey/Tile-Floofing
Tile Floofing
2020-10-10 07:49:29 +01:00
QuoteFoxandGitHub b97338a6b4 Merge pull request #575 from ArchieBeepBoop/aitarget2
Functional Ai Target sanity check
2020-10-10 07:48:38 +01:00
QuoteFoxandGitHub 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 244c8bf534 oldst 2020-10-10 02:05:18 -03:00
Dip c69842819c ai target 2020-10-09 17:20:47 -03:00
Dip 7f6d0af697 more fixes 2020-10-09 15:14:34 -03:00
QuoteFoxandGitHub 30944c07e8 Merge pull request #574 from ToonClyde/deer-antlers
Deer Rework
2020-10-09 10:51:57 +01:00
ToonClyde 9e14f4cce2 Prndls Suit 2020-10-09 02:25:03 -07:00
ToonClyde 4cb2430518 Deer Rework 2020-10-09 02:16:08 -07:00
Dip 4cc6f25612 add cable coil and welder 2020-10-09 05:59:38 -03:00
Dip 73aed90893 HMMMM 2020-10-09 03:19:08 -03:00
Dip df19be334e more fixes 2020-10-08 23:25:33 -03:00
ToonClyde ba4c38cbc4 The Suite Life of Winfre & Marie 2020-10-08 14:58:40 -07:00
DahlularandGitHub 88f016d3dd Merge pull request #569 from ArchieBeepBoop/newmapfixes
Pickaxe for the Seed Vault
2020-10-08 15:19:52 -06:00
Dip 89e8e6cb12 Shuttle Loan Fixes 2020-10-08 17:52:24 -03:00
Dip 67c03f52a8 monke 2020-10-08 16:49:31 -03:00
Dip c0e6f28077 found the issue 2020-10-08 16:37:43 -03:00
Dip f7eadc3705 micro engine changes 2020-10-08 16:31:09 -03:00
Dip 80ff5f8ae1 seed vault changes 2020-10-08 15:29:39 -03:00