Commit Graph

25341 Commits

Author SHA1 Message Date
kevinz000
281b254066 Merge pull request #9594 from Hatterhat/patch-3
Shoes can now hold all pistols
2019-10-24 18:56:59 -07:00
kevinz000
3e455f76e9 Merge pull request #9591 from Ghommie/Ghommie-cit261
Ports "Avoid generating the atom colour list on the lighting object"
2019-10-24 18:56:26 -07:00
CitadelStationBot
8c5293b8b0 Automatic changelog generation for PR #9582 [ci skip] 2019-10-24 20:55:32 -05:00
kevinz000
d5041b7dde Merge pull request #9582 from Putnam3145/dynamic-config
Adding dynamic rules to the game config
2019-10-24 18:55:29 -07:00
CitadelStationBot
5015a320c6 Automatic changelog generation for PR #9542 [ci skip] 2019-10-24 20:51:36 -05:00
kevinz000
9a74d91106 Merge pull request #9542 from Trilbyspaceclone/patch-231
Lowers Cargo most packs down to Pre- MK I Cargo rework*
2019-10-24 18:51:34 -07:00
CitadelStationBot
ca38a6d606 Automatic changelog generation for PR #9564 [ci skip] 2019-10-24 20:49:50 -05:00
kevinz000
d8fc3e7211 Merge pull request #9564 from kappa-sama/aliumtators
The syndicate are led by aliens.
2019-10-24 18:49:48 -07:00
CitadelStationBot
c0ae552b45 Automatic changelog generation for PR #9548 [ci skip] 2019-10-24 20:48:35 -05:00
kevinz000
02a1aaea34 Merge pull request #9548 from Ghommie/Ghommie-cit251
Fixing radio emotes conflict with drunk memes.
2019-10-24 18:48:33 -07:00
CitadelStationBot
dec1dd41c0 Automatic changelog generation for PR #9550 [ci skip] 2019-10-24 20:48:11 -05:00
kevinz000
eb50df892a Merge pull request #9550 from Ghommie/Ghommie-cit253
Fixes temporary transformation sting triggering heart attacks on heartless humans.
2019-10-24 18:48:09 -07:00
kevinz000
4b2b3a26b3 Merge pull request #9577 from Feasel/patch-1
[Balance Pass] - Supermatter Mega Delam (Tesla)
2019-10-24 18:47:29 -07:00
CitadelStationBot
59c9972e5e Automatic changelog generation for PR #9585 [ci skip] 2019-10-24 20:46:29 -05:00
kevinz000
d0e9f63734 Merge pull request #9585 from Ghommie/Ghommie-cit257
Fixes artificier lesser magic missile.
2019-10-24 18:46:27 -07:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw
Adds posibrains to the spawners menu for ghosts.
2019-10-24 18:45:57 -07:00
BlackMajor
16998d8814 Merge pull request #9193 from Citadel-Station-13/kevinz000-patch-77
Disables crit_threshold changes through mood
2019-10-25 14:38:51 +13:00
CitadelStationBot
29d464b3a2 Automatic changelog generation for PR #9587 [ci skip] 2019-10-24 20:38:41 -05:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2019-10-24 18:38:39 -07:00
CitadelStationBot
05516aad97 Automatic changelog generation for PR #9589 [ci skip] 2019-10-24 20:38:18 -05:00
kevinz000
f9120ed9e1 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2019-10-24 18:38:15 -07:00
kevinz000
9fd3ef7801 Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again 2019-10-24 18:36:04 -07:00
Ghommie
a62fcdcccb forgot about the file extension. 2019-10-25 03:34:13 +02:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
kevinz000
31f9ed9665 fixes 2019-10-24 15:31:45 -07:00
Ghommie
4b0b130c36 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 00:27:04 +02:00
Ghommie
85b35433b2 Unmodularize Eutactic Blades. 2019-10-25 00:14:38 +02:00
Ghommie
238fca4e59 2 2019-10-24 23:42:02 +02:00
Ghommie
6fbe7f9086 unmodularize events 2019-10-24 23:41:31 +02:00
Ghommie
6f19899dd2 Unmodularize research. 2019-10-24 23:28:15 +02:00
Ghommie
29584aff69 emagged travis now succeeds. 2019-10-24 23:11:18 +02:00
Ghommie
0da6ae549f Unmodularize vox sounds 2019-10-24 23:02:21 +02:00
Ghommie
0a829a8517 .dme updates when compiling, closing or opening the program, but not when deleting a file with dreammaker. 2019-10-24 22:52:32 +02:00
Ghommie
f035d77b53 Slips. 2019-10-24 22:50:53 +02:00
Ghommie
2a07bf95d8 Unmodularize job types 2019-10-24 22:44:40 +02:00
Ghommie
cd6e9e22b1 avacuate dreammaker. 2019-10-24 22:17:23 +02:00
Ghommie
f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +02:00
Ghommie
6b95611ae9 another 3 px 2019-10-24 20:59:13 +02:00
Ghommie
17a79bc7f9 Offsets the new linen bin sprites 3 pixels up. 2019-10-24 20:56:06 +02:00
Trilbyspaceclone
841f9ae878 Update lavaland_surface_ash_walker1.dmm 2019-10-24 10:05:26 -04:00
Ghommie
aeca5f5fb2 ffs 2019-10-24 12:21:57 +02:00
Ghommie
da03439ac8 Ports "New Revenant icons" 2019-10-24 12:21:37 +02:00
Ghommie
7b257242c2 bullets won't work... 2019-10-24 10:44:57 +02:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
deathride58
0ae8953da9 various runtime fixes - plasman tounges no longer have a maxhealth value of "alien", simplemobs no longer runtime when shot, removing filters from something that lacks filters now works 2019-10-24 02:52:40 -04:00
YakumoChen
3e9dfd6441 i was suggested to try this 2019-10-24 02:59:15 +00:00
YakumoChen
c6939864c1 and this 2019-10-24 02:42:38 +00:00
YakumoChen
5a9f0aa1e4 this too 2019-10-24 02:33:48 +00:00
YakumoChen
3ec63ed12d I think I forgot this 2019-10-24 02:32:21 +00:00