cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,674 Commits 10 Branches 0 Tags
master
Commit Graph
2065 Commits
Author SHA1 Message Date
VerkisterandGitHub c8d6110925 Update 02_language.dm 2021-08-26 19:26:06 +03:00
Chompstation Bot 3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Raeschen f6003256e5 fix missing icon cache key generation data + poopy preview refresh (thanks verk <3) 2021-08-26 08:21:57 +02:00
NadyrandGitHub 6868e2fef7 Merge pull request #2876 from cadyn/upstream-merge-11424 
Merge Upstream Pull Request 11424
 2021-08-25 22:47:34 -04:00
NadyrandGitHub bd40a3b563 Merge pull request #2870 from cadyn/upstream-merge-11413 
Merge Upstream Pull Request 11413
 2021-08-25 22:02:09 -04:00
Raeschen 838eed8d81 Initial 2021-08-25 17:14:32 +02:00
Aronai SieyesandCadyn 8c2733f4b4 Upstream-11424 2021-08-24 21:10:32 -07:00
Aronai SieyesandCadyn c86229fbee Merge pull request #11413 from VOREStation/upstream-merge-8201 
[MIRROR] Dethrone The ERP King
 2021-08-24 21:09:57 -07:00
Aronai SieyesandCadyn 75158113a5 Upstream-11409 2021-08-24 21:09:47 -07:00
Aronai SieyesandDarlantan c1632a1c71 Merge pull request #11439 from PastelPrinceDan/rdlabcoat 
Ports RD labcoat from CitRP
 2021-08-24 23:06:09 -04:00
NadyrandGitHub c9afb6b96d Merge branch 'master' into upstream-merge-11479 2021-08-24 21:27:28 -04:00
NadyrandGitHub 0f7bde4780 powder that makes you say yes 2021-08-24 20:41:37 -04:00
NadyrandGitHub 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 SieyesandChompstation Bot d69d52622f Merge pull request #11376 from Hatterhat/nondep-jackets 
non-departmental jackets
 2021-08-09 04:59:38 +00:00
Aronai SieyesandChompstation Bot 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
NadyrandGitHub 38b67b77c1 Merge pull request #2593 from CHOMPStationBot/upstream-merge-11136 
[MIRROR] Prevent synths from taking temp traits
 2021-07-19 19:56:08 -04:00
NadyrandGitHub 2705a86682 powder that makes you say yes 2021-07-19 19:42:26 -04:00
NadyrandGitHub e1e4c98723 powder that makes you say yes 2021-07-19 19:41:48 -04:00
Aronai SieyesandChompstation Bot ec8cc6e795 Merge pull request #11136 from VOREStation/Arokha/synthtemp 
Prevent synths from taking temp traits
 2021-07-19 21:17:22 +00:00
Chompstation Bot dc1328d93c Fixes Talon being referred to as if ITV is a company 2021-07-19 15:12:30 +00:00
NovacatandChompstation Bot a682e0c5c1 Merge pull request #11131 from VOREStation/Fixes/11118 
Fixes #11118
 2021-07-18 19:14:58 +00:00
NadyrandGitHub 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
NadyrandGitHub b16aed9159 powder that makes you say yes 2021-07-15 20:24:02 -04:00
NadyrandGitHub a0413ee291 Merge branch 'master' into upstream-merge-11090 2021-07-15 19:26:08 -04:00
NadyrandGitHub 1837f4a8ea Merge branch 'master' into upstream-merge-11054 2021-07-15 19:17:43 -04:00
NadyrandGitHub 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 BotandDarlantan 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 SieyesandChompstation Bot 506d9d53f4 Merge pull request #10847 from MarinaGryphon/nailpolish 
Adds nail polish.
 2021-07-05 23:56:25 +00:00
Chompstation Bot f32c5af649 Adds tgui-style input modals for text, message, and num 2021-07-04 04:24:41 +00:00
Chompstation Bot e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
NadyrandGitHub e5f3ca6219 powder that makes you say yes 2021-07-01 19:39:04 -04:00
NadyrandGitHub 6c09c744d6 powder that makes you say yes 2021-07-01 19:37:00 -04:00
Chompstation Bot b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
RazgrizandGitHub 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
RazgrizandGitHub 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
NovacatandChompstation Bot 35177da700 Merge pull request #10743 from Heroman3003/M-U-G 
Adds Mug with Text to loadout
 2021-06-24 07:24:20 +00:00
RazgrizandGitHub c687ed18ef Update 01_basic.dm 2021-06-23 15:48:13 -07:00
RazgrizandGitHub d869885761 Merge pull request #2273 from CHOMPStationBot/upstream-merge-10733 
[MIRROR] Add approved fluff item
 2021-06-23 15:00:16 -07:00
NovacatandChompstation Bot cc58b4c1de Merge pull request #10733 from Very-Soft/shine 
Add approved fluff item
 2021-06-22 23:24:24 +00:00
NovacatandChompstation Bot 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
NadyrandGitHub 374e896bfc Merge pull request #2212 from CHOMPStationBot/upstream-merge-10660 
[MIRROR] ITV Merchandise (Talon Gear)
 2021-06-19 21:25:44 -04:00
NadyrandGitHub b3ccdb22a9 powder that makes you say yes 2021-06-19 21:00:46 -04:00
NadyrandGitHub bfd8b22c39 powder that makes you say yes 2021-06-19 20:50:43 -04:00