cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,171 Commits 5 Branches 0 Tags
15f43a90e1bf5a6d55e7145d8bc2a79d48ed5b5f
Commit Graph

810 Commits

Author SHA1 Message Date
Nadyr
34c742b55e powder that makes you say yes 2022-02-19 20:39:18 -05:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
Nadyr
6e44bb7876 Merge branch 'master' into upstream-merge-12165 2022-02-06 21:53:14 -05:00
Nadyr
4b2b0c85bc Merge pull request #3614 from CHOMPStation2/upstream-merge-12150 
[MIRROR] mining vendor 1000 thaler reward
 2022-02-06 20:35:33 -05:00
Casey
e6f02c05a6 The final Item Bank patch? 2022-02-06 23:29:28 +00:00
Casey
e5665c54cf Merge pull request #12150 from PastelPrinceDan/moni 
mining vendor 1000 thaler reward
 2022-02-06 14:13:55 +00:00
Casey
84b984a731 Merge pull request #12145 from Hatterhat/t3drill 
makes a single t3 brace actually support its drill
 2022-02-06 14:12:43 +00:00
Nadyr
001b26fde0 Merge pull request #3465 from CHOMPStation2/upstream-merge-11869 
[MIRROR] Fixes active edges and other minor startup issues in gateway areas
 2021-12-12 06:01:42 -05:00
Nadyr
bb410d704d powder that makes you say yes 2021-12-12 03:32:16 -05:00
Razgriz
f26f2f1880 powder that makes you say yes 2021-12-10 00:59:15 -07:00
Casey
6fe03ecb47 Merge pull request #11869 from Heroman3003/gatewayaefix 
Fixes active edges and other minor startup issues in gateway areas
 2021-12-10 06:09:18 +00:00
Casey
175bc573fe A Miner Update [forgot to test a thing] 2021-12-10 00:50:47 +00:00
Nadyr
ca6f1be700 powder that makes you say yes 2021-12-05 11:19:00 -05:00
Nadyr
4bd02ef673 Merge pull request #3140 from CHOMPStationBot/upstream-merge-11701 
[MIRROR] ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
 2021-10-27 19:30:01 -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
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
318ac12a29 ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs 2021-10-27 16:05:04 +00:00
Casey
d8165f109a Merge pull request #11673 from PastelPrinceDan/salt 
removes 'empty ore box' verb because i'm done with crashes
 2021-10-27 15:40:39 +00:00
Casey
969007daef Merge pull request #11581 from Hatterhat/vendor-momentor 
mapping units go brr for explo
 2021-09-24 03:55:31 +00:00
Nadyr
0c710f1455 powder that makes you say yes 2021-08-27 20:25:35 -04:00
Nadyr
3cf0e77ae2 Merge pull request #2898 from CHOMPStationBot/upstream-merge-11487 
[MIRROR] fixes and tweaks for proto-kinetic melees
 2021-08-26 20:38:00 -04:00
Aronai Sieyes
8f51150367 Merge pull request #11487 from Hatterhat/crusher-adv 
fixes and tweaks for proto-kinetic melees
 2021-08-26 16:27:23 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Nadyr
050f3d0bbb powder that makes you say yes 2021-08-25 22:12:30 -04:00
Nadyr
0d9cd50f72 powder that makes you say yes 2021-08-25 22:06:41 -04:00
Aronai Sieyes
66be6f53bb Upstream-11417 2021-08-24 21:10:14 -07:00
Nadyr
ca83d7c1e7 Merge branch 'master' into upstream-merge-11471 2021-08-24 22:20:31 -04:00
Nadyr
829455df51 powder that makes you say yes 2021-08-24 22:02:46 -04:00
Chompstation Bot
d189c9a12f Crusher Gaming 2021-08-24 23:58:27 +00:00
Chompstation Bot
e59bf2e97b helLO i forgot to change an icon name for crusher overlays please merge 2021-08-24 23:58:20 +00:00
Chompstation Bot
21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Aronai Sieyes
ae0b7113e1 Merge pull request #11198 from Very-Soft/vendorinducers 
Increase inducer vendor cost
 2021-07-22 20:01:54 +00:00
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Aronai Sieyes
66669af98d Merge pull request #11170 from Heroman3003/thepurge 
Finishes purge of Industrial Expansion
 2021-07-20 14:46:30 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Nadyr
03561c03d6 powder that makes you say yes 2021-07-16 18:20:44 -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
Aronai Sieyes
7ecbc25c97 Merge pull request #11035 from VOREStation/upstream-merge-8166 
[MIRROR] Cold cavern tileset.
 2021-07-12 06:41:16 +00:00
Nadyr
eafe24872c Merge pull request #2468 from CHOMPStationBot/upstream-merge-10972 
[MIRROR] Fixes #10941
 2021-07-10 01:14:01 -04:00
Nadyr
3ca4336586 Merge pull request #2464 from CHOMPStationBot/upstream-merge-10970 
[MIRROR] Fixes #10967
 2021-07-09 23:47:40 -04:00
Aronai Sieyes
2e31d368e7 Merge pull request #10972 from VOREStation/Fixes/10941 
Fixes #10941
 2021-07-08 05:04:49 +00:00
Aronai Sieyes
9fe03ccfe2 Merge pull request #10970 from VOREStation/Fixes/10967 
Fixes #10967
 2021-07-08 04:54:13 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Razgriz
6606c683d3 powder that makes you say please add chomp comments 2021-07-03 14:00:25 -07:00
Chompstation Bot
42cbf0e1e5 Port Eris mining satchel sprites, satchel of holding 2021-07-03 20:17:02 +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