Commit Graph
1742 Commits
Author SHA1 Message Date
Archie e20b215597 code fuck up 2020-10-14 17:25:53 -03:00
GhomandArchie 591c1675b4 Merge pull request #10552 from Tupinambis/NotUglyFireAlarms
Pseudo Reverts Fire Alarms Back to Original Look: AKA Not Fuckugly
2020-10-14 04:11:46 -03:00
Archie 1136f0f31a prevents off-z appendicitis 2020-10-14 00:41:15 -03:00
Dip 29e1f9ba2f source 2020-10-13 18:34:25 -03:00
Dip ee668a8824 Lavaland Syndicate outdoor area change 2020-10-13 17:00:46 -03:00
Dip 1becf6f486 turrets no longer target megafauna. 2020-10-13 16:46:36 -03:00
Dip 8deb2eb4a7 Fixes dance proc! 2020-10-13 15:47:36 -03:00
Dip 417a0d9d4a Jukeboxes Finally Work 2020-10-13 14:55:34 -03:00
Dip 0b29c76fe5 alt click 2020-10-13 12:54:14 -03:00
Dip f0bf81cb1f Runtimes and balance 2020-10-13 06:10:12 -03:00
DahlularandGitHub 688617d631 Merge pull request #589 from ArchieBeepBoop/interfacefix2
No ID Insertion, Fire Alarms Fix, ORM Fix, Sleeper Reagent Upgrade, Volume Based Filters, 5x5 SM Fix (THE FIXENING™)
2020-10-13 00:21:59 -06:00
DahlularandGitHub cb4d7f6cd9 Merge pull request #588 from Jay-Sparrow/Dynamic2
Dynamic fixes
2020-10-13 00:18:04 -06:00
DahlularandGitHub fd6c0507b9 Merge pull request #585 from Jay-Sparrow/Bug-fixin
Changeling Fix
2020-10-13 00:14:22 -06:00
Dip 899873a474 permissions 2020-10-13 02:45:13 -03:00
Dip 6dcaf6334f 5x5 engine fix and optimization 2020-10-13 02:37:19 -03:00
LinandDip 60b9557f42 Merge pull request #10017 from Putnam3145/volume-filter
Makes filters volume-based
2020-10-13 02:11:31 -03:00
kevinz000andDip 8408c6669f Merge pull request #9882 from FestiveBall/Fersi
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2020-10-13 01:26:13 -03:00
JaySparrow a661c1d42b Forgot the chaos level
aaaaa
2020-10-12 21:55:38 -05:00
LinandDip e0d9a3b354 Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
2020-10-12 23:47:58 -03:00
JaySparrow ebf705f33e Dynamic Tweaks
Just work damn you
2020-10-12 21:32:32 -05: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
JaySparrow 3e6df3e4ff Merge branch 'master' into Dynamic2 2020-10-12 18:40:57 -05:00
JaySparrow e536168d4f Changeling Fix
Size and clothesplosion
2020-10-12 18:04:56 -05: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
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
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