Commit Graph

30 Commits

Author SHA1 Message Date
Casey
dc618675c1 Shotguns and Bolt-Action Rifles 2022-03-21 09:54:13 +00:00
Nadyr
fa1fea2c56 Merge pull request #3715 from CHOMPStation2/upstream-merge-12285
[MIRROR] 7914 branch fix
2022-02-19 19:58:40 -05:00
Casey
e73d113da0 7914 branch fix 2022-02-19 21:25:16 +00:00
Casey
7ad39bffcb Merge pull request #12262 from TheDavestDave/primative-shield-2
primative-shields
2022-02-19 04:02:45 +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
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
Nadyr
74c9adf928 powder that makes you say yes 2021-08-27 20:02:35 -04:00
Nadyr
be5b7f3644 Merge pull request #2895 from CHOMPStationBot/upstream-merge-11466
[MIRROR] Expanding Clothing Options
2021-08-26 20:50:04 -04:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Aronai Sieyes
dfd88b4ba7 Merge pull request #11326 from Verkister/hudbutts
Fixes the small hud buttons not getting hud colors
2021-08-02 13:40:43 +00:00
Nadyr
2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179
[MIRROR] Optimize a couple things
2021-07-20 21:45:26 -04:00
Aronai Sieyes
ab88b2420d Merge pull request #11165 from VOREStation/Arokha/lightport
Small light optimizations
2021-07-20 23:03:17 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
5843c3776e Add bows, recipe for wooden one 2021-07-15 22:13:21 +00:00
Nadyr
19b0e94af7 Merge pull request #2510 from CHOMPStationBot/upstream-merge-11025
[MIRROR] Fix crafting menu, add plant fiber crafting things
2021-07-13 22:59:04 -04:00
Chompstation Bot
50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Aronai Sieyes
d989caaf41 Merge pull request #11021 from VOREStation/Arokha/nifcraftmenus
Make nif/crafting menu buttons not be hidden
2021-07-11 19:14:17 +00:00
Chompstation Bot
15fd9df408 The One Where You Can Aim Lights 2021-06-30 19:29:41 +00:00
Nadyr
030baa7ac8 powder that makes you say yes 2021-06-20 20:47:59 -04:00
Razgriz
ffd82c6d5e Merge branch 'master' into upstream-merge-10683 2021-06-18 19:31:31 -07:00
Chompstation Bot
b69e24086a 6 fixes 2021-06-18 18:02:23 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Chompstation Bot
dd630bc529 Couple more runefixes 2021-05-31 03:57:40 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Novacat
86ab1a8363 Merge pull request #10303 from VOREStation/Arokha/removeoldnifmenu
Deprecate NIF statpanel in favor of TGUI
2021-05-12 17:46:40 +00:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Chompstation Bot
6ce0b7ee4e Make unnatural resizing even better and more efficient with the power of DCS™️ 2021-04-08 15:15:21 +00:00
Chompstation Bot
77c15811a2 Datum Component System (/tg/ port) 2020-10-19 10:36:26 +00:00