Commit Graph

19544 Commits

Author SHA1 Message Date
Casey
5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
Nadyr
d12a0f1b42 Merge pull request #3492 from CHOMPStation2/upstream-merge-11752
[MIRROR] Renames Engineer, new alt-titles for Stellar Delight
2021-12-12 04:13:36 -05:00
Nadyr
bf5f98c728 Merge pull request #3427 from CHOMPStation2/upstream-merge-11815
[MIRROR] Adds catslug to maintpred options
2021-12-12 04:13:27 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Nadyr
2cef388d77 Merge pull request #3424 from CHOMPStation2/upstream-merge-11812
[MIRROR] Fixes invisible Heat Exchange Pipes
2021-12-12 03:38:28 -05:00
Nadyr
bbba20e9a3 Merge branch 'master' into upstream-merge-11802 2021-12-12 03:16:19 -05:00
Nadyr
d3c1d20387 Merge pull request #3413 from CHOMPStation2/upstream-merge-11797
[MIRROR] Makes fuzzycuffs easier to get out of
2021-12-12 02:34:31 -05:00
Nadyr
30b8d64c17 Merge pull request #3408 from CHOMPStation2/upstream-merge-11792
[MIRROR] fixes body scanner not being synced with display/station time
2021-12-12 02:27:20 -05:00
Nadyr
97748f9f81 Merge pull request #3395 from CHOMPStation2/upstream-merge-11777
[MIRROR] i hate the engraving antichrist
2021-12-12 02:19:10 -05:00
Nadyr
62921c7b1a Merge pull request #3401 from CHOMPStation2/upstream-merge-11779
[MIRROR] Fixes infinite glass from low walls
2021-12-12 02:00:08 -05:00
Nadyr
a91a503dc3 powder that makes you say yes 2021-12-12 01:34:46 -05:00
Nadyr
3c32302c67 powder that makes you say yes 2021-12-12 01:34:01 -05:00
Nadyr
e2171f3b29 powder that makes you say yes 2021-12-12 01:33:08 -05:00
Nadyr
eb7f7f278e powder that makes you say yes 2021-12-12 01:31:24 -05:00
Nadyr
1bb3f74e41 Merge pull request #3339 from CHOMPStation2/upstream-merge-11768
[MIRROR] Fixes a broken poster
2021-12-11 18:29:48 -05:00
Razgriz
5570727269 powder that makes you say yes
I salute you, Yawn Wider, for fixing something years before Virgo ever did
2021-12-10 00:57:11 -07:00
Razgriz
af8834894b powder that makes you say yes 2021-12-10 00:55:04 -07:00
CHOMPStation2
b335832992 Merge pull request #3471 from CHOMPStation2/upstream-merge-11877
[MIRROR] Adds leather gloves to (xeno)botanist lockers
2021-12-09 23:42:06 -07:00
CHOMPStation2
b814b5a39f Merge pull request #3472 from CHOMPStation2/upstream-merge-11876
[MIRROR] Fixes translocator beacon gulping grammar
2021-12-09 23:41:24 -07:00
Casey
f58a3c742b Merge pull request #11881 from Heroman3003/grenadefix2
Fixes infinite detonators being attachable to grenades
2021-12-10 06:14:38 +00:00
Casey
0ab5dafa99 Merge pull request #11876 from Heroman3003/thebelly
Fixes translocator beacon gulping grammar
2021-12-10 06:12:19 +00:00
Casey
3d3fc07d0e Merge pull request #11877 from Heroman3003/glovening
Adds leather gloves to (xeno)botanist lockers
2021-12-10 06:12:10 +00:00
Casey
afcf943138 Adds catslug to maintpred options 2021-12-10 01:08:04 +00:00
Casey
1dff5ee873 Fixes invisible Heat Exchange Pipes 2021-12-10 00:55:14 +00:00
Casey
4f7e006971 fixes floor attackbys theoretically 2021-12-09 23:27:01 +00:00
Casey
cc72571da2 Merge pull request #11797 from R3dtail/patch-4
Makes fuzzycuffs easier to get out of
2021-12-09 23:07:51 +00:00
Aronai Sieyes
11dcf19c64 Merge pull request #11792 from PastelPrinceDan/timefixmaybe
fixes body scanner not being synced with display/station time
2021-12-09 22:28:57 +00:00
CHOMPStation2
8324777d6e Powder that makes you say yes 2021-12-09 14:16:10 -07:00
Casey
0d5546e11d Merge pull request #11768 from Heroman3003/posterfix2
Fixes a broken poster
2021-12-08 23:43:29 +00:00
Nadyr
680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928
[MIRROR] Offmap Tweaks
2021-12-05 14:04:20 -05:00
Nadyr
46c47164ce powder that makes you say yes 2021-12-05 13:47:04 -05:00
Nadyr
fb378c4668 Merge pull request #3205 from Verkister/patch-65
Fixes dirt vulnerability
2021-12-05 13:41:02 -05:00
Nadyr
db3ef9440e Merge pull request #3217 from CHOMPStation2/upstream-merge-11921
[MIRROR] Snakes are Sweet
2021-12-05 13:28:39 -05:00
Nadyr
4efe4d49ef powder that makes you say yes 2021-12-05 12:53:32 -05:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
1d43637079 Merge pull request #3236 from CHOMPStation2/upstream-merge-11906
[MIRROR] Fixes another active edge trigger potential
2021-12-05 12:15:52 -05:00
Nadyr
d1a3c9057b Merge pull request #3237 from CHOMPStation2/upstream-merge-11905
[MIRROR] Makes stomach organs printable in bioprinter and prosfab
2021-12-05 12:07:07 -05:00
Nadyr
ef0e4ab070 Merge pull request #3238 from CHOMPStation2/upstream-merge-11904
[MIRROR] Fixes Claw Machine arcade
2021-12-05 12:02:56 -05:00
Nadyr
f9a407ba4b powder that makes you say yes 2021-12-05 12:00:39 -05:00
Nadyr
d40865183a powder that makes you say yes 2021-12-05 11:53:43 -05:00
Nadyr
6960aefdc1 powder that makes you say yes 2021-12-05 11:44:40 -05:00
Nadyr
72cdc6e878 Merge pull request #3244 from CHOMPStation2/upstream-merge-11894
[MIRROR] Fixes some janky frame issues
2021-12-05 11:04:47 -05:00
Nadyr
cc9fa9282c powder that makes you say yes 2021-12-05 10:53:54 -05:00
Nadyr
46e29ec6b6 powder that makes you say yes 2021-12-05 10:52:16 -05:00
Nadyr
c393493c45 powder that makes you say yes 2021-12-05 10:50:54 -05:00
Nadyr
a8490c5623 powder that makes you say yes 2021-12-05 09:27:14 -05:00
Casey
a1fabbfaa1 Snakes are Sweet 2021-12-03 07:15:09 +00:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Verkister
0ff148ef5f Fixes dirt vulnerability
Fixes dirt vulnerability trait being completely bonkers broken and causing slips on every single step regardless of whether the floors were even clean or not and also makes it not affect walk intent.
2021-11-27 01:11:46 +02:00
BlackMajor
d0c7ac859c Merge branch 'master' into vorespawn-pred 2021-11-25 19:53:29 +13:00