Commit Graph

24144 Commits

Author SHA1 Message Date
Ghommie
cfccacafbf Stops all graffiti decals from being named "letter". 2019-10-09 01:54:38 +02:00
CitadelStationBot
47c18fd052 Automatic changelog generation for PR #9445 [ci skip] 2019-10-08 07:54:47 -05:00
kevinz000
1d501342b9 Merge pull request #9445 from Thalpy/PANIC
[speedmerge] travis
2019-10-08 05:54:44 -07:00
Fermi
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
kevinz000
b37cd80d9c Merge pull request #9443 from Thalpy/PANIC
[SPEEDMERGE][PANIC] Fixes all of citadel with supercode.
2019-10-08 05:00:53 -07:00
Fermi
a9ad80691e Okay this too 2019-10-08 12:57:06 +01:00
Fermi
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
76ede7a473 Merge pull request #9406 from Poojawa/carpet-colors
More Carpet colors and liquid carpet varients
2019-10-07 23:39:52 -07:00
Thalpy
4538c43ede Oops 2019-10-08 07:39:41 +01:00
Thalpy
f7d14ebb2c Damnit webedit 2019-10-08 07:39:19 +01:00
CitadelStationBot
72f6a8af85 Automatic changelog generation for PR #9418 [ci skip] 2019-10-08 01:36:13 -05:00
kevinz000
dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
CitadelStationBot
d3d64a7887 Automatic changelog generation for PR #9431 [ci skip] 2019-10-08 01:35:20 -05:00
kevinz000
7c94029006 Merge pull request #9431 from Ghommie/Ghommie-cit221
Ports "Makes the illegal tech node harder to unlock"
2019-10-07 23:35:18 -07:00
CitadelStationBot
36cde7e245 Automatic changelog generation for PR #9413 [ci skip] 2019-10-08 01:32:51 -05:00
kevinz000
d3f29c4084 Merge pull request #9413 from Poojawa/sprays-obey-fashion
Makes Medsprays align with patches
2019-10-07 23:32:48 -07:00
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
CitadelStationBot
1cfcfb8e2e Automatic changelog generation for PR #9309 [ci skip] 2019-10-08 01:29:21 -05:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
CitadelStationBot
46d6cf8a17 Automatic changelog generation for PR #9410 [ci skip] 2019-10-07 18:24:40 -05:00
nik707
de117afd8b Merge pull request #9410 from Poojawa/cryopod-tweaks
Fixes Cryopod quirks, makes the menu not complete shit
2019-10-07 18:24:38 -05:00
CitadelStationBot
e60f9534cb Automatic changelog generation for PR #9379 [ci skip] 2019-10-07 18:23:26 -05:00
nik707
b46c41cafd Merge pull request #9379 from jakeramsay007/Medbay-Doors
Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps
2019-10-07 18:23:23 -05:00