cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,880 Commits 5 Branches 0 Tags
660f89f864017e832fd954b79e20b88734c86526
Commit Graph

856 Commits

Author SHA1 Message Date
Casey
660f89f864 Merge pull request #11642 from PastelPrinceDan/mask 
paper masks, emotional mask
 2021-10-27 15:23:53 +00:00
Aronai Sieyes
dfd327faf3 Merge pull request #11572 from VOREStation/upstream-merge-8272 
[MIRROR] Expands the ring selection
 2021-10-22 18:40:13 +00:00
Nadyr
a268fc233d powder that makes you say yes 2021-09-27 18:00:49 -04:00
Nadyr
842c76a9c1 powder that makes you say yes 2021-09-27 17:59:35 -04:00
Chompstation Bot
ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Nadyr
55e91dd6a1 powder that makes you say yes 2021-09-24 17:16:54 -04:00
Chompstation Bot
b2cbd3b06f PastelPrinceDan fluff item 2021-09-24 04:10:14 +00:00
Razgriz
493557451b Update loadout_fluffitems_yw.dm 2021-09-16 03:43:38 -07:00
Razgriz
5fb74fd497 powder that makes you say yes 2021-09-16 03:39:19 -07:00
Darlantan
f9f8889991 cargo shorts and icon organizing 2021-08-29 01:46:06 -04:00
Aronai Sieyes
6b9f3a059e Merge pull request #11514 from Verkister/patch-80 
Fixes unresetable loadout name/desc gear tweaks
 2021-08-27 14:24:19 +00:00
Nadyr
20ece9d83c Merge pull request #2914 from CHOMPStationBot/upstream-merge-11502 
[MIRROR] [MIRROR] Adds Qipaos
 2021-08-26 23:06:36 -04:00
Chompstation Bot
3b8eef18e7 [MIRROR] Adds Qipaos 2021-08-26 20:42:16 +00:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Nadyr
6868e2fef7 Merge pull request #2876 from cadyn/upstream-merge-11424 
Merge Upstream Pull Request 11424
 2021-08-25 22:47:34 -04:00
Aronai Sieyes
8c2733f4b4 Upstream-11424 2021-08-24 21:10:32 -07:00
Aronai Sieyes
75158113a5 Upstream-11409 2021-08-24 21:09:47 -07:00
Aronai Sieyes
c1632a1c71 Merge pull request #11439 from PastelPrinceDan/rdlabcoat 
Ports RD labcoat from CitRP
 2021-08-24 23:06:09 -04:00
Nadyr
c9afb6b96d Merge branch 'master' into upstream-merge-11479 2021-08-24 21:27:28 -04:00
Nadyr
0f7bde4780 powder that makes you say yes 2021-08-24 20:41:37 -04:00
Nadyr
f326dceba1 powder that makes you say yes 2021-08-24 20:34:13 -04:00
Chompstation Bot
6f129e8dc2 Port some more clothes from CitRP + updates 'off' sprite for mesons & co to match new style. 2021-08-24 23:58:34 +00:00
Chompstation Bot
50cec12f3f fixes the command dress jacket's role requirements 2021-08-24 23:56:26 +00:00
Aronai Sieyes
d69d52622f Merge pull request #11376 from Hatterhat/nondep-jackets 
non-departmental jackets
 2021-08-09 04:59:38 +00:00
Aronai Sieyes
e6fb50a3a4 Merge pull request #11323 from VOREStation/Fixes/11254 
Fixes #11254
 2021-08-01 14:43:07 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr
2705a86682 powder that makes you say yes 2021-07-19 19:42:26 -04:00
Nadyr
e1e4c98723 powder that makes you say yes 2021-07-19 19:41:48 -04:00
Chompstation Bot
dc1328d93c Fixes Talon being referred to as if ITV is a company 2021-07-19 15:12:30 +00:00
Novacat
a682e0c5c1 Merge pull request #11131 from VOREStation/Fixes/11118 
Fixes #11118
 2021-07-18 19:14:58 +00:00
Nadyr
09408105eb Merge pull request #2557 from CHOMPStationBot/upstream-merge-11090 
[MIRROR] Return cloaks to 1 pt cost
 2021-07-15 20:56:09 -04:00
Nadyr
b16aed9159 powder that makes you say yes 2021-07-15 20:24:02 -04:00
Nadyr
a0413ee291 Merge branch 'master' into upstream-merge-11090 2021-07-15 19:26:08 -04:00
Nadyr
1837f4a8ea Merge branch 'master' into upstream-merge-11054 2021-07-15 19:17:43 -04:00
Nadyr
b061a207ff powder that makes you say yes 2021-07-15 18:34:10 -04:00
Chompstation Bot
cad0fc0da1 Return cloaks to 1 pt cost 2021-07-15 19:04:39 +00:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Chompstation Bot
ba071c9f07 Fixes #11052 2021-07-13 06:17:20 +00: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