Commit Graph

23771 Commits

Author SHA1 Message Date
Fermi
00a46fe971 Missed a beaker 2019-09-22 03:03:33 +01:00
Fermi
f301a85cdd Bucket lip 2019-09-22 02:59:08 +01:00
Fermi
a48c881a8c Sprites. 2019-09-22 02:58:23 +01:00
Fermi
bbe6b4ab15 Okay! Should be good. 2019-09-22 02:43:12 +01:00
Fermi
0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
CitadelStationBot
b7221d0b39 Automatic changelog generation for PR #9263 [ci skip] 2019-09-21 03:56:43 -05:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
CitadelStationBot
947b0ab6dc Automatic changelog generation for PR #9310 [ci skip] 2019-09-21 03:50:19 -05:00
kevinz000
4b770acabd Merge pull request #9310 from GrayRachnid/flapwindoors
Adds Windoors to all the flaps on DeltaStation
2019-09-21 01:50:16 -07:00
kevinz000
15aab80d75 Merge pull request #9253 from chefferz/chefferz-balance1
Doubles stamina regen when standing/laying down
2019-09-21 01:48:20 -07:00
CitadelStationBot
3bb5dbc325 Automatic changelog generation for PR #9269 [ci skip] 2019-09-21 03:46:24 -05:00
kevinz000
313956002b Merge pull request #9269 from Thalpy/FermiGrenades
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
CitadelStationBot
e035edd221 Automatic changelog generation for PR #9283 [ci skip] 2019-09-21 03:45:13 -05:00
kevinz000
3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
CitadelStationBot
bc96b21d3f Automatic changelog generation for PR #9282 [ci skip] 2019-09-21 03:43:54 -05:00
kevinz000
f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
CitadelStationBot
8786c0f7f2 Automatic changelog generation for PR #9298 [ci skip] 2019-09-21 03:43:12 -05:00
kevinz000
1fda7755d3 Merge pull request #9298 from Ghommie/Ghommie-cit197
Fixes undershirts n socks colors prefs.
2019-09-21 01:43:10 -07:00
CitadelStationBot
b965c6292d Automatic changelog generation for PR #9292 [ci skip] 2019-09-21 03:42:05 -05:00
kevinz000
5c8e585010 Merge pull request #9292 from Ghommie/Ghommie-cit94
Fixes clown shoes and work boots.
2019-09-21 01:42:03 -07:00
CitadelStationBot
319c67602e Automatic changelog generation for PR #9304 [ci skip] 2019-09-21 03:39:31 -05:00
kevinz000
f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood
Its a blood bath! A BlueSpace Blood Bath!
2019-09-21 01:39:29 -07:00
CitadelStationBot
b716ad8afa Automatic changelog generation for PR #9306 [ci skip] 2019-09-21 03:39:11 -05:00
kevinz000
7d192c305a Merge pull request #9306 from kappa-sama/voidcell
Abductor batteries can be used to unlock abductor research
2019-09-21 01:39:08 -07:00
CitadelStationBot
23baf8e72b Automatic changelog generation for PR #9293 [ci skip] 2019-09-21 03:38:16 -05:00
kevinz000
30fa8d8231 Merge pull request #9293 from Ghommie/Ghommie-cit195
leftover legcuffs/handcuffs overlays fix.
2019-09-21 01:38:14 -07:00
CitadelStationBot
0b7ad6ceae Automatic changelog generation for PR #9312 [ci skip] 2019-09-21 03:37:49 -05:00
kevinz000
a9965d64b3 Merge pull request #9312 from Linzolle/ligament
ports ligament surgeries as well as dissection
2019-09-21 01:37:47 -07:00
kevinz000
0a71762444 Merge pull request #9308 from Sishen1542/greyboiz2
fix greyshirt response team
2019-09-20 14:16:17 -07:00
CitadelStationBot
8182eda2cb Automatic changelog generation for PR #9203 [ci skip] 2019-09-20 14:09:36 -05:00
kevinz000
9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy
Makes brass tools look better*
2019-09-20 12:09:33 -07:00
kevinz000
18afb348fe Merge pull request #9294 from Poojawa/patch-1
Updates Travis to 512.1484
2019-09-19 10:25:32 -07:00
CitadelStationBot
65bcf40c9a Automatic changelog generation for PR #9099 [ci skip] 2019-09-19 12:22:02 -05:00
kevinz000
0694dce05e Merge pull request #9099 from Thalpy/NeuroFix
[Ready] [Please merge me] Fixes Neurotoxin and makes it a fermireaction. Additionally merges Fermireactions mechanics with all chems, making it possible for people to port chems over.
2019-09-19 10:21:59 -07:00
Ghommie
08f6df8b77 digitigrades whatever. 2019-09-19 15:56:38 +02:00
Linzolle
573932437e COMMA 2019-09-18 23:55:52 -05:00
Linzolle
cd2e894ebe display results and wording 2019-09-18 23:51:35 -05:00
Linzolle
4bf9c8cc84 citadel fixes 2019-09-18 23:15:05 -05:00
XDTM
023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTM
8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
Fermi
df4da58ce8 Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix 2019-09-19 01:46:32 +01:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Thalpy
18ce46d7ec Merge branch 'master' into NeuroFix 2019-09-19 01:44:09 +01:00
GrayRachnid
e38b44d2bc missed one in security 2019-09-18 20:35:48 -04:00
GrayRachnid
8a9ecc3deb WINdoors 2019-09-18 20:34:16 -04:00
Sishen
fa4f05b919 Update ert.dm 2019-09-18 20:13:12 -04:00
kappa-sama
34d109f6a2 on further thought, all of them 2019-09-18 17:12:06 -04:00
kappa-sama
9bdbf444e4 abductor batteries to tech tree 2019-09-18 17:09:24 -04:00
kappa-sama
af4449de02 update master 2019-09-18 17:06:06 -04:00
TrilbySpaceClone
5ecf68918b tada 2019-09-18 03:47:52 -04:00