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
65,287 Commits 8 Branches 0 Tags
b061a207ffcb338d7098e88db758ca6bec42a4cf
Commit Graph

820 Commits

Author SHA1 Message Date
Nadyr
b061a207ff powder that makes you say yes 2021-07-15 18:34:10 -04:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Aronai Sieyes
506d9d53f4 Merge pull request #10847 from MarinaGryphon/nailpolish 
Adds nail polish.
 2021-07-05 23:56:25 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
4ce93fa001 Merge pull request #2281 from CHOMPStationBot/upstream-merge-10743 
[MIRROR] Adds Mug with Text to loadout
 2021-06-25 00:33:56 -07:00
Razgriz
93794b2148 Merge pull request #2270 from CHOMPStationBot/upstream-merge-10719 
[MIRROR] [MIRROR] Linter diagnostics + bans non-var relative pathing
 2021-06-25 00:17:19 -07:00
Novacat
35177da700 Merge pull request #10743 from Heroman3003/M-U-G 
Adds Mug with Text to loadout
 2021-06-24 07:24:20 +00:00
Razgriz
d869885761 Merge pull request #2273 from CHOMPStationBot/upstream-merge-10733 
[MIRROR] Add approved fluff item
 2021-06-23 15:00:16 -07:00
Novacat
cc58b4c1de Merge pull request #10733 from Very-Soft/shine 
Add approved fluff item
 2021-06-22 23:24:24 +00:00
Novacat
59f3b310e6 Merge pull request #10732 from ResidentCody/Fluff-Item-Addition 
Update loadout_fluffitems_vr.dm -- Adds an approved Fluff Item
 2021-06-22 23:24:17 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
b379b08551 Pandora029 fluff item 2021-06-20 17:40:00 +00:00
Nadyr
b3ccdb22a9 powder that makes you say yes 2021-06-19 21:00:46 -04:00
Nadyr
bfd8b22c39 powder that makes you say yes 2021-06-19 20:50:43 -04:00
Nadyr
761d76a43c powder that makes you say yes 2021-06-19 20:48:36 -04:00
Chompstation Bot
52be7df6fc ITV Merchandise (Talon Gear) 2021-06-17 19:50:08 +00:00
Novacat
4f546ba6f7 Merge pull request #10598 from klaasjared/explo-duffle-fix 
Exploration Duffle Fix
 2021-06-09 14:42:19 +00:00
Nadyr
610ca32831 Merge branch 'master' into upstream-merge-10327 2021-05-19 09:51:53 -04:00
Razgriz
2e9c95fe1d Update loadout_suit_vr.dm 2021-05-18 21:07:22 -07:00
Razgriz
cda655fffd Update loadout_accessories_vr.dm 2021-05-18 21:05:00 -07:00
Chompstation Bot
dc4adb84dc Adds more winter coats + moves existing winter coats to the same file 2021-05-17 23:22:24 +00:00
Chompstation Bot
3c3f14185d Minor Loadout Tweaks 2021-05-17 16:56:27 +00:00
Novacat
84661bfe35 Merge pull request #10330 from TheFurryFeline/TFF-AR_Visor_Port 
AR Visor
 2021-05-15 13:23:31 +00:00
Darlantan
86e7b94971 powder that makes you say yes 2021-05-12 03:11:54 -04:00
Nadyr
1f33d5696f Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236 
[MIRROR] Toys expansion
 2021-05-08 23:50:05 -04:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +00:00
Nadyr
f67bd28e3a Merge branch 'master' into upstream-merge-10219 2021-04-30 02:05:30 -04:00
Nadyr
9d401ead5f Merge pull request #1858 from CHOMPStationBot/upstream-merge-10213 
[MIRROR] Both fixes and comments out WL check
 2021-04-30 01:15:48 -04:00
Nadyr
fefd3b6641 Merge pull request #1862 from CHOMPStationBot/upstream-merge-10217 
[MIRROR] Add LUNA's Medals
 2021-04-30 01:05:34 -04:00
Nadyr
8cd695295c Merge pull request #1861 from CHOMPStationBot/upstream-merge-10216 
[MIRROR] Add Entchtut's medal
 2021-04-30 01:04:55 -04:00
Nadyr
a34fd9cec8 Merge branch 'master' into upstream-merge-10213 2021-04-30 01:03:17 -04:00
Chompstation Bot
606e2e757c [MIRROR] Adds config option to control loadout whitelist strictness 2021-04-28 16:46:12 +00:00
Novacat
f6d79c391d Merge pull request #10217 from ResidentCody/Personal-Fork 
Add LUNA's Medals
 2021-04-27 04:19:22 +00:00
Novacat
3f10cf6eb5 Merge pull request #10216 from Little-119/medal-addition 
Add Entchtut's medal
 2021-04-27 03:02:02 +00:00
Chompstation Bot
e8e635184c Both fixes and comments out WL check 2021-04-26 18:45:57 +00:00
Novacat
bf5262dd55 Merge pull request #10206 from VOREStation/upstream-merge-8047 
[MIRROR] Makes xenowear species WL check for species instead of ckey
 2021-04-25 23:00:19 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Nadyr
83460960a5 Update loadout_xeno_yw.dm 2021-03-30 02:46:00 -04:00
Nadyr
304ff00156 Update loadout_fluffitems_yw.dm 2021-03-30 02:21:45 -04:00
Nadyr
e7b999247c Update loadout_xeno_yw.dm 2021-03-30 02:07:56 -04:00
Nadyr
8b3dd6414e Update loadout_xeno_ch.dm 2021-03-30 01:31:35 -04:00
Nadyr
7915a9c9a8 Update loadout_xeno.dm 2021-03-30 01:03:25 -04:00
Nadyr
a777f6993d Merge branch 'master' into upstream-merge-10025 2021-03-30 00:58:05 -04:00
Chompstation Bot
149f222644 MORE ALT ID STUFF 2021-03-28 23:59:28 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Nadyr
5222f4f1b1 Update loadout_fluffitems_vr.dm 2021-03-27 23:22:55 -04:00
Nadyr
f6049a256a Merge branch 'master' into upstream-merge-10007 2021-03-27 23:13:57 -04:00
Sharkmare
ada352389d Changing job requirement for combatpilot suit. 
Makes the combat pilot suit selectable in loadout by pilots
 2021-03-27 07:38:31 +01:00
Chompstation Bot
f825d5ca9f Fixes Fluff and ITG ID cards, refactors event/fluff IDs a lil', also fixes for digested id icons 2021-03-24 18:51:25 +00:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00