Commit Graph

26353 Commits

Author SHA1 Message Date
Putnam
1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
CitadelStationBot
81977819ac Automatic changelog generation for PR #9964 [ci skip] 2019-11-29 08:20:20 -06:00
Putnam3145
ad53b10faa Merge pull request #9964 from GrayRachnid/fixmyblunder
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2019-11-29 06:20:18 -08:00
CitadelStationBot
7f0f8e0be8 Automatic changelog generation for PR #9996 [ci skip] 2019-11-29 08:16:39 -06:00
Putnam3145
4f018b070f Merge pull request #9996 from Ghommie/Ghommie-cit413
Fixes tinfoil hats giving random traumas.
2019-11-29 06:16:36 -08:00
Putnam3145
3b437417b9 Merge pull request #10000 from Citadel-Station-13/kevinz000-patch-119
Nerfs nanite adrenals
2019-11-29 05:42:49 -08:00
Ghommie
5aed21a6f0 It's just list tabbing, gray. 2019-11-29 07:43:31 +01:00
kevinz000
bcfa9c6c4d Merge pull request #9956 from Linzolle/duke-beret
Donator item fix
2019-11-28 23:12:35 -07:00
kevinz000
f0f2063884 Merge pull request #9958 from Ghommie/Ghommie-cit396
Ports a few telecomms updates and fixes.
2019-11-28 23:12:19 -07:00
CitadelStationBot
0c76c19e32 Automatic changelog generation for PR #9960 [ci skip] 2019-11-29 00:11:59 -06:00
kevinz000
521fdec59b Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
2019-11-28 23:11:57 -07:00
CitadelStationBot
b831ea4029 Automatic changelog generation for PR #9962 [ci skip] 2019-11-29 00:11:39 -06:00
kevinz000
ace239fe8f Merge pull request #9962 from Ghommie/Ghommie-cit399
Fixes limbs' set_disabled.
2019-11-28 23:11:36 -07:00
CitadelStationBot
d055cb5c6c Automatic changelog generation for PR #9965 [ci skip] 2019-11-29 00:11:26 -06:00
kevinz000
40179da15e Merge pull request #9965 from GrayRachnid/addfuntothekitchen
Adds Fun to the Kitchen's stacking skills
2019-11-28 23:11:24 -07:00
CitadelStationBot
9df49144f5 Automatic changelog generation for PR #9967 [ci skip] 2019-11-29 00:11:07 -06:00
kevinz000
bd43a08347 Merge pull request #9967 from Ghommie/Ghommie-cit401
Ports "Plasmamen get plasma in their box"
2019-11-28 23:11:05 -07:00
CitadelStationBot
0c23aad351 Automatic changelog generation for PR #9966 [ci skip] 2019-11-29 00:08:35 -06:00
kevinz000
4183d00da2 Merge pull request #9966 from Ghommie/Ghommie-cit400
Ports elements: Lightweight shared/global components.
2019-11-28 23:08:32 -07:00
CitadelStationBot
7a4d7c0089 Automatic changelog generation for PR #9969 [ci skip] 2019-11-29 00:04:37 -06:00
kevinz000
f287af694b Merge pull request #9969 from Linzolle/hat-man-bad
revert knocking people's hats off
2019-11-28 23:04:34 -07:00
kevinz000
7495ce602a Merge pull request #9693 from Ghommie/Ghommie-cit310
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-28 23:03:07 -07:00
kevinz000
2c19c55fc3 Update nanite_programs.dm 2019-11-28 23:00:09 -07:00
Ghommie
7990d1328b Fixes tinfoil hats giving random traumas. 2019-11-29 06:48:52 +01:00
CitadelStationBot
a105f55e38 Automatic changelog generation for PR #9957 [ci skip] 2019-11-28 13:21:57 -06:00
Lin
53927c97fd Merge pull request #9957 from Ghommie/Ghommie-cit395
fixes missing hypereutactic left inhand sprites.
2019-11-28 19:21:54 +00:00
CitadelStationBot
65c0ef72c8 Automatic changelog generation for PR #9959 [ci skip] 2019-11-28 13:16:47 -06:00
Lin
a5b5fb729a Merge pull request #9959 from Ghommie/Ghommie-cit397
patching some combat mode edge cases and issues.
2019-11-28 19:16:44 +00:00
CitadelStationBot
5b16fc4868 Automatic changelog generation for PR #9948 [ci skip] 2019-11-28 13:12:28 -06:00
Lin
46c02af86e Merge pull request #9948 from Ghommie/Ghommie-cit393
Morgues no longer go "ammunition depleted"
2019-11-28 19:12:25 +00:00
CitadelStationBot
a5e5e20e00 Automatic changelog generation for PR #9943 [ci skip] 2019-11-28 07:37:39 -06:00
Putnam3145
09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
Ports AI console focus loss fix and fixes an error in my trimline code
2019-11-28 05:37:36 -08:00
GrayRachnid
b6df1126bb Can't I make a PR without having to make 2 commits to fix my mistakes oh my god 2019-11-27 22:52:21 -05:00
Linzolle
829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
2019-11-27 20:23:33 -06:00
Ghommie
1795072f94 Mistakes were made. 2019-11-28 02:47:09 +01:00
Ghommie
efcf79aab0 teachin' 🅱️ how to swim 2019-11-28 02:32:43 +01:00
Ghommie
13b9158a44 Ports "Plasmamen get plasma in their box" 2019-11-28 02:30:03 +01:00
Ghommie
dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +01:00
GrayRachnid
ad6684380c You can now stack stuff pretty high 2019-11-27 18:39:11 -05:00
GrayRachnid
6a13801c1a I assume this is what ghommie meant 2019-11-27 18:34:36 -05:00
GrayRachnid
de43339d56 made it actually compile 2019-11-27 16:42:28 -05:00
GrayRachnid
47e3cd346f Fixes codewords and MKUltra enthrall hearing. 2019-11-27 16:36:19 -05:00
Ghommie
a5298dac7e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-27 21:44:56 +01:00
Ghommie
792f1947a7 Fixes limbs' set_disabled. 2019-11-27 19:45:27 +01:00
Ghommie
252c37f421 whops 2 2019-11-27 08:31:21 +01:00
Ghommie
b432ec4f33 Whops 2019-11-27 08:25:13 +01:00
Ghommie
a89eccbac5 Ports custom reagent icecreams, plus some fixes. 2019-11-27 08:16:17 +01:00
Ghommie
3f077df500 redundant. 2019-11-27 06:40:32 +01:00
Ghommie
d1d201ff26 Sanity check. 2019-11-27 06:39:09 +01:00
Ghommie
d43d996c38 ouch 2019-11-27 06:19:17 +01:00