Commit Graph

21129 Commits

Author SHA1 Message Date
Trilbyspaceclone
60e89a6ca4 wrong w_class 2019-06-08 16:19:16 -04:00
Trilbyspaceclone
b073c29b19 Update all_nodes.dm 2019-06-08 16:17:49 -04:00
Trilbyspaceclone
3b941210e5 Update medical_designs.dm 2019-06-08 16:16:17 -04:00
Trilbyspaceclone
a86d6fd9cc Update firstaid.dm 2019-06-08 16:06:36 -04:00
CitadelStationBot
90d0ce5897 Automatic changelog generation for PR #8567 [ci skip] 2019-06-08 14:05:28 -05:00
kevinz000
543c9c07e2 Merge pull request #8567 from Arturlang/RPD-Update
You can now use an RPD on windows and Grilles.
2019-06-08 12:05:26 -07:00
CitadelStationBot
2288346876 Automatic changelog generation for PR #8566 [ci skip] 2019-06-08 14:05:19 -05:00
kevinz000
be9a551eea Merge pull request #8566 from Ghommie/Ghommie-cit39
Different combat mode message if user is on help intent.
2019-06-08 12:05:17 -07:00
Ghommie
53d5ad5820 no exclamation point. 2019-06-08 14:45:26 +02:00
Ghommie
fc536dcfe4 Urist McSpaceman goes vigilant!
Urist McSpaceman seems attentive!
Urist McSpaceman looks alert!
2019-06-08 14:44:40 +02:00
CitadelStationBot
b2e964f169 Automatic changelog generation for PR #8514 [ci skip] 2019-06-08 05:53:15 -05:00
kevinz000
b69986e544 Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements
Arcade Loot Improvements + Battlemachine Tweaks
2019-06-08 03:53:13 -07:00
kevinz000
50cee124c5 Merge pull request #8563 from Sishen1542/Prideful
Pride-struck Hammer in hands/on back
2019-06-08 03:00:05 -07:00
CitadelStationBot
26ffc2ef38 Automatic changelog generation for PR #8522 [ci skip] 2019-06-08 03:32:54 -05:00
kevinz000
bd0e16461b Merge pull request #8522 from Useroth/changeling-hentai
Made the changeling tentacle disarm a bit more reliable.
2019-06-08 01:32:52 -07:00
CitadelStationBot
e8665aef4f Automatic changelog generation for PR #8556 [ci skip] 2019-06-08 03:29:44 -05:00
kevinz000
d36b8068fa Merge pull request #8556 from Poojawa/ninja-speak
Gives Ninjas back their Weeb speech modification
2019-06-08 01:29:42 -07:00
CitadelStationBot
1ac9235ca2 Automatic changelog generation for PR #8560 [ci skip] 2019-06-08 03:27:45 -05:00
kevinz000
d28754cb4d Merge pull request #8560 from Ghommie/Ghommie-cit37
Ports in the fix against hitting oneself with one's own thrown items.
2019-06-08 01:27:43 -07:00
CitadelStationBot
511377e0e1 Automatic changelog generation for PR #8559 [ci skip] 2019-06-08 03:26:47 -05:00
kevinz000
658f14275b Merge pull request #8559 from Ghommie/Ghommie-cit36
Ports in the get_area conversion to define.
2019-06-08 01:26:45 -07:00
CitadelStationBot
9953f1bae8 Automatic changelog generation for PR #8558 [ci skip] 2019-06-08 03:26:29 -05:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00
CitadelStationBot
8807e7ea1d Automatic changelog generation for PR #8557 [ci skip] 2019-06-08 03:26:19 -05:00
kevinz000
4650e4d353 Merge pull request #8557 from Ghommie/Ghommie-cit34
Ports the fix for that stupid z-level edge pull breaking bug.
2019-06-08 01:26:17 -07:00
CitadelStationBot
3d5b220c1a Automatic changelog generation for PR #8555 [ci skip] 2019-06-08 03:25:39 -05:00
kevinz000
aca85123be Merge pull request #8555 from Ghommie/Ghommie-cit32
Updates radials, makes RCD and RCL use em.
2019-06-08 01:25:37 -07:00
CitadelStationBot
3eec46a8b9 Automatic changelog generation for PR #8554 [ci skip] 2019-06-08 03:25:01 -05:00
kevinz000
1488af1a52 Merge pull request #8554 from Ghommie/Ghommie-cit33
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
2019-06-08 01:24:59 -07:00
CitadelStationBot
3b2a8fdc66 Automatic changelog generation for PR #8553 [ci skip] 2019-06-08 03:24:37 -05:00
kevinz000
eb1c767ab7 Merge pull request #8553 from Poojawa/ghost-erp
Clarifies a few things about subtler and how it should be used
2019-06-08 01:24:36 -07:00
CitadelStationBot
aaf841aa72 Automatic changelog generation for PR #8552 [ci skip] 2019-06-08 03:24:19 -05:00
kevinz000
ae5d4de111 Merge pull request #8552 from Ghommie/Ghommie-cit31
Ports "Fixes goonchat cookies not saving properly."
2019-06-08 01:24:16 -07:00
CitadelStationBot
9314656c7c Automatic changelog generation for PR #8551 [ci skip] 2019-06-08 03:24:01 -05:00
kevinz000
95abaf6a6e Merge pull request #8551 from Ghommie/Ghommie-cit30
Port paradise goonchat uridecode fix
2019-06-08 01:23:59 -07:00
CitadelStationBot
22b634fe61 Automatic changelog generation for PR #8549 [ci skip] 2019-06-08 03:23:33 -05:00
kevinz000
4050ba98eb Merge pull request #8549 from Trilbyspaceclone/patch-168
Fixes a unseen paper work exsplote
2019-06-08 01:23:31 -07:00
CitadelStationBot
876850b325 Automatic changelog generation for PR #8548 [ci skip] 2019-06-08 03:22:54 -05:00
kevinz000
1ad200fcf4 Merge pull request #8548 from dtfe3/dtfe3-loadout-schoolgirl
Schoolgirl outfits for the loadout menu
2019-06-08 01:22:52 -07:00
CitadelStationBot
d593d32ed4 Automatic changelog generation for PR #8547 [ci skip] 2019-06-08 03:22:18 -05:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
CitadelStationBot
a6d7e618f1 Automatic changelog generation for PR #8544 [ci skip] 2019-06-08 03:21:43 -05:00
kevinz000
88990f5ae0 Merge pull request #8544 from Trilbyspaceclone/patch-166
Makes ice cream vats and food carts buy-able via cargo
2019-06-08 01:21:41 -07:00
CitadelStationBot
6dfde9654f Automatic changelog generation for PR #8541 [ci skip] 2019-06-08 03:21:30 -05:00
kevinz000
a37bf5bfaf Merge pull request #8541 from Trilbyspaceclone/patch-164
Adds implanter and implanter cases to syndie surgery bags
2019-06-08 01:21:28 -07:00
CitadelStationBot
886978e46b Automatic changelog generation for PR #8540 [ci skip] 2019-06-08 03:17:06 -05:00
kevinz000
9edac9fc6c Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
Rebalanced Ass Slapping
2019-06-08 01:17:04 -07:00
CitadelStationBot
457a6bcdc1 Automatic changelog generation for PR #8543 [ci skip] 2019-06-08 03:16:00 -05:00
kevinz000
a866ceb8a2 Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
2019-06-08 01:15:58 -07:00
CitadelStationBot
ba849b83af Automatic changelog generation for PR #8569 [ci skip] 2019-06-08 03:13:39 -05:00