Commit Graph
27400 Commits
Author SHA1 Message Date
CitadelStationBot 92c88f71c3 Automatic changelog generation for PR #10298 [ci skip] 2019-12-27 06:37:41 -06:00
GhomandGitHub afd22cf618 Merge pull request #10298 from kappa-sama/patch-12
nerfs chain smokers, removes stocks
2019-12-27 13:37:38 +01:00
CitadelStationBot 56b9d3ef61 Automatic changelog generation for PR #10264 [ci skip] 2019-12-27 06:27:07 -06:00
GhomandGitHub 5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
2019-12-27 13:27:04 +01:00
Seris02 b4b6e550e4 Merge branch 'wintercoatsagain' of https://github.com/Seris02/Citadel-Station-13 into wintercoatsagain 2019-12-27 18:10:51 +08:00
Seris02 8ed4fe9c05 changes 2019-12-27 18:09:30 +08:00
e97ca5f924 yeah fair enough
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-26 14:22:03 -05:00
CitadelStationBot 05775ae5f6 Automatic changelog generation for PR #10250 [ci skip] 2019-12-26 09:11:57 -06:00
GhomandGitHub 05bde370ec Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis
Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code
2019-12-26 16:11:54 +01:00
CitadelStationBot 34c36161fc Automatic changelog generation for PR #10281 [ci skip] 2019-12-26 09:07:48 -06:00
GhomandGitHub 12d0a2ee4c Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
2019-12-26 16:07:45 +01:00
CitadelStationBot 4c6673b651 Automatic changelog generation for PR #10283 [ci skip] 2019-12-26 09:07:21 -06:00
GhomandGitHub 12ca3a008e Merge pull request #10283 from Detective-Google/unfuckhair
unfucks short hair 80s
2019-12-26 16:07:18 +01:00
GhomandGitHub 0e16f4052d Merge pull request #10292 from Citadel-Station-13/miku-fix
fixes bad sprite states
2019-12-26 16:06:19 +01:00
CitadelStationBot fac8f5dd84 Automatic changelog generation for PR #10128 [ci skip] 2019-12-26 06:58:48 -06:00
GhomandGitHub 512d046f18 Merge pull request #10128 from Seris02/clownheadset
gives the clown a headset with a clown megaphone loudmode
2019-12-26 13:58:45 +01:00
Seris02andGitHub e125dae871 yee 2019-12-26 16:36:01 +08:00
kappa-samaandGitHub 4689d805a3 e 2019-12-26 02:54:38 -05:00
CitadelStationBot 7892d84f09 Automatic changelog generation for PR #10237 [ci skip] 2019-12-25 13:06:49 -06:00
LinandGitHub 5670276c70 Merge pull request #10237 from Ghommie/Ghommie-cit479
Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.
2019-12-25 19:06:46 +00:00
CitadelStationBot 1320952cdf Automatic changelog generation for PR #10242 [ci skip] 2019-12-25 13:03:45 -06:00
LinandGitHub 1931a2f715 Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
2019-12-25 19:03:42 +00:00
Jay b33a167906 fixes bad sprite states 2019-12-25 02:22:10 -06:00
Hatterhat f3fed71e08 ah, the wonders of atomization 2019-12-24 21:28:32 -06:00
CitadelStationBot 765832373d Automatic changelog generation for PR #10266 [ci skip] 2019-12-24 20:43:32 -06:00
GhomandGitHub e7cf680ca7 Merge pull request #10266 from shellspeed1/master
New insect marking customization option and three new wings.
2019-12-25 03:43:29 +01:00
Detective Google a480d00c94 unfucks short hair 80s so the left facing sprite doesnt make you look like a crackhead 2019-12-24 17:05:07 -06:00
CitadelStationBot c50c1ee4df Automatic changelog generation for PR #10282 [ci skip] 2019-12-24 15:07:44 -06:00
kevinz000andGitHub c022325159 Merge pull request #10282 from Putnam3145/fix-config
Updating dynamic config, some balancing
2019-12-24 13:07:40 -08:00
Putnam ca1f7839bb Updating dynamic config, some balancing 2019-12-24 10:10:24 -08:00
CitadelStationBot b48f18fbc6 Automatic changelog generation for PR #9751 [ci skip] 2019-12-24 09:57:13 -06:00
GhomandGitHub c38611afcd Merge pull request #9751 from Seris02/rising_bass
RISING BASS, THE NEW MARTIAL ARTS
2019-12-24 16:57:10 +01:00
Seris02 a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Seris02 85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08:00
Seris02 9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00
Hatterhat d1c96237a6 the very shitty idea: "muh speedloader" 2019-12-24 04:16:33 -06:00
Hatterhat 681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06:00
CitadelStationBot 6150dc5a15 Automatic changelog generation for PR #10269 [ci skip] 2019-12-23 18:56:10 -06:00
LinandGitHub a0b90158c4 Merge pull request #10269 from Ghommie/Ghommie-cit488
Fix goose meat.
2019-12-24 00:56:07 +00:00
CitadelStationBot 3f42677254 Automatic changelog generation for PR #10245 [ci skip] 2019-12-23 11:58:28 -06:00
GhomandGitHub 9a022f21eb Merge pull request #10245 from r4d6/substationV2
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
2019-12-23 18:58:26 +01:00
r4d6 0a3e370a93 Move the config up to avoid conflict 2019-12-23 12:45:40 -05:00
r4d6 01a8fe1cd6 Add config options 2019-12-23 12:41:52 -05:00
r4d6 b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn""
This reverts commit d851beea16.
2019-12-23 10:25:37 -05:00
r4d6 d851beea16 Revert "Add the option to restrict the Engine that spawn"
This reverts commit e3e1f91635.
2019-12-23 10:23:55 -05:00
r4d6 e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
CitadelStationBot 069274ee33 Automatic changelog generation for PR #10274 [ci skip] 2019-12-23 06:41:13 -06:00
GhomandGitHub 37a6abd889 Merge pull request #10274 from kappa-sama/kappa-sama-patch-1
no more 40% time dilation from broodmother
2019-12-23 13:41:10 +01:00
CitadelStationBot 71a667ead0 Automatic changelog generation for PR #10218 [ci skip] 2019-12-23 02:45:25 -06:00
kevinz000andGitHub 85ceda474e Merge pull request #10218 from GrayRachnid/ADDS-MINERS
Adds gas miners to all maps.
2019-12-23 00:45:22 -08:00