cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-07 07:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,197 Commits 7 Branches 0 Tags
6d51b51abb6be4aadab9247d38b2ea517f11bb12
Commit Graph

3161 Commits

Author SHA1 Message Date
Heroman3003
c7827b37fb Merge pull request #14446 from Hatterhat/outfit-pass2 
skyrat outfit port continuation (adds to loadout)
 2023-02-08 03:13:42 +00:00
Casey
b2912331b5 Merge pull request #14418 from Flump1/master 
Ports four outfits from skyrat
 2023-02-04 05:37:57 +00:00
Nadyr
914f627dc0 Merge pull request #5587 from CHOMPStation2/upstream-merge-14354 
[MIRROR] Event Stuff Bugfix/Balance Pass
 2023-01-27 10:17:52 -05:00
Razgriz
a1c63a58c8 Merge pull request #5608 from CHOMPStation2/mirrorsecuniform 
[MIRROR] Adds a new Security jumpsuit #5531
 2023-01-24 19:58:00 -07:00
Razgriz
7a9c81e4e6 Merge pull request #5535 from CHOMPStation2/upstream-merge-14329 
[MIRROR] More Gaiter Masks
 2023-01-24 18:28:44 -07:00
Razgriz
a2d9ee8229 Update security.dm 2023-01-24 18:27:01 -07:00
Razgriz
fa4f0a78a1 Merge pull request #5527 from CHOMPStation2/upstream-merge-14321 
[MIRROR] fixes the colorable qipao
 2023-01-24 18:20:48 -07:00
Razgriz
fc51ad57e4 Merge pull request #5519 from tacoguy7765093/nononononowaitwaitwaitwait 
You can eat through synth facemask
 2023-01-24 18:20:29 -07:00
Razgriz
40fecb31a8 Update permits_vr.dm 2023-01-21 22:33:28 -07:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Heroman3003
222ec534c8 Event Stuff Bugfix/Balance Pass 2023-01-22 01:33:56 +00:00
Heroman3003
c05f0c3291 Merge pull request #14329 from KillianKirilenko/kk-masks 
More Gaiter Masks
 2023-01-13 21:57:08 +00:00
Heroman3003
b44643f4df fixes the colorable qipao 2023-01-11 03:15:30 +00:00
tacoguy7765093
7948b862e1 chompers in the chat 2023-01-08 15:34:12 -06:00
Bib Bob
7246764603 synth vore 2023-01-07 18:35:00 -06:00
Heroman3003
fb5208d1b3 Merge pull request #14285 from Detective-Google/halos 
adds halos to loadout
 2023-01-04 19:33:39 +00:00
Heroman3003
75c59e5100 Merge pull request #14240 from VOREStation/upstream-merge-8866 
[MIRROR] grammar standardization for softsuits
 2022-12-25 20:54:42 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Raeschen
98a9921c4f Various Fixes (#5399) 
* modularize digitigrade code

* Hide glasses + tail side layering fix

* pipe unwrench yeet

Co-authored-by: Razgriz <razgriz1032@gmail.com>
 2022-12-17 16:59:20 -07:00
Razgriz
f2338a49a2 Merge pull request #5290 from CHOMPStation2/upstream-merge-14096 
[MIRROR] Trash pile adjustments
 2022-12-11 19:48:58 -07:00
Novacat
72ce50e78a Merge pull request #14163 from Heroman3003/resrtict-fix-rat 
Fixes wrong item being species restricted
 2022-12-03 22:10:09 +00:00
Casey
10e697c6fe Merge pull request #14136 from Heroman3003/altevian-thanksgiving 
Adds more altevian things
 2022-11-26 22:41:43 +00:00
Nadyr
b594174376 powder that makes you say yes 2022-11-21 23:04:46 -05:00
Heroman3003
2e7c58bfa8 Merge pull request #14096 from Novacat/nova-basicfixes 
Trash pile adjustments
 2022-11-21 04:34:16 +00:00
Casey
824a11ff36 Gives teshari missing hat + mask sprites. 2022-11-21 01:33:05 +00:00
Casey
f6cfa0a3ed Merge pull request #14093 from Very-Soft/equipspecial 
equip_special
 2022-11-18 06:39:56 +00:00
Razgriz
edc64dcbdf Merge pull request #4143 from Tasald/Explorationedits 
Explorationedits
 2022-11-14 23:54:29 -07:00
Casey
f5e5a8777f Merge pull request #14021 from KillianKirilenko/kk-lanyard 
Baton Lanyard
 2022-11-06 16:56:48 +00:00
Nadyr
3febdc6bf5 Merge pull request #5169 from CHOMPStation2/upstream-merge-13943 
[MIRROR] Adds the tactical AR visor.
 2022-10-24 17:01:47 -04:00
Casey
a452b89e36 Merge pull request #13943 from FunnyCatEnjoyer/FunnyCat2 
Adds the tactical AR visor.
 2022-10-23 18:53:11 +00:00
Casey
2ece8642cb Merge pull request #13937 from Heroman3003/ratbadges 
Adds altevian badges
 2022-10-23 18:49:35 +00:00
Nadyr
c972b89ef8 Merge pull request #5149 from CHOMPStation2/upstream-merge-13918 
[MIRROR] Adds the Security Hudpatch MKII to the game
 2022-10-19 17:14:52 -04:00
Casey
973ce30d54 Merge pull request #13918 from FunnyCatEnjoyer/FunnyCat 
Adds the Security Hudpatch MKII to the game
 2022-10-16 21:08:46 +00:00
Casey
6b40e7118c Merge pull request #13919 from FunnyCatEnjoyer/FunnyCat2 
Halloween costume update. feat Hotdog and Turnip suits.
 2022-10-16 21:08:41 +00:00
Nadyr
0c32c4ec5f powder that makes you say yes 2022-10-11 20:41:05 -04:00
Casey
224d985529 Suit&Uniform Supplement. 2022-10-10 03:08:44 +00:00
crabcube
0beb9d1648 Tie new sprites to Vox suits 
Wip for now as i make sure it works
 2022-10-03 20:32:44 -05:00
Razgriz
e61f382360 Allow gas tanks in armor back slot 2022-09-26 18:59:58 -07:00
Razgriz
dfb2ec2fb4 Revert "Revert "Vox security rigsuit"" 2022-09-23 00:00:48 -07:00
Razgriz
b1059fb2a4 Revert "Vox security rigsuit" 2022-09-22 22:27:09 -07:00
Razgriz
422c35eb8e Merge pull request #4852 from crabcube/master 
Vox security rigsuit
 2022-09-22 22:26:29 -07:00
Razgriz
6bbcda4901 [Manual MIRROR] Adds a ton more altevian stuff 
Ports https://github.com/VOREStation/VOREStation/pull/13774 instead of the auto mirror because github was crying over conflicts with a .dmi file
 2022-09-22 21:32:28 -07:00
Casey
f2716e95ae Adds more altevian content 2022-09-18 09:39:22 +00:00
Nadyr
684c4467fd Merge branch 'master' into upstream-merge-13710 2022-09-10 22:11:06 -04:00
Nadyr
3c6b93eb1f Merge pull request #4903 from CHOMPStation2/upstream-merge-13706 
[MIRROR] Adds Taur Skirts
 2022-09-10 22:04:02 -04:00
Casey
61ddc608f1 Fixes Taur Skirt 2022-09-10 21:24:57 +00:00
Casey
b0b6a5b138 Merge pull request #13706 from Novacat/nova-basicfixes 
Adds Taur Skirts
 2022-09-10 20:47:13 +00:00
Casey
b4dfdbd16c Merge pull request #13700 from Heroman3003/dragor-hat 
Adds colorable magic hat to loadout
 2022-09-10 20:41:46 +00:00
crabcube
dee8e42520 Security RIG for vox 
I am actually coping trying to get the sprite edits for carapace to be complete but I'll just update this later when i get the new sprites finished (eventually) 

Carapace rig without modules basically, will be cargo obtainable
 2022-09-05 13:26:17 -05:00