cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,837 Commits 8 Branches 0 Tags
6b0b2efbfb51f03a07b80b93cf4e4aeffe9e8ad6
Commit Graph

14788 Commits

Author SHA1 Message Date
Selis
77e57e7209 feat: Better changelogs 2023-07-17 18:54:57 +02:00
Raeschen
0a8778195e Merge pull request #6594 from CHOMPStation2/upstream-merge-15152 
[MIRROR] Autowhisper
 2023-07-17 11:28:10 +02:00
Raeschen
7ca3bb6d68 Merge pull request #6597 from CHOMPStation2/Raeschen-fixsiffetruntime 
fix a runtime in siffet.dm
 2023-07-17 11:16:00 +02:00
Raeschen
2e4efbcb42 Merge branch 'master' into upstream-merge-15152 2023-07-17 11:14:49 +02:00
Raeschen
d38107c165 Merge pull request #6596 from Aroliacue/Aroliacue-patch-1 
Corrects missing chompedits in #6595
 2023-07-17 10:44:17 +02:00
Raeschen
18a2445b1e fix a runtime 2023-07-17 10:40:10 +02:00
Raeschen
c93b1bfdaa Merge pull request #6589 from kcin2001/borg-stuff 
fixes borgs losing EAL
 2023-07-17 10:24:22 +02:00
Raeschen
e639cd4812 Merge pull request #6583 from CHOMPStation2/upstream-merge-15139 
[MIRROR] Adds Custom Subtle verb
 2023-07-17 10:21:56 +02:00
Aroliacue
63fb9b77c5 Update robot_vr.dm 
Forgot to add chompedits, oops.
 2023-07-17 18:16:29 +10:00
Raeschen
20bbb57267 remove our functionality, upstream's is better 2023-07-17 10:16:06 +02:00
Aroliacue
56fa256e8a Adds more phase guns to cyborg chassis, fixes tallborgs being off-center 2023-07-17 17:13:08 +10:00
Casey
41175bcb8e Autowhisper 2023-07-17 05:53:13 +00:00
kcin2001
d90485aebb fixes borgs losing EAL 2023-07-15 20:23:20 -07:00
Raeschen
7b1c011b44 Merge pull request #6584 from CHOMPStation2/upstream-merge-15138 
[MIRROR] Adds altevian NPCs for event use
 2023-07-16 00:04:55 +02:00
Raeschen
e1fd55f5d7 Update corpse.dm 2023-07-15 23:49:04 +02:00
Raeschen
984cc44d4f Merge pull request #6582 from CHOMPStation2/upstream-merge-15142 
[MIRROR] Fixes multi-taur saddlebags getting cut off
 2023-07-15 23:47:51 +02:00
Raeschen
2388e73c76 Merge pull request #6580 from CHOMPStation2/upstream-merge-15140 
[MIRROR] Adds lizard color variety, enables black mice
 2023-07-15 23:46:33 +02:00
Raeschen
625649aa38 Update say_vr.dm 2023-07-15 23:34:23 +02:00
Raeschen
802214555f Update say_vr.dm 2023-07-15 23:31:01 +02:00
Raeschen
5506680590 Update update_icons.dm 2023-07-15 23:29:14 +02:00
Heroman3003
33775c7843 Adds altevian NPCs for event use 2023-07-15 20:05:51 +00:00
Casey
db975d1bb6 Adds Custom Subtle verb 2023-07-15 20:03:42 +00:00
Casey
f5b41a895f Fixes multi-taur saddlebags getting cut off 2023-07-15 20:03:37 +00:00
Casey
92eef28434 Merge pull request #15140 from Heroman3003/lizorcolors 
Adds lizard color variety, enables black mice
 2023-07-15 19:48:59 +00:00
SarmentiCampbell
94666fc395 Merge branch 'master' into Sillicon 2023-07-15 11:23:33 +02:00
SarmentiCampbell
81b6ef6d9a Tallborgs added 2023-07-15 10:25:44 +02:00
Raeschen
fcdf73051d Merge pull request #6563 from kcin2001/borg-stuff 
Miscellaneous Dogborg Tweaks/Fixes
 2023-07-14 23:52:32 +02:00
radiantAurora
4dc25bfbbf Update sprite_accessories_ear.dm 2023-07-13 19:37:20 +01:00
radiantAurora
07f29388ab Update sprite_accessories_ear.dm 2023-07-13 19:14:31 +01:00
kcin2001
748b2f4fec misc borg fixes 2023-07-11 23:38:12 -07:00
Raeschen
57ee0dd4ad Moves pAI diredog sprites to correct file. 2023-07-10 09:30:19 +02:00
Raeschen
3497c0d3e8 Update update_icons.dm 2023-07-10 08:17:51 +02:00
Raeschen
858ec6802e Merge pull request #6542 from CHOMPStation2/upstream-merge-15128 
[MIRROR] Allows ability for taller taurs to exist
 2023-07-09 12:55:04 +02:00
Raeschen
83b9e691d7 Merge pull request #6540 from kcin2001/spacemouseify 
make dustjumpers more mousey
 2023-07-09 12:51:01 +02:00
Raeschen
7028c6da36 Update sprite_accessories_tail_vr.dm 2023-07-09 12:49:03 +02:00
Raeschen
a3b625f163 Update sprite_accessories_tail_vr.dm 2023-07-09 12:48:35 +02:00
Raeschen
5f1db2bdad Update update_icons.dm 2023-07-09 12:44:15 +02:00
Heroman3003
7f26d263f7 Allows ability for taller taurs to exist 2023-07-09 09:53:02 +00:00
kcin2001
34203a5a63 make dustjumpers more mousey 2023-07-08 13:54:26 -07:00
Heroman3003
01869185b3 Merge pull request #15118 from Very-Soft/burf 
BIRTH
 2023-07-07 20:50:07 +00:00
Selis
3f683db523 Double reply & href fixes 2023-07-07 10:53:53 +02:00
Heroman3003
88409b33f8 Merge pull request #15116 from TankTheBirb/zorgoia-time 
Adds Zorgoia carbon markings
 2023-07-07 05:08:28 +00:00
Razgriz
524d6fae45 Merge pull request #6516 from kcin2001/raptor-fixes 
Raptorborg dmi tweaks
 2023-07-06 12:52:20 -07:00
kcin2001
2ff2eaff38 Ragefixing the thicc machine 2023-07-06 10:34:57 -07:00
Raeschen
233bc96181 Fix PAI sprite bug 2023-07-06 18:28:55 +02:00
Raeschen
2b35e876cc fixes some runtimes 2023-07-06 13:46:18 +02:00
Razgriz
1c7fb9844e Merge pull request #6509 from kcin2001/citRP-FBP 
adds CitRP FBP Sprites as well as some markings for the spectre (one of the new FBP sprites)
 2023-07-06 03:30:02 -07:00
kcin2001
d821859440 adds CitRP Fbp Sprites as well as some markings for the spectre 2023-07-06 00:29:37 -07:00
Raeschen
81b117b889 even more path fixes 2023-07-05 11:35:45 +02:00
Raeschen
2c9b7b1a59 mass renaming everything is a good thing right??? 2023-07-05 10:33:37 +02:00