Commit Graph

66880 Commits

Author SHA1 Message Date
Chompstation Bot
a4efe1b256 neck gaiters, take two 2021-10-27 17:40:59 +00:00
Nadyr
299511d80d Merge pull request #3106 from Verkister/patch-55
Fixes borg blanket ban caused by whitelist jank
2021-10-25 17:51:45 -04:00
Verkister
6fb52ebcaa Fixes borg blanket ban caused by whitelist jank
Earlyport from upstream fix
2021-10-25 20:07:20 +03:00
Nadyr
3156047dbe Merge pull request #3104 from CHOMPStationBot/upstream-merge-11603
[MIRROR] [MIRROR] By-species age restrictions
2021-10-25 01:17:46 -04:00
Nadyr
30383ace85 Merge pull request #3101 from CHOMPStationBot/upstream-merge-11083
[MIRROR] Adds possibility of borg module whitelisting
2021-10-25 01:10:05 -04:00
Nadyr
80f88f465b powder that makes you say yes 2021-10-25 01:07:26 -04:00
Nadyr
2c4649d319 powder that makes you say yes 2021-10-25 01:03:47 -04:00
Nadyr
703f8f5a44 powder that makes you say yes 2021-10-25 00:59:18 -04:00
Nadyr
dd61782517 Merge pull request #3103 from CHOMPStationBot/upstream-merge-11599
[MIRROR] [MIRROR] fixes crafting reqs not storing parts in the result
2021-10-25 00:56:41 -04:00
Nadyr
78a5b55988 Merge pull request #3102 from CHOMPStationBot/upstream-merge-11589
[MIRROR] [MIRROR] Adds multitools to roboticist/engi toolbelts
2021-10-25 00:56:22 -04:00
Nadyr
2047985640 Merge pull request #3100 from CHOMPStationBot/upstream-merge-11584
[MIRROR] [MIRROR] :siffet:
2021-10-25 00:55:08 -04:00
Nadyr
92b4c893cf powder that makes you say yes 2021-10-25 00:49:39 -04:00
Nadyr
9c4ab0a18b powder that makes you say yes 2021-10-25 00:43:12 -04:00
Nadyr
8c026d11da powder that makes you say yes 2021-10-25 00:37:53 -04:00
Nadyr
ac9e1800bd powder that makes you say yes 2021-10-25 00:34:13 -04:00
Chompstation Bot
001a1b25c4 [MIRROR] By-species age restrictions 2021-10-25 00:37:49 +00:00
Chompstation Bot
3a569cb2ff [MIRROR] fixes crafting reqs not storing parts in the result 2021-10-25 00:25:29 +00:00
Aronai Sieyes
e5aae33ca0 Merge pull request #11599 from VOREStation/upstream-merge-8296
[MIRROR] fixes crafting reqs not storing parts in the result
2021-10-25 00:25:29 +00:00
Chompstation Bot
44bc21752e [MIRROR] Adds multitools to roboticist/engi toolbelts 2021-10-25 00:05:02 +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
Chompstation Bot
987a100b3e Adds possibility of borg module whitelisting 2021-10-24 23:49:40 +00:00
Chompstation Bot
4f0b74e375 [MIRROR] :siffet: 2021-10-24 23:49:32 +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
9b40b1c3ce Merge pull request #3098 from CHOMPStationBot/upstream-merge-11579
[MIRROR] [MIRROR] Stimulant allergen for Tajaran
2021-10-22 20:28:30 -04:00
Nadyr
3cb15c5311 Merge pull request #3097 from CHOMPStationBot/upstream-merge-11571
[MIRROR] [MIRROR] PCU Update
2021-10-22 20:28:14 -04:00
Nadyr
e1e1046627 powder that makes you say yes 2021-10-22 20:27:28 -04:00
Nadyr
4f7bea7121 powder that makes you say yes 2021-10-22 20:09:21 -04:00
Nadyr
3e5e160554 powder that makes you say yes 2021-10-22 20:07:15 -04:00
Nadyr
3995a66fca Merge branch 'master' into upstream-merge-11579 2021-10-22 20:03:36 -04:00
Nadyr
5a39b650bb Merge pull request #3094 from CHOMPStationBot/upstream-merge-11553
[MIRROR] [MIRROR] Refactors crafting to support requirement alternatives
2021-10-22 20:01:37 -04:00
Nadyr
3796a6a388 Merge pull request #3092 from CHOMPStationBot/upstream-merge-11541
[MIRROR] [MIRROR] A Hint Of Lime
2021-10-22 20:01:18 -04:00
Nadyr
afd5eb4e1e powder that makes you say yes 2021-10-22 19:55:45 -04:00
Nadyr
d7be42b91b Merge pull request #3096 from CHOMPStationBot/upstream-merge-11572
[MIRROR] [MIRROR] Expands the ring selection
2021-10-22 19:54:00 -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
ed6e2d7eb6 powder that makes you say yes 2021-10-22 19:48:49 -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
Nadyr
633d6cc469 Merge pull request #3089 from Verkister/upsnails
Earlyports all my current upstream open PRs
2021-10-22 19:45:58 -04:00
Nadyr
71f5491810 Merge pull request #3088 from CHOMPStationBot/upstream-merge-11692
[MIRROR] Fix getting stuck in deep space because of bad creation of temporary sectors
2021-10-22 19:44:05 -04:00
Chompstation Bot
12b909e536 [MIRROR] Misc runtime fixes 2021-10-22 18:57:55 +00:00
Chompstation Bot
ffadbf101f [MIRROR] Stimulant allergen for Tajaran 2021-10-22 18:57:48 +00:00
Chompstation Bot
e71d2d7e0c [MIRROR] PCU Update 2021-10-22 18:40:20 +00:00
Chompstation Bot
3778d603a5 [MIRROR] Expands the ring selection 2021-10-22 18:40:13 +00:00
Aronai Sieyes
dfd327faf3 Merge pull request #11572 from VOREStation/upstream-merge-8272
[MIRROR] Expands the ring selection
2021-10-22 18:40:13 +00:00
Chompstation Bot
37d9af678a [MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits 2021-10-22 18:24:49 +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
Chompstation Bot
cfb14d8069 [MIRROR] Refactors crafting to support requirement alternatives 2021-10-22 18:24:39 +00:00
Aronai Sieyes
89ad96c63f Merge pull request #11553 from VOREStation/upstream-merge-8184
[MIRROR] Refactors crafting to support requirement alternatives
2021-10-22 18:24:39 +00:00
Chompstation Bot
76833f8e35 [MIRROR] Random Spawner Stuff 2021-10-22 18:23:30 +00:00