cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,752 Commits 8 Branches 0 Tags
827fbb01311f4b02bfc3d70f99f02c20aa933424
Commit Graph

952 Commits

Author SHA1 Message Date
Casey
490e0a4d67 Merge pull request #13472 from Runa-Dacino/command-jacket-open 
Enables unbuttoning the Command Dress Jacket
 2022-08-14 05:40:16 +00:00
Casey
c5d1d96bc9 shalax fluff wrassle secbelt reskin 2022-08-07 20:14:07 +00:00
Casey
68f32bf874 Pandora Fluff Item 2022-07-15 22:32:11 +00:00
Nadyr
6c14103200 Merge pull request #4526 from CHOMPStation2/upstream-merge-13287 
[MIRROR] Nehi fluff items
 2022-07-13 18:49:12 -04:00
Casey
f43c530c46 Merge pull request #13287 from ZodiacShadow/Zodiac 
Nehi fluff items
 2022-07-08 00:36:49 +00:00
Casey
f0efe74732 Merge pull request #13283 from faaaay/master 
Adds recolourable hoodies with functional hoods
 2022-07-08 00:29:44 +00:00
Nadyr
f179146e86 powder that makes you say yes 2022-06-23 00:10:47 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
3d5d4f1be8 Makes new pAI obtainable 2022-06-04 20:03:22 +00:00
Nadyr
818157ccca Merge pull request #4302 from CHOMPStation2/upstream-merge-13012 
[MIRROR] Stobarico's Fluff Item
 2022-05-31 02:34:18 -04:00
Casey
8a2511e1b3 Merge pull request #13012 from stobarico/master 
Stobarico's Fluff Item
 2022-05-29 17:43:59 +00:00
Casey
bd6aa32092 Merge pull request #13011 from FunnyCatEnjoyer/FunnyCat 
Another typo on Fifi's fluff item. This time it should work.
 2022-05-29 17:41:48 +00:00
Nadyr
be2e7842b1 Merge branch 'master' into upstream-merge-12996 2022-05-27 16:08:25 -04:00
Nadyr
68a25ca178 Merge pull request #4280 from CHOMPStation2/upstream-merge-12997 
[MIRROR] Changes Schnapsen loadout description
 2022-05-27 16:07:29 -04:00
Nadyr
af6a481f51 Merge pull request #4278 from CHOMPStation2/upstream-merge-12994 
[MIRROR] Fixes typo in Fifi's fluff loadout
 2022-05-27 16:01:32 -04:00
Nadyr
c75225ef09 powder that makes you say yes 2022-05-27 15:51:56 -04:00
Nadyr
c94c50e953 powder that makes you say yes 2022-05-27 15:49:17 -04:00
Casey
62c04f34d1 Ports card icons from Eris. Implements them for VOREStation 2022-05-22 22:11:13 +00:00
Casey
a318b9be4c Merge pull request #13004 from TheDavestDave/amor-stuffs 
custom item stuff ahead of explo removeal
 2022-05-22 18:32:21 +00:00
Casey
3246c587a8 Changes Schnapsen loadout description 2022-05-22 18:22:42 +00:00
Casey
360c2f6308 Fixes typo in Fifi's fluff loadout 2022-05-22 18:17:22 +00:00
Razgriz
3e0cdf665b Merge branch 'master' into upstream-merge-12982 2022-05-18 13:31:31 -07:00
Casey
c608a6b9bc Fixes dumb cat mistakes 2022-05-18 08:59:06 +00:00
Casey
98fcb6f912 Merge pull request #12980 from FunnyCatEnjoyer/FunnyCatEnjoyer 
Adds the planet collar!
 2022-05-16 00:09:46 +00:00
Casey
a3b274487f Adds Nettie's fluff Tablet 2022-05-12 19:42:57 +00:00
Casey
fc2a9fe7ef Merge pull request #12906 from ItsSelis/selis-guestpass-patch 
Making "Walkpods" a loadout option
 2022-05-08 09:54:54 +00:00
Casey
87e00aff6f Merge pull request #12869 from ItsSelis/dosimeters 
Dosimeters
 2022-05-01 03:09:59 +00:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
97cc55a948 Merge pull request #12749 from Runa-Dacino/schnapsen_final_final 
Adds a new playing card game: schnapsen
 2022-04-17 09:24:23 +00:00
Nadyr
543ca3c42c powder that makes you say yes 2022-04-04 18:07:58 -04:00
Casey
061b177978 Mini Aurora Port 2022-04-04 18:07:58 -04:00
Casey
5c33d6ea19 Merge pull request #12578 from GhostActual/tg-port-4 
The Grand /TG Port - Part 4
 2022-04-03 03:29:50 +00:00
Nadyr
98612ca2c6 Merge pull request #3902 from CHOMPStation2/upstream-merge-12504 
[MIRROR] Robs You In Public
 2022-03-26 00:48:33 -04:00
Nadyr
61f2f98dc8 powder that makes you say yes 2022-03-25 18:49:16 -04:00
Casey
e71a04a991 Merge pull request #12504 from GhostActual/Robs-You-In-Public 
Robs You In Public
 2022-03-21 20:21:21 +00:00
Nadyr
ba62732d25 powder that makes you say yes 2022-03-21 14:16:11 -04:00
Casey
4f457c2dc0 Show off your Pride 2022-03-21 09:55:24 +00:00
Nadyr
ca7b15c0a3 powder that makes you say yes 2022-03-20 18:57:54 -04:00
Casey
361a2f1568 Strapless satchel moved to bag selection 2022-03-20 18:33:21 +00:00
Razgriz
7ef959e5d3 powder that makes you say yes 2022-03-15 21:08:40 -07:00
Casey
9885711cd2 Small Pilot QoL additions 2022-03-13 20:05:54 +00:00
Razgriz
3cae1f0065 Merge pull request #3829 from CHOMPStation2/master 
Merge master into branch 12415
 2022-03-11 16:19:12 -07:00
Casey
edbd4ebcd2 Wiz-Off Fix 2022-03-11 04:23:40 +00:00
Casey
104874a9a8 Merge pull request #12404 from BonniePandora/Haz-undersuit 
Adds the hazard undersuit to the loadout menu
 2022-03-09 06:45:22 +00:00
Casey
816a0ab80e Merge pull request #12401 from Heroman3003/fiiiiix 
Fixes weird char setup crash
 2022-03-08 10:58:28 +00:00
Razgriz
eee9a7b7aa Merge pull request #3805 from CHOMPStation2/upstream-merge-12382 
[MIRROR] Minor Atmos-tech QoL & new hazard vest
 2022-03-07 17:02:45 -07:00
Razgriz
1bda13193f Merge pull request #3799 from CHOMPStation2/upstream-merge-12380 
[MIRROR] undersuits for EVA equipment enthusiasts
 2022-03-07 17:00:07 -07:00
Casey
de6e5c4932 Merge pull request #12382 from BonniePandora/Atmosia-Improvements 
Minor Atmos-tech QoL & new hazard vest
 2022-03-07 08:36:25 +00:00