cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,616 Commits 8 Branches 0 Tags
1bebca2c037efb8424f7583d8488553cb65e391c
Commit Graph

74616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Verkister
1bebca2c03 Fixes char setup tail layering. 
Guess we aint goin a bit elephant style for much longer.
 2023-05-02 16:53:01 +03:00
Nadyr
5531a43f8d Merge pull request #6168 from CHOMPStation2/upstream-merge-14831 
[MIRROR] Modern wrapped coat adjustment
 2023-05-01 18:13:30 -04:00
Nadyr
1fbb064f98 Merge pull request #6170 from Verkister/patch-63 
Nerfs mouseray
 2023-05-01 18:12:26 -04:00
Nadyr
1fab6750d3 Merge pull request #6155 from Fracshun/second-autotransfer 
Secondary Auto-Transfer
 2023-05-01 18:11:38 -04:00
Verkister
7dd3543648 Nerfs mouseray 
Nerfs mouseray melee damage. No longer one-hit kills the mousified victim when the user tries to revert their form while standing too close :v
 2023-05-01 21:58:35 +03:00
Eli
3c18f2d15b Bundle update 2023-05-01 17:34:07 +10:00
Eli
0fe4771c8d Merge remote-tracking branch 'upstream/master' into second-autotransfer 2023-05-01 17:32:43 +10:00
CHOMPStation2
d394047099 Modern wrapped coat adjustment 2023-05-01 04:26:02 +00:00
Heroman3003
13fec2c779 Merge pull request #14831 from Heroman3003/wrapcot 
Modern wrapped coat adjustment
 2023-05-01 04:26:01 +00:00
Nadyr
7200a5e85a Merge pull request #6164 from CHOMPStation2/upstream-merge-14823 
[MIRROR] Added striped dungarees and tiny tophat
 2023-04-30 22:49:59 -04:00
Nadyr
3bab511efd Merge pull request #6159 from BlackMajor/matrices 
Matrices and supporting colour code
 2023-04-30 22:48:38 -04:00
Nadyr
3968c7aa1f Merge pull request #6166 from CHOMPStation2/upstream-merge-14828 
[MIRROR] Agent ID Feedback
 2023-04-30 22:25:54 -04:00
Nadyr
9af5d76313 Merge pull request #6165 from CHOMPStation2/upstream-merge-14819 
[MIRROR] More Speech Bubbles
 2023-04-30 22:24:42 -04:00
BlackMajor
71550ec81b update bundle 2023-05-01 14:24:09 +12:00
BlackMajor
c1a01015e7 Merge branch 'master' into matrices 2023-05-01 14:23:18 +12:00
Nadyr
e1280d4860 powder that makes you say yes 2023-04-30 22:20:05 -04:00
Nadyr
53575d02f9 powder that makes you say yes 2023-04-30 22:18:29 -04:00
Nadyr
51eea36f52 Merge pull request #6162 from CHOMPStation2/upstream-merge-14822 
[MIRROR] Adds altevian ramenpacks and tacopacks
 2023-04-30 22:17:03 -04:00
Kassc
33e930b935 Merge pull request #6150 from TheGreatKitsune/Emergency-shuttle-confirm 
Add a confirmation with guidelines on emergency shuttle usage
 2023-04-30 21:29:49 -04:00
CHOMPStation2
0ae5c5174a Agent ID Feedback 2023-05-01 01:29:11 +00:00
Heroman3003
34e44f0c7e Merge pull request #14828 from ReoDaProtovali/AgentCardFeedback 
Agent ID Feedback
 2023-05-01 01:29:11 +00:00
CHOMPStation2
dd0af35826 More Speech Bubbles 2023-05-01 00:58:19 +00:00
Heroman3003
7a79811045 Merge pull request #14819 from SatinIsle/More-speech-bubbles 
More Speech Bubbles
 2023-05-01 00:58:18 +00:00
Heroman3003
d1460c5713 Added striped dungarees and tiny tophat 2023-05-01 00:58:13 +00:00
CHOMPStation2
923bb48ecb Adds altevian ramenpacks and tacopacks 2023-05-01 00:57:01 +00:00
Heroman3003
0f13258b0f Merge pull request #14822 from Heroman3003/ramenratr 
Adds altevian ramenpacks and tacopacks
 2023-05-01 00:57:01 +00:00
Nadyr
b6b1c06e85 Merge pull request #5948 from Seris02/actuallyfixeschardir 
fixes char directory gender, sexuality and event tag buttons
 2023-04-30 20:51:24 -04:00
Nadyr
da527f92fb Merge pull request #6132 from Fracshun/belly-feedable 
Feedable belly preference
 2023-04-30 20:50:57 -04:00
TheGreatKitsune
7635ae6e41 Update message given for calling the shuttle 2023-04-30 19:35:05 -05:00
Nadyr
4bef4d506a Merge pull request #6061 from Sharkmare/patch-29 
Uncomment Clown/Mime
 2023-04-30 20:34:24 -04:00
Nadyr
bd94e1a2a0 Merge pull request #6118 from Fracshun/mouse-colours 
Set Mouse Colour
 2023-04-30 20:33:15 -04:00
Nadyr
b59fb82dff Merge pull request #6160 from Verkister/patch-62 
Fixes shadekin phaseshift runtime
 2023-04-30 20:32:47 -04:00
Nadyr
9597f016a7 Merge pull request #6158 from CHOMPStation2/nanomaps_generation 
Automatic NanoMap Update
 2023-04-30 20:30:25 -04:00
Kassc
37b11354a8 Merge pull request #6153 from FluffMedic/INeedSleep 
Fixing some minor things #Lizzard
 2023-04-30 20:30:11 -04:00
Nadyr
42435fa5c5 Merge pull request #6156 from Verkister/patch-61 
fixes simplemob vore icon update jank again
 2023-04-30 20:29:55 -04:00
Nadyr
b44bd80aac Merge pull request #6154 from BlackMajor/Rads 
Rad storm fix
 2023-04-30 20:28:04 -04:00
Nadyr
0eeea84aad Merge pull request #6152 from TheGreatKitsune/Carbonkin-infections 
Add antibiotic self-treatment to Dark Respite
 2023-04-30 20:27:27 -04:00
Nadyr
809871054e Merge pull request #6151 from TheGreatKitsune/Underwear-tf-fix 
Fixes undergarments getting yeeted by any belly update
 2023-04-30 20:26:28 -04:00
Nadyr
2d7b75b516 Merge pull request #6148 from Verkister/patch-60 
Fixes vore_fx runtime error
 2023-04-30 20:24:55 -04:00
Nadyr
734afbd2ef Merge pull request #6147 from Verkister/patch-59 
Fixes vorgan load not applying processing speed
 2023-04-30 20:23:59 -04:00
Nadyr
9e3632ac48 Merge pull request #6145 from CHOMPStation2/upstream-merge-14820 
[MIRROR] Altevian Clothing Fix
 2023-04-30 20:23:13 -04:00
Verkister
740beb2f15 fixes another runtime while at it 2023-04-30 13:11:54 +03:00
Verkister
b172bccf06 Fixes shadekin phaseshift runtime 
Eyes need sockets.
 2023-04-30 12:58:58 +03:00
BlackMajor
e1d024b008 Whoops 2023-04-30 21:40:44 +12:00
BlackMajor
65a5644b02 Ugh 2023-04-30 21:39:18 +12:00
NanoMap Generation
6737a7a472 NanoMap Auto-Update (Sun Apr 30 07:21:51 UTC 2023) 2023-04-30 07:21:51 +00:00
Nadyr
973030bd20 Merge pull request #5706 from FluffMedic/Valley 
Wilds Expansion - The Valley
 2023-04-30 03:18:14 -04:00
BlackMajor
8730bd6b0f Merge branch 'master' into matrices 2023-04-30 16:19:43 +12:00
BlackMajor
6f9f78213d Merge branch 'master' into matrices 2023-04-30 16:14:51 +12:00
BlackMajor
765b51c04a Merge pull request #6157 from BlackMajor/Shaden't 
Adds a mapping tool to allow mappers to control phase shifts + runtimestation
 2023-04-30 16:12:25 +12:00