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 |
|
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
|
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
|
f9a407ba4b
|
powder that makes you say yes
|
2021-12-05 12:00:39 -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
|
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 |
|
BlackMajor
|
55e8bfa69d
|
Simulated you dingus
|
2021-11-15 12:18:42 +13:00 |
|
BlackMajor
|
44d8d3245e
|
quick mapping tool pr
|
2021-11-15 12:16:05 +13:00 |
|
Chompstation Bot
|
0851b4f14c
|
Takes Stellar Delight apart
|
2021-11-01 21:58:31 +00:00 |
|
Nadyr
|
19246dbed1
|
Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722
[MIRROR] Hardwood Material Port
|
2021-10-30 23:30:40 -04:00 |
|
Chompstation Bot
|
da9e3383a8
|
Hardwood Material Port
|
2021-10-30 21:25:32 +00:00 |
|
Chompstation Bot
|
60de9a473c
|
Stellar Delight!
|
2021-10-30 13:34:04 +00:00 |
|
Nadyr
|
4f36828e4c
|
Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615
[MIRROR] [MIRROR] Remove suicide act
|
2021-10-27 21:05:48 -04:00 |
|
Aronai Sieyes
|
0f2f5cb482
|
Merge pull request #11615 from VOREStation/upstream-merge-8311
[MIRROR] Remove suicide act
|
2021-10-28 00:49:05 +00:00 |
|
Nadyr
|
589b2d4024
|
Merge pull request #3152 from CHOMPStationBot/upstream-merge-11663
[MIRROR] [WIP] Atmospheric Retention Fields
|
2021-10-27 20:42:28 -04:00 |
|
Nadyr
|
2b394a1bf0
|
Merge pull request #3141 from CHOMPStationBot/upstream-merge-11705
[MIRROR] Brainfood
|
2021-10-27 20:17:28 -04:00 |
|
Nadyr
|
1664d87d43
|
Merge pull request #3143 from CHOMPStationBot/upstream-merge-11708
[MIRROR] wacky haphazardly barely thought through standing drill buffs
|
2021-10-27 19:26:22 -04:00 |
|
Nadyr
|
3928831eac
|
Merge pull request #3133 from CHOMPStationBot/upstream-merge-11679
[MIRROR] Restricts candle boxes to only hold candles
|
2021-10-27 19:23:21 -04:00 |
|
Nadyr
|
0a973e2ddd
|
Merge pull request #3138 from CHOMPStationBot/upstream-merge-11698
[MIRROR] Tool Time (Fixed)
|
2021-10-27 19:14:36 -04:00 |
|
Nadyr
|
5975a9346a
|
Merge pull request #3134 from CHOMPStationBot/upstream-merge-11678
[MIRROR] Stops literally everything in the world from being recyclable
|
2021-10-27 19:10:03 -04:00 |
|
Nadyr
|
033a33f739
|
powder that makes you say yes
|
2021-10-27 19:07:24 -04:00 |
|
Chompstation Bot
|
536a6cb6e7
|
[WIP] Atmospheric Retention Fields
|
2021-10-27 18:39:20 +00:00 |
|
Casey
|
776f39486a
|
Merge pull request #11708 from Hatterhat/drill-buffs
wacky haphazardly barely thought through standing drill buffs
|
2021-10-27 16:10:30 +00:00 |
|
Chompstation Bot
|
4a5b2182c1
|
Brainfood
|
2021-10-27 16:07:14 +00:00 |
|
Chompstation Bot
|
0fc8ba9656
|
Tool Time (Fixed)
|
2021-10-27 16:02:47 +00:00 |
|
Casey
|
aaca96af40
|
Merge pull request #11678 from Heroman3003/un-recycling
Stops literally everything in the world from being recyclable
|
2021-10-27 15:41:55 +00:00 |
|
Chompstation Bot
|
21ad9c1e79
|
Restricts candle boxes to only hold candles
|
2021-10-27 15:41:48 +00:00 |
|
Casey
|
66c2269642
|
Merge pull request #11670 from VOREStation/upstream-merge-8329
[MIRROR] Unequipping mask slot won't disable internals when wearing airtight hats
|
2021-10-27 15:38:01 +00:00 |
|
Aronai Sieyes
|
33deecbad3
|
Merge pull request #11589 from VOREStation/upstream-merge-8293
[MIRROR] Adds multitools to roboticist/engi toolbelts
|
2021-10-25 00:05:02 +00:00 |
|
Nadyr
|
0edc9e806f
|
Merge pull request #3099 from CHOMPStationBot/upstream-merge-11578
[MIRROR] [MIRROR] Misc runtime fixes
|
2021-10-22 20:42:21 -04:00 |
|
Nadyr
|
e04d6162fc
|
Merge pull request #3095 from CHOMPStationBot/upstream-merge-11544
[MIRROR] [MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
|
2021-10-22 19:51:36 -04:00 |
|
Nadyr
|
889fb8deed
|
Merge pull request #3093 from CHOMPStationBot/upstream-merge-11543
[MIRROR] [MIRROR] Random Spawner Stuff
|
2021-10-22 19:49:53 -04:00 |
|
Nadyr
|
fa2d92ccae
|
Merge pull request #3091 from CHOMPStationBot/upstream-merge-11533
[MIRROR] [MIRROR] Allows wiping food off cutlery
|
2021-10-22 19:47:13 -04:00 |
|
Nadyr
|
024c8d1dd0
|
Merge pull request #3090 from CHOMPStationBot/upstream-merge-11535
[MIRROR] Misc additions I made while sleep deprived
|
2021-10-22 19:46:46 -04:00 |
|
Chompstation Bot
|
12b909e536
|
[MIRROR] Misc runtime fixes
|
2021-10-22 18:57:55 +00:00 |
|
Aronai Sieyes
|
f2702c5455
|
Merge pull request #11544 from VOREStation/upstream-merge-8230
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
|
2021-10-22 18:24:49 +00:00 |
|
Aronai Sieyes
|
116edd7995
|
Merge pull request #11543 from VOREStation/upstream-merge-8246
[MIRROR] Random Spawner Stuff
|
2021-10-22 18:23:30 +00:00 |
|
Aronai Sieyes
|
0f6e69f344
|
Merge pull request #11533 from VOREStation/upstream-merge-8236
[MIRROR] Allows wiping food off cutlery
|
2021-10-22 17:52:40 +00:00 |
|