cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-30 03:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,063 Commits 9 Branches 0 Tags
2ec2ff9e42b5d5cda3c8da112e1195c6cf7736b3
Commit Graph

6484 Commits

Author SHA1 Message Date
Nadyr
0093bbac01 Merge pull request #5555 from lbnesquik/kot-muffle-item 
Add a mode to muffle items.
 2023-02-02 20:35:44 -05:00
Nadyr
57ae8c01ee Merge pull request #5564 from CHOMPStation2/upstream-merge-14336 
[MIRROR] [MIRROR] Repairing light robotic damage messaging fix
 2023-01-27 10:11:46 -05:00
Nadyr
55034ed973 Merge pull request #5588 from CHOMPStation2/upstream-merge-14353 
[MIRROR] Tilted Duffles
 2023-01-27 10:11:16 -05:00
Nadyr
7d25e70249 Merge branch 'master' into upstream-merge-14336 2023-01-27 09:43:44 -05:00
Nadyr
05407f585a Merge pull request #5551 from CHOMPStation2/upstream-merge-14330 
[MIRROR] Uplink and Pouch Tweaks
 2023-01-27 09:27:06 -05:00
Nadyr
f08f632ed4 Merge pull request #5539 from CHOMPStation2/upstream-merge-14327 
[MIRROR] Makes all carpet types orderable and gives them tile icons
 2023-01-27 09:16:47 -05:00
Nadyr
c7e4426a88 powder that makes you say yes 2023-01-27 08:59:21 -05:00
Nadyr
ce193717de powder that makes you say yes 2023-01-27 08:44:50 -05:00
Razgriz
33f82fd5ac Update radio.dm 2023-01-21 22:28:49 -07:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Heroman3003
ddd078fdca Merge pull request #14353 from KillianKirilenko/kk-duffs 
Tilted Duffles
 2023-01-22 01:34:01 +00:00
Heroman3003
092c7025fd [MIRROR] Repairing light robotic damage messaging fix 2023-01-19 03:20:58 +00:00
lbnesquik
ff68eaaffd Fix it in a bad way. 2023-01-18 03:52:33 +01:00
lbnesquik
141519b826 Add a mode to muffle items. 2023-01-18 03:27:00 +01:00
Heroman3003
08935eea03 Merge pull request #14330 from Novacat/nova-basicfixes 
Uplink and Pouch Tweaks
 2023-01-16 08:45:22 +00:00
Heroman3003
fa1f8bb5b4 Makes all carpet types orderable and gives them tile icons 2023-01-13 22:00:36 +00:00
Nadyr
5a72c83bff Merge pull request #5507 from Verkister/patch-30 
Makes capture crystals small
 2023-01-04 21:16:41 -05:00
Nadyr
00edc849b5 Merge pull request #5479 from CHOMPStation2/upstream-merge-14269 
[MIRROR] Adjusts events and refactors borgs a bit in process
 2023-01-04 20:45:00 -05:00
Nadyr
5a5fa0a23d Merge pull request #5482 from CHOMPStation2/upstream-merge-14271 
[MIRROR] Miscallaneous Tweaks
 2023-01-04 20:36:41 -05:00
Nadyr
af5693053b Merge pull request #5473 from CHOMPStation2/upstream-merge-14260 
[MIRROR] Fixes autolathe, material and smartfridge issues
 2023-01-04 18:57:38 -05:00
Verkister
1347e6bdb6 Makes capture crystals small 
It's supposed to be a pokeball, not bakpakball.
 2023-01-04 11:17:36 +02:00
Heroman3003
c26d10f224 Merge pull request #14271 from Novacat/nova-basicfixes 
Miscallaneous Tweaks
 2022-12-30 21:06:28 +00:00
Heroman3003
21b9d0e636 Adjusts events and refactors borgs a bit in process 2022-12-30 21:05:11 +00:00
Heroman3003
165d947e91 Fixes autolathe, material and smartfridge issues 2022-12-28 21:48:06 +00:00
Heroman3003
6b5a73d2da Merge pull request #14257 from Heroman3003/varios-fixes 
Various minor fixes
 2022-12-28 05:02:08 +00:00
Razgriz
bc832e34b9 Merge pull request #5445 from CHOMPStation2/upstream-merge-14238 
[MIRROR] Fixes a pair of runtimes
 2022-12-26 12:28:24 -07:00
Razgriz
14830c8729 Merge pull request #5443 from CHOMPStation2/upstream-merge-14235 
[MIRROR] Fixes critical inventory equipment bug
 2022-12-26 12:27:42 -07:00
Razgriz
af1fe8d2ab Merge pull request #5434 from CHOMPStation2/upstream-merge-14216 
[MIRROR] ticket printers and folders are now holsterable
 2022-12-26 12:20:43 -07:00
Razgriz
f1b3873f5e Merge pull request #5426 from Verkister/eggynames 
Adds custom egg name option for vorgan egg mode
 2022-12-26 12:17:46 -07:00
Casey
b1307d3896 Merge pull request #14238 from Heroman3003/langfix 
Fixes a pair of runtimes
 2022-12-24 08:35:07 +00:00
Casey
ece7dbb2f2 Merge pull request #14235 from Heroman3003/inventory-fix 
Fixes critical inventory equipment bug
 2022-12-24 06:25:59 +00:00
Casey
d21fd301a0 Merge pull request #14216 from TankTheBirb/holster-stuff 
ticket printers and folders are now holsterable
 2022-12-23 16:24:01 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
BlackMajor
362f539e12 Chrimbus Tree 2022-12-23 20:40:37 +13:00
Verkister
3ff6d64011 Adds custom egg name option for vorgan egg mode 
Funnily enough I'm not adding this for some dirty disposals reasons this time. I just wanted to name my bottie's compact material packages something other than "rock egg" lmao
 2022-12-22 17:52:16 +02:00
Novacat
9f65f14549 Merge pull request #14209 from Heroman3003/runtimes-fixes-icons 
Some runtime fixes + oldchat icons
 2022-12-17 22:39:10 +00:00
Nadyr
2cbe1726a1 Merge pull request #5401 from CHOMPStation2/upstream-merge-14206 
[MIRROR] Missing href token adds
 2022-12-15 22:45:45 -05:00
Novacat
1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Heroman3003
b2a1fbeecd Merge pull request #14198 from VOREStation/upstream-merge-8853 
[MIRROR] Fixes shards having unlimited afterattack range
 2022-12-13 22:08:55 +00:00
TheGreatKitsune
c4ca4bbaed Merge master into reforming. 2022-12-10 14:53:38 -06:00
TheGreatKitsune
926f7d1e63 Fix remaining reforming bugs 2022-12-10 14:49:30 -06:00
Nadyr
0b5c3ff9e1 Merge branch 'master' into upstream-merge-14148 2022-12-02 20:46:08 -05:00
Nadyr
81a125bc95 Merge pull request #5321 from CHOMPStation2/upstream-merge-14136 
[MIRROR] Adds more altevian things
 2022-12-02 20:37:51 -05:00
Casey
47d8000b2d Further Hacktool Adjustments 2022-11-27 18:02:23 +00:00
Casey
10e697c6fe Merge pull request #14136 from Heroman3003/altevian-thanksgiving 
Adds more altevian things
 2022-11-26 22:41:43 +00:00
Casey
7c84514c61 Merge pull request #14137 from KillianKirilenko/kk-hacktool 
Simplified Hacktool
 2022-11-26 22:41:34 +00:00
Nadyr
71faa610e0 Merge pull request #5300 from CHOMPStation2/upstream-merge-14133 
[MIRROR] Ticket printer in belt
 2022-11-21 23:44:27 -05:00
Casey
82951868f6 Merge pull request #14133 from Very-Soft/SecurityTickettweak 
Ticket printer in belt
 2022-11-22 01:56:07 +00:00
Casey
b461e2fd06 Ticket Printer! 2022-11-21 06:42:48 +00:00