cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-03 21:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,404 Commits 8 Branches 0 Tags
5cefa8d4e325c19407fd949b89d82b0d1799110e
Commit Graph

877 Commits

Author SHA1 Message Date
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
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
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
Chompstation Bot a4efe1b256 neck gaiters, take two 2021-10-27 17:40:59 +00:00
Chompstation Bot 0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
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