Commit Graph
24170 Commits
Author SHA1 Message Date
Thalpy 41946dd9cf Updates icons 2019-10-10 09:27:15 +01:00
Thalpy 348f6a4db4 Fixes Icons 2019-10-10 07:36:44 +01:00
Thalpy eaa84418c9 Fixes compile errors 2019-10-10 07:17:22 +01:00
FermiandFermi 8f9622cbe2 Well lets try it 2019-10-09 18:01:09 +01:00
FermiandFermi 53e8d64388 Ah I see now 2019-10-09 17:51:14 +01:00
FermiandFermi 746a656c27 Merge branch 'master' into Spookytime 2019-10-09 16:44:39 +01:00
FermiandFermi 35fe28ce43 oof 2019-10-09 16:40:55 +01:00
FermiandFermi 8a7f27803c Maybe 2019-10-09 16:40:01 +01:00
FermiandFermi c4ac815598 Oof 2019-10-09 16:35:20 +01:00
FermiandFermi 3eea5310c9 Ugh 2019-10-09 16:32:55 +01:00
FermiandFermi b023671db4 Damnit Jaqc 2019-10-09 16:22:09 +01:00
FermiandFermi 146e0aae29 Crashes make me sad 2019-10-09 15:03:04 +01:00
FermiandFermi b34f648e60 Adds landmarks. 2019-10-09 13:57:19 +01:00
FermiandFermi b19c078447 Restructuring. 2019-10-09 12:09:41 +01:00
FermiandFermi 1dce18962d Jaqc complete. 2019-10-09 11:58:36 +01:00
FermiandFermi 9071826e70 I can't focus 2019-10-09 08:34:16 +01:00
CitadelStationBot 47c18fd052 Automatic changelog generation for PR #9445 [ci skip] 2019-10-08 07:54:47 -05:00
kevinz000andGitHub 1d501342b9 Merge pull request #9445 from Thalpy/PANIC
[speedmerge] travis
2019-10-08 05:54:44 -07:00
FermiandFermi 10ce91c686 aaa 2019-10-08 13:45:16 +01:00
CitadelStationBot 9e96f76625 Automatic changelog generation for PR #9443 [ci skip] 2019-10-08 07:00:55 -05:00
kevinz000andGitHub b37cd80d9c Merge pull request #9443 from Thalpy/PANIC
[SPEEDMERGE][PANIC] Fixes all of citadel with supercode.
2019-10-08 05:00:53 -07:00
FermiandFermi a9ad80691e Okay this too 2019-10-08 12:57:06 +01:00
FermiandFermi f0e803f056 PANIC 2019-10-08 12:38:39 +01:00
CitadelStationBot 492e9c9d08 Automatic changelog generation for PR #9389 [ci skip] 2019-10-08 02:38:18 -05:00
kevinz000andGitHub 1d7deedd34 Merge pull request #9389 from Weblure/beepsky-animation-port
Ports Beepsky Animations
2019-10-08 00:38:16 -07:00
CitadelStationBot 8c7b539585 Automatic changelog generation for PR #9391 [ci skip] 2019-10-08 02:36:28 -05:00
kevinz000andGitHub 922e9849bd Merge pull request #9391 from GrayRachnid/rebalancesk9borgs
Rebalances k9borg pounce/bite around the secborg's baton.
2019-10-08 00:36:26 -07:00
CitadelStationBot 922c202363 Automatic changelog generation for PR #9421 [ci skip] 2019-10-08 02:35:00 -05:00
kevinz000andGitHub fe1a78f413 Merge pull request #9421 from Ghommie/Ghommie-cit218
Porting some spraycan fixes and tweaks.
2019-10-08 00:34:58 -07:00
CitadelStationBot 0a29acb9ef Automatic changelog generation for PR #9427 [ci skip] 2019-10-08 02:34:35 -05:00
kevinz000andGitHub abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
2019-10-08 00:34:33 -07:00
CitadelStationBot 6910835976 Automatic changelog generation for PR #9404 [ci skip] 2019-10-08 02:34:11 -05:00
kevinz000andGitHub 143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2019-10-08 00:34:07 -07:00
CitadelStationBot 0a9589f8cd Automatic changelog generation for PR #9316 [ci skip] 2019-10-08 02:33:24 -05:00
kevinz000andGitHub 8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
2019-10-08 00:33:21 -07:00
CitadelStationBot f57d185580 Automatic changelog generation for PR #9226 [ci skip] 2019-10-08 02:30:56 -05:00
kevinz000andGitHub 6fc746a5af Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
2019-10-08 00:30:54 -07:00
CitadelStationBot 909fcd61f7 Automatic changelog generation for PR #9287 [ci skip] 2019-10-08 02:30:03 -05:00
kevinz000andGitHub 3d404b6967 Merge pull request #9287 from Thalpy/Wiki
Adds a markdown parse of all chems for use with github wiki to debug menu.
2019-10-08 00:30:00 -07:00
CitadelStationBot 52b3301819 Automatic changelog generation for PR #9314 [ci skip] 2019-10-08 02:29:44 -05:00
kevinz000andGitHub 26b076c5aa Merge pull request #9314 from Trilbyspaceclone/patch-228
Makes blood gun take 1/4 the blood to use
2019-10-08 00:29:41 -07:00
CitadelStationBot 13a60ad179 Automatic changelog generation for PR #9032 [ci skip] 2019-10-08 02:28:08 -05:00
kevinz000andGitHub 06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178
Ports plasmaman departmental envirosuits and tweaks.
2019-10-08 00:28:06 -07:00
CitadelStationBot 7677c4d827 Automatic changelog generation for PR #8937 [ci skip] 2019-10-08 02:25:54 -05:00
kevinz000andGitHub f405cd1be3 Merge pull request #8937 from Ghommie/Ghommie-cit153
darkmode/lightmode fixes and tweaks.
2019-10-08 00:25:51 -07:00
Thalpy f592fc325e Formmating 2019-10-08 07:47:10 +01:00
Thalpy edb26eeaeb Master of confusion 2019-10-08 07:44:32 +01:00
Thalpy 281c6e04e8 Hmm 2019-10-08 07:43:51 +01:00
CitadelStationBot ec059492f9 Automatic changelog generation for PR #9406 [ci skip] 2019-10-08 01:39:55 -05:00
kevinz000andGitHub 76ede7a473 Merge pull request #9406 from Poojawa/carpet-colors
More Carpet colors and liquid carpet varients
2019-10-07 23:39:52 -07:00