cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,325 Commits 9 Branches 0 Tags
3765e109540cc68bec90a2bce1ab7f7e752ad18e
Commit Graph

9671 Commits

Author SHA1 Message Date
Nadyr
3768ad7e5f Merge pull request #2545 from CHOMPStationBot/upstream-merge-11073 
[MIRROR] Make connections lists lazy
 2021-07-15 18:57:36 -04:00
Aronai Sieyes
5c5aaa1887 Merge pull request #11058 from VOREStation/Arokha/entertain 
Make tvcamera and entertainment monitor FANCY
 2021-07-14 18:39:39 +00:00
Aronai Sieyes
bb6f219db6 Merge pull request #11073 from VOREStation/Arokha/connless 
Make connections lists lazy
 2021-07-14 18:37:22 +00:00
Nadyr
f3ffdcb4ec Merge pull request #2503 from CHOMPStationBot/upstream-merge-11015 
[MIRROR] Port a big blast door, add to ship
 2021-07-13 22:59:15 -04: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
Nadyr
28b4a57852 Merge pull request #2529 from CHOMPStationBot/upstream-merge-11050 
[MIRROR] Add RSF to autolathes
 2021-07-13 22:55:11 -04:00
Nadyr
acc7d80190 Merge pull request #2527 from CHOMPStationBot/upstream-merge-11042 
[MIRROR] Storage alt-click support
 2021-07-13 22:53:47 -04:00
Nadyr
c22bbacc65 Merge pull request #2526 from CHOMPStationBot/upstream-merge-11043 
[MIRROR] Make UAVs not work at impossible distances
 2021-07-13 22:53:27 -04:00
Nadyr
c479cf6459 Merge branch 'master' into upstream-merge-11015 2021-07-13 22:25:02 -04:00
Nadyr
a803e5175f Merge pull request #2493 from CHOMPStationBot/upstream-merge-11002 
[MIRROR] Move like every clothing icon file
 2021-07-13 22:21:08 -04:00
Nadyr
1b0ff7eeeb Merge pull request #2504 from CHOMPStationBot/upstream-merge-11017 
[MIRROR] Fix railing clipping with flight
 2021-07-13 21:35:00 -04:00
Nadyr
31823707a7 powder that makes you say yes 2021-07-12 23:31:31 -04:00
Aronai Sieyes
8faa3a57ce Merge pull request #11050 from VOREStation/Arokha/rsf 
Add RSF to autolathes
 2021-07-12 23:47:42 +00:00
Aronai Sieyes
54af7b4f8a Merge pull request #11042 from VOREStation/Arokha/altstorage 
Storage alt-click support
 2021-07-12 23:46:27 +00:00
Aronai Sieyes
85b0fbdd30 Merge pull request #11043 from VOREStation/Arokha/uavview 
Make UAVs not work at impossible distances
 2021-07-12 23:46:20 +00:00
Chompstation Bot
50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Aronai Sieyes
9e13177d81 Merge pull request #11017 from VOREStation/Arokha/flyclip 
Fix railing clipping with flight
 2021-07-11 00:45:52 +00:00
Chompstation Bot
1e95d78a1a Port a big blast door, add to ship 2021-07-10 23:49:57 +00:00
Chompstation Bot
d9cb00a124 Add skybox planet sprite for Virgo3b, modify midpoint 2021-07-10 23:48:50 +00:00
Nadyr
58f6f5a71a Merge pull request #2499 from CHOMPStationBot/upstream-merge-11010 
[MIRROR] Fix some bugs
 2021-07-10 18:47:04 -04:00
Aronai Sieyes
27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 20:12:23 +00:00
Aronai Sieyes
6ba41ed8e0 Merge pull request #11006 from VOREStation/Arokha/portalfix 
Remove naughty KEEP_TOGETHER
 2021-07-10 19:35:22 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Nadyr
b90a37b854 Merge pull request #2490 from CHOMPStationBot/upstream-merge-10995 
[MIRROR] Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-10 01:47:51 -04:00
Nadyr
60fa095962 Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993 
[MIRROR] Stack Examine Improvements, Log Examine Fix
 2021-07-10 01:47:29 -04:00
Nadyr
48c609ddca Merge pull request #2487 from CHOMPStationBot/upstream-merge-10988 
[MIRROR] Fixes #10885
 2021-07-10 01:38:31 -04:00
Nadyr
c229da42a6 Merge pull request #2486 from CHOMPStationBot/upstream-merge-10989 
[MIRROR] Fixes pocky having no sprite.
 2021-07-10 01:36:36 -04:00
Nadyr
49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980 
[MIRROR] Expands do_after/do_mob exclusive var to affect target
 2021-07-10 01:30:52 -04:00
Nadyr
d9dd108539 Merge pull request #2466 from CHOMPStationBot/upstream-merge-10963 
[MIRROR] Byond will never stop with this huh
 2021-07-10 00:45:05 -04: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
Novacat
29b5b3bf05 Merge pull request #10995 from Enzo-Leon/medical_tools 
Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-09 18:24:29 +00:00
Aronai Sieyes
205ef740bd Merge pull request #10993 from MarinaGryphon/issue/logpile 
Stack Examine Improvements, Log Examine Fix
 2021-07-09 16:19:16 +00:00
Aronai Sieyes
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885 
Fixes #10885
 2021-07-09 16:18:08 +00:00
Aronai Sieyes
e4692d0b94 Merge pull request #10989 from MarinaGryphon/issue/pocky 
Fixes pocky having no sprite.
 2021-07-09 16:18:00 +00:00
Aronai Sieyes
f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289 
Expands do_after/do_mob exclusive var to affect target
 2021-07-09 16:14:12 +00:00
Aronai Sieyes
22e6adb253 Merge pull request #10963 from VOREStation/Arokha/artREALLY 
Byond will never stop with this huh
 2021-07-08 04:54:26 +00:00
Nadyr
7438d0f486 Merge pull request #2453 from CHOMPStationBot/upstream-merge-10948 
[MIRROR] Adds a weretiger.
 2021-07-08 00:15:00 -04:00
Nadyr
2c1005a60f Merge pull request #2448 from CHOMPStationBot/upstream-merge-10937 
[MIRROR] Some plane tweaks.
 2021-07-08 00:14:47 -04:00
Nadyr
70fcf38987 powder that makes you say yes 2021-07-07 23:58:56 -04:00
Nadyr
8b67f6b69d Merge pull request #2451 from CHOMPStationBot/upstream-merge-10949 
[MIRROR] More painting tweaks
 2021-07-07 23:56:53 -04:00
Nadyr
21aa0be248 Merge pull request #2444 from CHOMPStationBot/upstream-merge-10938 
[MIRROR] Art removal tweaks
 2021-07-07 23:52:59 -04:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Aronai Sieyes
a0b482e956 Merge pull request #10949 from VOREStation/Arokha/persistcross 
More painting tweaks
 2021-07-07 21:07:31 +00:00
Chompstation Bot
ef79e49ee2 Some plane tweaks. 2021-07-07 19:03:14 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
7c93723da5 Merge pull request #10938 from VOREStation/Arokha/paint 
Art removal tweaks
 2021-07-07 18:41:21 +00:00
Aronai Sieyes
1deccaed87 Merge pull request #10931 from Very-Soft/ghostlyanimals 
Makes ghosts able to play as some mobs sometimes
 2021-07-07 18:37:53 +00:00
Nadyr
a2c1ee213a Merge pull request #2433 from CHOMPStationBot/upstream-merge-10927 
[MIRROR] Add pouches!
 2021-07-05 23:32:49 -04:00
Chompstation Bot
b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Aronai Sieyes
78eb4608d2 Merge pull request #10923 from VOREStation/Arokha/mult 
Fix multitool runtime
 2021-07-05 23:57:53 +00:00