cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,197 Commits 10 Branches 0 Tags
6d51b51abb6be4aadab9247d38b2ea517f11bb12
Commit Graph

1008 Commits

Author SHA1 Message Date
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
Casey
7a5d72bda0 Merge pull request #12380 from Hatterhat/rig-undersuits 
undersuits for EVA equipment enthusiasts
 2022-03-07 03:08:25 +00:00
Casey
7be78d396e Merge pull request #12375 from GhostActual/vaporwave-dreams 
Vaporwave Dreams
 2022-03-07 03:06:16 +00:00
Casey
b978c9a34f Merge pull request #12357 from GhostActual/3D-glasses-loadout 
Adds 3D glasses to Loadout
 2022-03-02 06:07:56 +00:00
Nadyr
8f5bd593ba Merge branch 'master' into upstream-merge-12288 2022-02-19 20:48:23 -05:00
Casey
c7b4b0d8b4 adds avida's clothes and alt bnnuy ears 2022-02-19 19:30:17 -05:00
Nadyr
5baec6eb8a Merge pull request #3703 from CHOMPStation2/upstream-merge-12274 
[MIRROR] Add's Brad's Air Jordans
 2022-02-19 19:01:08 -05:00
Casey
dc837b05b4 [ready] pastelprincedan plushie fluff item 2022-02-19 22:06:21 +00:00
CHOMPStation2
54b66fe9f9 Merge pull request #3692 from CHOMPStation2/upstream-merge-12244 
[MIRROR] revolver eloise fluff item
 2022-02-18 15:43:08 -07:00
Casey
ee009945d5 Add's Brad's Air Jordans 2022-02-18 20:21:25 +00:00
Razgriz
9966377da6 Merge pull request #3684 from CHOMPStation2/upstream-merge-12242 
[MIRROR] Now's your chance to be a [BIG SHOT]
 2022-02-17 17:34:00 -07:00
Casey
37e43bf832 revolver eloise fluff item 2022-02-17 13:16:50 +00:00
Casey
c3a0eaaf5b Merge pull request #12242 from GhostActual/bigshot_glasses 
Now's your chance to be a [BIG SHOT]
 2022-02-16 07:21:13 +00:00
Casey
d4c693378d Merge pull request #12210 from VOREStation/upstream-merge-8200 
[MIRROR] Cybernetic Augments and Sick Tats
 2022-02-13 21:48:53 +00:00
Razgriz
e58053d211 powder that makes you say yes 2022-02-13 01:17:59 -07:00
Casey
0319e46850 strapless bag 2022-02-11 21:36:25 +00:00
Nadyr
7f75efc328 powder that makes you say yes 2022-02-06 21:47:41 -05:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
9379f4d1bc makes amour for lucky 2022-02-06 14:18:49 +00:00
Casey
851dddd961 Merge pull request #12053 from TheDavestDave/dnd-fm 
Dnd fm
 2022-01-14 18:42:30 +00:00
Nadyr
439fc01c15 powder that makes you say yes 2022-01-09 20:49:33 -05:00
Casey
c1b38449d9 Dnd explo amour 2022-01-09 01:50:02 +00:00
Nadyr
a18f0f082a Merge branch 'master' into upstream-merge-11990 2021-12-12 06:36:50 -05:00
Nadyr
58accf0791 powder that makes you say yes 2021-12-12 03:56:58 -05:00
Nadyr
63af8e82c1 powder that makes you say yes 2021-12-12 03:54:27 -05:00
Nadyr
f880a70a18 powder that makes you say yes 2021-12-12 03:53:42 -05:00
Nadyr
165b5681d7 powder that makes you say yes 2021-12-12 03:52:07 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Razgriz
3b86cb45c7 Merge pull request #3259 from CHOMPStation2/upstream-merge-11947 
[MIRROR] pastelprincedan & hatterhat fluff items
 2021-12-10 13:23:35 -07:00
Razgriz
064f1b1a20 Merge branch 'master' into upstream-merge-11935 2021-12-10 01:48:12 -07:00
Razgriz
de0d1ae244 powder that makes you say yes 2021-12-10 01:18:56 -07:00
Casey
3c89650556 Merge pull request #11755 from Hatterhat/gaiter-second-pass 
neck gaiter second pass - thank you @dan
 2021-12-10 06:24:31 +00:00
Casey
c8b2a0dc81 Brings back pre-fulp labcoat icons to loadout and vendors 2021-12-09 20:43:12 +00:00
Nadyr
5b4b80fcd4 Merge pull request #3218 from CHOMPStation2/upstream-merge-11920 
[MIRROR] Probably fixes xenowear loadout reset bug
 2021-12-05 13:10:10 -05:00
Nadyr
7399798406 Merge pull request #3222 from CHOMPStation2/upstream-merge-11931 
[MIRROR] Adds Amaryll's claws fluff item
 2021-12-05 12:40:51 -05:00
Casey
dc39fe696f Merge pull request #11947 from PastelPrinceDan/fwuff 
pastelprincedan & hatterhat fluff items
 2021-12-04 01:28:44 +00:00
Casey
6004382872 Custom item for Coolcrow420, minor change to stamp code 2021-12-04 01:28:37 +00:00
Casey
3dfe2ff266 Merge pull request #11909 from Heroman3003/deencode 
Fixes loadout items with apostrophes not being adjustible
 2021-12-03 07:18:17 +00:00
Aronai Sieyes
a0cd42922e Adds Amaryll's claws fluff item 2021-12-03 07:16:14 +00:00
Casey
e8ef109999 Merge pull request #11920 from Verkister/patch-103 
Probably fixes xenowear loadout reset bug
 2021-12-03 07:15:35 +00:00
Nadyr
91a38b7532 Merge branch 'master' into upstream-merge-11716 2021-10-27 20:49:37 -04:00
Nadyr
7f5305920d Merge branch 'master' into upstream-merge-11715 2021-10-27 20:25:43 -04:00
Nadyr
0a973e2ddd Merge pull request #3138 from CHOMPStationBot/upstream-merge-11698 
[MIRROR] Tool Time (Fixed)
 2021-10-27 19:14:36 -04:00
Chompstation Bot
04835a42c6 Straw Stuff + Fixes 2 2021-10-27 21:53:50 +00:00