cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,116 Commits 7 Branches 0 Tags
f707230e292831e46e98a67af2c00a79c5c38c3d
Commit Graph

2617 Commits

Author SHA1 Message Date
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01:00
CHOMPStation2
12370f4855 [MIRROR] Some input updates (#7735) 
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-02-21 18:09:27 +01:00
Kashargul
5e9562784b blacklist for belly liquids (#7777) 2024-02-18 13:21:44 +01:00
CHOMPStation2
937090b0ec [MIRROR] Round value adjustments for react (#7767) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-02-16 19:27:03 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
Kashargul
6edb784df7 vorepanel setting update (#7567) 
Co-authored-by: Selis <selis@xynolabs.com>
 2024-02-04 15:50:51 +01:00
CHOMPStation2
5ecc743ce5 [MIRROR] robot upgrade overhaul + some fixes (#7640) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-31 12:55:35 -05:00
CHOMPStation2
aab270c74f [MIRROR] remove static chat colour tags (#7635) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-29 18:45:19 -05:00
Kashargul
93b230fd4f fixes 2 runtimes in the liquid system (#7623) 2024-01-25 21:12:55 -05:00
tacoguy7765093
6d7a80f273 Fixes fatal heartburns involving custom liquid bellies digesting synthetics. (#7561) 2024-01-14 21:11:04 -05:00
Missile597
81a41526bf Black Sapbean Fix (#7538) 2024-01-14 13:34:58 +01:00
CHOMPStation2
c5ba4eb7a1 [MIRROR] Energy drinks (#7458) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-12-29 20:03:11 -05:00
MeepleMuncher
881db477f2 Fixes blondies to be actually makeable (#7375) 2023-12-09 15:29:00 +01:00
MeepleMuncher
fc21a4d0c3 Blondies! (Allergenless brownies) (#7367) 2023-12-08 20:44:32 +01:00
Verkister
670f8f48f5 Fixes raw nutrition not digesting on food mode (#7354) 2023-12-08 00:26:37 +01:00
Missile597
b5e05d328c Distillery Tweak (#7314) 2023-12-05 00:33:27 +01:00
Aroliacue
aaff33e980 Curabitur Improvements, Belly Liquid Reagent Additions (#7284) 2023-11-29 16:23:04 +01:00
FluffMedic
08e7b6658b 1 real fix, two bandaid ones. (#7270) 2023-11-25 13:53:46 +01:00
Verkister
4dc689676c Fixes worn item liquid digestion and adds setting for item digestion logs (#7095) 2023-10-25 19:30:06 -04:00
FluffMedic
cc422c024e Makes cryogel mixable (#7112) 2023-10-24 21:02:30 -04:00
Verkister
32dfabd62d Fixes swoopie special clicks, simplemob held ID stuff, and synth metabolism toggle (#7079) 2023-10-12 15:59:35 -04:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
Verkister
cd5813d748 Adds 2 new taur bellysprites, fixes 2 vorgan overlay bugs, and adds verb to toggle synth stomach reagent draining. (#7055) 2023-10-04 17:56:45 -04:00
CHOMPStation2
0a7a411f88 [MIRROR] Soup's On! (#7041) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-26 16:51:44 +02:00
CHOMPStation2
507879aef8 [MIRROR] Fantasy redgate map (#7035) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-26 16:29:35 +02:00
Verkister
ccb4aad376 Slow digestion for food items, Swoopie succ overhaul, and a couple other fixes. (#7029) 2023-09-26 15:48:01 +02:00
FluffMedic
12bef8d55b Removes phoron from the base of the size chems (#7026) 2023-09-22 08:05:53 +02:00
CHOMPStation2
a69fe76a7b [MIRROR] Blood Reagents Refactor (#6980) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-18 17:41:12 +02:00
CHOMPStation2
5b3676c2af [MIRROR] fix(bloodpills): Fixes path (#6962) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-12 23:20:41 +02:00
CHOMPStation2
58891b3e78 [MIRROR] Changes blood regen pill instances to contain copper pills due to zorren copper update (#6958) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
 2023-09-12 23:19:36 +02:00
CHOMPStation2
5f5ed5e967 [MIRROR] Makes Zorren blood actually based on copper: Iron no longer regens their blood, copper is needed (#6949) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-10 09:53:40 +02:00
CHOMPStation2
b8cf009835 [MIRROR] Decaftea (#6914) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-04 10:28:20 +02:00
CHOMPStation2
51b73e8042 [MIRROR] [READY] Removes Dogborgs (#6763) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: kcin2001 <rnlb2001@gmail.com>
 2023-08-14 08:01:48 +02:00
Verkister
5204408ef1 A bunch of little tweaks and fixes for juicy gurgles (#6710) 2023-08-03 14:14:03 +02:00
Victor Zisthus
dc5b5524d0 Fixes Toxic Blood (#6657) 2023-07-26 11:21:03 +02:00
Raeschen
071905fed5 Fix lost changes (#6633) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
 2023-07-21 08:44:40 +02:00
Raeschen
fcdf73051d Merge pull request #6563 from kcin2001/borg-stuff 
Miscellaneous Dogborg Tweaks/Fixes
 2023-07-14 23:52:32 +02:00
kcin2001
748b2f4fec misc borg fixes 2023-07-11 23:38:12 -07:00
purplefoxy27
e23809463f Improve decaf coffee strings 2023-07-11 21:57:46 -07:00
Raeschen
93a7418152 merge conflict 2023-06-25 12:44:44 +02:00
Heroman3003
72de7f458e Time to get truly SWOL 2023-06-23 18:45:53 +00:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936 
[MIRROR] Little Weakref Refactor
 2023-06-09 22:27:56 -04:00
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Heroman3003
24dae674d0 Merge pull request #14930 from Heroman3003/harminject-buff 
Buffs harm-injection
 2023-06-01 20:35:45 +00:00
Verkister
92b321b906 A couple vacpack and vorgan juice fixes 
Vacpack now checks for spont prey pref.
Fixed vacpack direct targeted sucks missing their after-click doublechecks. (the cancel stuff for fleeing distance and things leaving/yoinked from the tile)
Fixed liquidbelly acid item interaction order (now does digest_act stuff first if in belly)
Fixed open containers eating up all liquids.
 2023-05-11 15:49:49 +03:00
Heroman3003
2b7654eda1 Merge pull request #14832 from KillianKirilenko/kk-deduplication 
Reagent Cleanup
 2023-05-05 01:26:30 +00:00
Nadyr
e301182ac4 Merge pull request #6127 from CHOMPStation2/upstream-merge-14807 
[MIRROR] Chocolate Allergy
 2023-04-25 21:06:31 -04:00
Verkister
19e2e2c301 New visuals and tweaks 2023-04-24 18:03:59 +03:00