Chayse Ramsay 0b42003f53 Merge branch 'master' into QM-as-Head

2018-02-18 03:46:35 +00:00

..

admin

Mentor System (#5235)

2018-02-05 04:09:56 -06:00

cargo

added space kiwis as a new simple mob (#5334)

2018-02-06 19:07:31 -06:00

client

Merge pull request #5452 from cebutris/crazycatgirls

2018-02-17 18:45:27 -06:00

clothing

Flightsuit Armor adjustments (#5515)

2018-02-17 18:05:26 -06:00

crafting

Craftable Intellicard Sprite: Potat-OS

2018-01-17 21:28:06 -08:00

jobs

Re-adds HoP to the Civilian joblist

2018-02-15 10:15:34 +00:00

mentor

Mentor System (#5235)

2018-02-05 04:09:56 -06:00

mining

modularizes mining shuttle console id lock

2018-01-04 13:17:40 -05:00

mob/living

More Requested Changes

2018-02-16 15:52:28 +00:00

research

[Ready to merge] Au-toy-lathe (#5534)

2018-02-17 17:18:22 -08:00