Commit Graph

2533 Commits

Author SHA1 Message Date
Casey
b77383ecce Merge pull request #12151 from PastelPrinceDan/catslugcrate
adds a catslug crate to cargo
2022-02-06 14:16:18 +00:00
Nadyr
0cd8c4569a Merge pull request #3591 from CHOMPStation2/upstream-merge-12092
[MIRROR] [MIRROR] Adds a roof to indoor rain sounds
2022-01-29 17:17:12 -05:00
Nadyr
656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs
Porting a hefty chunk of Citadel mobs.
2022-01-29 17:09:18 -05:00
Casey
cf831798bd Merge pull request #12092 from VOREStation/upstream-merge-8369
[MIRROR] Adds a roof to indoor rain sounds
2022-01-28 22:20:30 +00:00
Nadyr
05f5e75b26 powder that makes you say yes 2022-01-22 10:43:43 -05:00
Novacat
501bff423f sword fix attempt three 2022-01-22 14:17:45 +00:00
Nadyr
1938a2ea4f powder that makes you say yes 2022-01-16 23:14:03 -05:00
Casey
dccd954ae4 I don't know why I need to set a name for the crate three times but I… 2022-01-14 18:44:04 +00:00
Nadyr
f62dfdbf4d Merge pull request #3524 from CHOMPStation2/upstream-merge-12042
[MIRROR] Sword crate
2022-01-09 20:57:34 -05:00
Nadyr
f4ad4ec873 Merge pull request #3521 from CHOMPStation2/upstream-merge-12048
[MIRROR] Fixes riding offsets not counting rider size
2022-01-09 20:53:39 -05:00
Nadyr
02fa3eba30 powder that makes you say yes 2022-01-09 20:48:24 -05:00
Casey
b60ad04452 Merge pull request #12016 from PastelPrinceDan/injectorslargo
makes large autoinjectors cheaper
2022-01-09 01:52:14 +00:00
Casey
3fa644b0d6 Sword crate 2022-01-09 01:49:54 +00:00
Casey
8ae533e3f1 Merge pull request #12048 from Verkister/ponyshow2
Fixes riding offsets not counting rider size
2022-01-09 01:49:29 +00:00
Nadyr
8164226256 Merge pull request #3337 from CHOMPStation2/upstream-merge-11874
[MIRROR] Adds prefs for Corgi and Cursed Sword roles
2021-12-12 06:03:10 -05:00
Nadyr
3ccb809e3e powder that makes you say yes 2021-12-11 23:06:22 -05:00
Casey
f7fbce58c1 Merge pull request #11874 from Heroman3003/moreroleprefs
Adds prefs for Corgi and Cursed Sword roles
2021-12-08 22:49:16 +00:00
Nadyr
6bdeaa101d Merge pull request #3232 from CHOMPStation2/upstream-merge-11910
[MIRROR] fixes the commonwealth engi RIG having the wrong crate
2021-12-05 12:09:53 -05:00
Nadyr
ace233ac5d powder that makes you say yes 2021-12-05 11:08:43 -05:00
Nadyr
7600142bd1 powder that makes you say yes 2021-12-03 20:39:05 -05:00
Casey
97312b93c0 fixes the commonwealth engi RIG having the wrong crate 2021-12-03 07:18:09 +00:00
BlackMajor
a3bb4b9b5a Early pr 2021-11-26 15:35:21 +13:00
Nadyr
19246dbed1 Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722
[MIRROR] Hardwood Material Port
2021-10-30 23:30:40 -04:00
Nadyr
b4c8211ef1 powder that makes you say yes 2021-10-30 23:05:20 -04:00
Chompstation Bot
ef6f631360 OFD Supply Packs 2021-10-30 21:25:39 +00:00
Chompstation Bot
da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
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