cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 02:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,996 Commits 8 Branches 0 Tags
07cb7850ceb42fa7ea69a0c8b56e25cdc7b2d1e4
Commit Graph

12536 Commits

Author SHA1 Message Date
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Nadyr
51b6b3a096 Merge branch 'master' into upstream-merge-10504 2021-05-31 03:27:44 -04:00
Nadyr
2c15103f44 Merge pull request #2096 from CHOMPStationBot/upstream-merge-10505 
[MIRROR] Some misc runtime fixes
 2021-05-31 03:17:57 -04:00
Nadyr
366fd4f97b Merge pull request #2086 from CHOMPStationBot/upstream-merge-10479 
[MIRROR] Ports Runechat
 2021-05-31 03:11:13 -04:00
Nadyr
9429fab7f4 powder that makes you say yes 2021-05-31 02:40:25 -04:00
Chompstation Bot
dd630bc529 Couple more runefixes 2021-05-31 03:57:40 +00:00
Aronai Sieyes
e89052c292 Merge pull request #10505 from VOREStation/Arokha/miscfix 
Some misc runtime fixes
 2021-05-31 03:57:35 +00:00
Aronai Sieyes
9134933442 Allow multiple SStranscore databases (#10450) 
* Allow multiple SStranscore databases

* Add key to backup implanter too

* Key passing tweak

* Fix issue Leshana spotted

* Add optimization Leshana spotted

* Fixxy more multitranscore bugs
 2021-05-30 22:53:28 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433 
[MIRROR] [MIRROR] Linter Introduction + Cleanup
 2021-05-27 21:35:05 -04:00
Nadyr
8c9cacd4b8 powder that makes you say yes 2021-05-27 21:12:48 -04:00
Nadyr
31a32df27e powder that makes you say yes 2021-05-27 20:21:17 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Aronai Sieyes
69d29589dc Merge pull request #10434 from VOREStation/Arokha/forget 
AI bugfixes
 2021-05-27 01:10:20 +00:00
Nadyr
d69d166f2a Merge pull request #2036 from CHOMPStationBot/upstream-merge-10430 
[MIRROR] Add secret zlevels
 2021-05-26 01:05:08 -04:00
Nadyr
a9533bd9fb powder that makes you say yes 2021-05-26 00:55:26 -04:00
Chompstation Bot
04b2b0af70 Add secret zlevels 2021-05-26 01:44:00 +00:00
Novacat
47a73a6ef4 Merge pull request #10425 from Heroman3003/pipefix2 
Fixes proteans being a bit too liberal with reformation
 2021-05-25 22:54:57 +00:00
Verkister
115b803bdd Fixes ch taurs having lost their inherited tags 
Fixes /ch/ subtype taurs not being able to wear the fitted stuff formerly inherited from their non-ch parent types.
 2021-05-25 14:59:12 +03:00
Nadyr
3d5cf4f03f powder that makes you say yes 2021-05-24 19:33:52 -04:00
Novacat
ec82f7ed9c Merge pull request #10395 from TheFurryFeline/patch-32 
Lore Fixy
 2021-05-24 19:57:57 +00:00
Nadyr
e574a45ea0 powder that makes you say yes 2021-05-22 16:56:38 -04:00
Chompstation Bot
8911fe1de3 Manual port Polaris Fixes 2021-05-22 20:22:28 +00:00
Nadyr
67b36900c5 Merge pull request #1988 from CHOMPStationBot/upstream-merge-10342 
[MIRROR] Adds some fennec treats
 2021-05-21 19:00:34 -04:00
Nadyr
c112b49c1c Merge pull request #1989 from CHOMPStationBot/upstream-merge-10369 
[MIRROR] [MIRROR] [Bugfix] Maybe Fix Cleanbots
 2021-05-21 18:51:32 -04:00
Novacat
416ba2411e Merge pull request #10369 from VOREStation/upstream-merge-8089 
[MIRROR] [Bugfix] Maybe Fix Cleanbots
 2021-05-21 04:54:02 +00:00
Chompstation Bot
c4161dc8d0 Adds some fennec treats 2021-05-20 19:55:01 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 19:05:42 +00:00
Razgriz
62694cd3d5 Merge pull request #1969 from Cyrelius/Cyrelius-Medihound-fix 
Fix Medihounds having only 2 uses of Trauma kits, burn kits, etc.
 2021-05-19 06:24:37 -07:00
tyger
817d163c1c there, i guess 2021-05-19 10:49:59 +02:00
Cyrelius
eacaceeb5b Fix Medihounds having only 2 uses of Trauma kits, burn kits, and clotting kits. 
This change fixes another one in  954412a26a  that reduced Medihound's medical supplies seemingly unintentionally.
 2021-05-17 16:37:55 -07:00
Novacat
b28bf70a2f Merge pull request #10345 from Heroman3003/spdrfix 
Fixes pixel offsets resetting on Giant Spider Queen
 2021-05-17 19:53:41 +00:00
Novacat
d5a6cb16a3 Merge pull request #10332 from VOREStation/Arokha/emoflip 
Touch up emote port
 2021-05-15 15:13:23 +00:00
Nadyr
bddfb995a2 Merge pull request #1912 from CHOMPStationBot/upstream-merge-10222 
[MIRROR] Catalogue Entries V1
 2021-05-14 01:15:36 -04:00
Nadyr
5fe4f38477 grammar 2021-05-14 01:04:42 -04:00
Nadyr
5dcb7f09fb grammar 2021-05-14 01:03:06 -04:00
Nadyr
c2d4da4ac2 grammar 2021-05-14 01:00:16 -04:00
Nadyr
ecd8f1e73a grammar 2021-05-14 00:59:12 -04:00
Nadyr
3b84b864f2 powder that makes you say yes 2021-05-14 00:57:58 -04:00
Nadyr
ea6f0fa259 powder that makes you say yes 2021-05-14 00:54:36 -04:00
Nadyr
458df58b2c Merge pull request #1943 from CHOMPStation2/PredPois 
Pred POI's
 2021-05-13 23:29:26 -04:00
Novacat
966de75a6c Merge pull request #10313 from TheFurryFeline/patch-31 
Stop SSD Snorers
 2021-05-13 02:53:39 +00:00
Nadyr
b48dd8fa43 Merge pull request #1948 from CHOMPStationBot/upstream-merge-10311 
[MIRROR] RE-ADDS SQUISH
 2021-05-12 18:48:21 -04:00
Nadyr
97dfe1fec8 Merge pull request #1942 from CHOMPStationBot/upstream-merge-10298 
[MIRROR] Tweak synth stuff
 2021-05-12 18:45:12 -04:00
Nadyr
31b47bc0d1 powder that makes you say yes 2021-05-12 18:20:23 -04:00
Nadyr
2a16c0d6e5 powder that makes you say yes 2021-05-12 18:18:47 -04:00
Nadyr
3bce32f1e0 powder that makes you say yes 2021-05-12 18:15:43 -04:00
Nadyr
294abf2ee2 powder that makes you say yes 2021-05-12 18:12:16 -04:00
Nadyr
c6572af5de powder that makes you say yes 2021-05-12 18:10:59 -04:00
Nadyr
ccc7fbab62 powder that makes you say yes 2021-05-12 18:09:36 -04:00