silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
Ghom
|
6696560656
|
slendermen fix. (#12303)
* slendermen fix.
* Whops
* Update dwarfism.dm
|
2020-05-20 18:43:14 -07:00 |
|
Artur
|
a8aa2e2014
|
Updates modular computers, begins work on shuttle stuff.
|
2020-04-23 15:06:35 +03:00 |
|
Artur
|
321902c35a
|
Ports https://github.com/tgstation/tgstation/pull/50225
|
2020-04-23 13:28:09 +03:00 |
|
Ghommie
|
519ebd5ed8
|
Porting the mutation conflict system, and resizing quantum realm fix.
|
2020-04-01 15:29:35 +02:00 |
|
Ghommie
|
3c2cb76792
|
Fixing owner not being set in mutation/on_aquiring.
|
2020-03-22 15:23:05 +01:00 |
|