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
536a6cb6e7257f0482bc3f66040bf824d6ebeaf6
Commit Graph

2507 Commits

Author SHA1 Message Date
Nadyr
dd61782517 Merge pull request #3103 from CHOMPStationBot/upstream-merge-11599 
[MIRROR] [MIRROR] fixes crafting reqs not storing parts in the result
 2021-10-25 00:56:41 -04:00
Aronai Sieyes
e5aae33ca0 Merge pull request #11599 from VOREStation/upstream-merge-8296 
[MIRROR] fixes crafting reqs not storing parts in the result
 2021-10-25 00:25:29 +00:00
Aronai Sieyes
33deecbad3 Merge pull request #11589 from VOREStation/upstream-merge-8293 
[MIRROR] Adds multitools to roboticist/engi toolbelts
 2021-10-25 00:05:02 +00:00
Aronai Sieyes
89ad96c63f Merge pull request #11553 from VOREStation/upstream-merge-8184 
[MIRROR] Refactors crafting to support requirement alternatives
 2021-10-22 18:24:39 +00:00
Cyrelius
e079e7b68b Add Vox Civilian hardsuit to Cargo. 2021-10-15 22:07:41 -07:00
Cyrelius
d933b763c4 Merge branch 'CHOMPStation2:master' into master 2021-10-14 21:56:30 -07:00
Cyrelius
3b5959834d Fixed a bug. 
Made a mistake, this fixes it.
 2021-10-14 21:55:56 -07:00
Razgriz
25d431060a Merge pull request #3069 from Cyrelius/master 
Cyrus's Balance Tweaks
 2021-10-14 15:26:33 -07:00
Psik9941
7c03ffc35c Adding //CHOMPEdit comment 
Noted
 2021-10-11 09:09:42 -05:00
Psik9941
730024d25c Update tools.dm 
Adding cable coil to autolathe under the tools category
Default additions just have 1x, 5x, 10x print options.
Looking into a 30x print option to get a max stack, but need to dig through more code to figure out how this is done.
 2021-10-11 08:51:27 -05:00
Cyrelius
a498dcda7c Fixing a mistake. 
Thanks Demintika
 2021-10-11 02:25:52 -07:00
Cyrelius
235f929642 Revert and adjust stupid YW change. 
YW removed the better breacher suit, and that was dumb.  They're restrictive enough as-is.
 2021-10-11 01:45:08 -07:00
Chompstation Bot
ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Casey
35d62f6ea7 Merge pull request #11582 from PastelPrinceDan/autoinjectors 
Adds large autoinjectors to autolathes
 2021-09-24 03:55:25 +00:00
BlackMajor
5fcab51a86 Hyper pads from cit 2021-09-08 16:45:59 +12:00
Nadyr
74c9adf928 powder that makes you say yes 2021-08-27 20:02:35 -04:00
Nadyr
be5b7f3644 Merge pull request #2895 from CHOMPStationBot/upstream-merge-11466 
[MIRROR] Expanding Clothing Options
 2021-08-26 20:50:04 -04:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Chompstation Bot
aba07d1109 Adds the ability to ban people from ghost roles 2021-08-25 13:18:40 +00:00
Nadyr
b2c7a0f527 Merge pull request #2856 from CHOMPStationBot/upstream-merge-11441 
[MIRROR] Fulpstation Labcoats
 2021-08-24 23:22:01 -04:00
Chompstation Bot
7957f049af Fulpstation Labcoats 2021-08-25 00:00:09 +00:00
Chompstation Bot
d189c9a12f Crusher Gaming 2021-08-24 23:58:27 +00:00
Rykka
0151c0ad23 Change Commonwealth References added by #2553 to Solgov 
https://github.com/CHOMPStation2/CHOMPStation2/pull/2553

Added Commonwealth voidsuits from Bay.

Changed these to Solgov to address https://github.com/CHOMPStation2/CHOMPStation2/issues/2598

<3
 2021-08-15 15:34:30 -07:00
Chompstation Bot
2967ef4416 Fancy sprited shuttles 2021-08-06 22:15:49 +00:00
Aronai Sieyes
dfd88b4ba7 Merge pull request #11326 from Verkister/hudbutts 
Fixes the small hud buttons not getting hud colors
 2021-08-02 13:40:43 +00:00
Chompstation Bot
ae737fe4a1 Add arcadey carpets 2021-07-29 20:10:19 +00:00
Aronai Sieyes
b5038715f8 Merge pull request #11242 from VOREStation/upstream-merge-8183 
[MIRROR] Fixes blank ID sprite for HoP/Secretary
 2021-07-25 18:17:32 +00:00
Nadyr
2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179 
[MIRROR] Optimize a couple things
 2021-07-20 21:45:26 -04:00
Nadyr
429eebf5fe powder that makes you say yes 2021-07-20 21:03:34 -04:00
Aronai Sieyes
ab88b2420d Merge pull request #11165 from VOREStation/Arokha/lightport 
Small light optimizations
 2021-07-20 23:03:17 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Nadyr
3320513c69 Merge pull request #2561 from CHOMPStationBot/upstream-merge-11098 
[MIRROR] Add bows, recipe for wooden one
 2021-07-15 20:56:26 -04:00
Nadyr
20e6781341 Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080 
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
 2021-07-15 20:26:17 -04:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Nadyr
7e0df4d4ca Merge branch 'master' into upstream-merge-11065 2021-07-15 19:19:34 -04:00
Chompstation Bot
5843c3776e Add bows, recipe for wooden one 2021-07-15 22:13:21 +00:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Nadyr
19b0e94af7 Merge pull request #2510 from CHOMPStationBot/upstream-merge-11025 
[MIRROR] Fix crafting menu, add plant fiber crafting things
 2021-07-13 22:59:04 -04:00
Nadyr
28b4a57852 Merge pull request #2529 from CHOMPStationBot/upstream-merge-11050 
[MIRROR] Add RSF to autolathes
 2021-07-13 22:55:11 -04:00
Aronai Sieyes
8faa3a57ce Merge pull request #11050 from VOREStation/Arokha/rsf 
Add RSF to autolathes
 2021-07-12 23:47:42 +00:00
Chompstation Bot
50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Aronai Sieyes
d989caaf41 Merge pull request #11021 from VOREStation/Arokha/nifcraftmenus 
Make nif/crafting menu buttons not be hidden
 2021-07-11 19:14:17 +00:00
Nadyr
b90a37b854 Merge pull request #2490 from CHOMPStationBot/upstream-merge-10995 
[MIRROR] Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-10 01:47:51 -04:00
Nadyr
f27ac30e5a Merge pull request #2478 from CHOMPStationBot/upstream-merge-10979 
[MIRROR] Port current SSgarbage from /tg/
 2021-07-10 01:37:07 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Novacat
29b5b3bf05 Merge pull request #10995 from Enzo-Leon/medical_tools 
Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-09 18:24:29 +00:00
Chompstation Bot
8b3a896d98 Port current SSgarbage from /tg/ 2021-07-09 16:13:02 +00:00