cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,047 Commits 5 Branches 0 Tags
ecf834c452ae2bf93b51e1ad9e42a69448308e0c
Commit Graph

399 Commits

Author SHA1 Message Date
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
c0636a860c Merge pull request #12841 from ItsSelis/selis-patch-1 
Washing Disposal Bin washes contents of backpacks
 2022-04-26 21:24:28 +00:00
Casey
4c301c2d58 Adds a disposal bin that washes clothes and other oddities 2022-04-17 23:04:19 -04:00
Casey
139fae8d77 Rascal's Pass 2022-04-01 16:59:15 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai Sieyes
51f419b95d Merge pull request #11372 from VOREStation/Fixes/11369 
Fixes #11369
 2021-08-09 03:41:19 +00:00
Chompstation Bot
8818729b17 Add recycling machinery 2021-07-24 17:04:28 +00:00
Aronai Sieyes
279f027dca Merge pull request #11202 from VOREStation/vplk-optimize-machines 
Optimize machinery processing
 2021-07-22 16:29:58 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
2718c29ce3 Merge pull request #10932 from VOREStation/Arokha/conv 
CONVEYORS
 2021-07-07 18:37:59 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Nadyr
2f70b36661 powder that makes you say yes 2021-05-27 20:34:08 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Razgriz
401784f3e8 Merge branch 'master' into upstream-merge-9445 2021-03-10 17:59:32 -07:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
e27799eba2 Merge pull request #9445 from VOREStation/upstream-merge-7369 
[MIRROR] Department and Round Goals
 2021-02-21 22:15:39 +00:00
Chompstation Bot
710ab9b13e [MIRROR] Wall Disposals 2021-02-09 18:14:44 +00:00
Novacat
edf3e86cfc Merge pull request #9468 from tigercat2000/patch-1 
Allow remote control of disposal bins for silicons
 2020-12-18 19:38:29 +00:00
Chompstation Bot
f80607ae84 polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed 2020-12-07 17:03:03 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
ShadowLarkens
6f9545ea63 TGUI Destination Tagger 2020-08-16 22:27:08 -07:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
ShadowLarkens
dc6c47841d TGUI Backend Tweaks & Fixes 2020-08-07 00:29:50 -07:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
ShadowLarkens
c1f037fc33 Minor fix for not repeating checks that default state already does 2020-07-16 14:59:52 -07:00
ShadowLarkens
1cded01770 TGUI v3.0 
This ports TGUI, and makes the old nano crew monitor and the disposal
bins use it as first examples.
 2020-07-16 14:59:45 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Kenzie
a82de6eddd fixes small package examination 2020-06-01 20:42:37 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00