Poojawa 9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded

2019-09-13 12:56:57 -05:00

..

admin

fixes the poly tgs command not working at all

2019-08-22 20:13:56 -04:00

antagonists

removes modular citadel changes to the blood spell as well

2018-11-24 18:16:19 -05:00

arousal

Merge pull request #9100 from cebutris/got-milk

2019-08-14 15:40:53 -04:00

awaymissions

Tones down some items attack stamina costs. kills hypereutactic blades copypasta.

2019-07-19 20:09:16 +02:00

cargo

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28

2019-07-03 03:24:28 +02:00

client

Merge remote-tracking branch 'origin/master' into donator_grouping

2019-08-15 14:40:44 -07:00

clothing

modular_citadel bad

2019-07-29 01:17:45 -05:00

crafting

…

custom_loadout

Merge pull request #9095 from fludd12/snowflake-b-gone

2019-08-16 17:04:45 -07:00

events

…

food_and_drinks/snacks

Fixes Horn coloration issues, allows mammals to choose their meat type

2019-09-13 10:58:04 -05:00

integrated_electronics/subtypes

Updated integrated circuits

2019-05-09 15:25:48 -07:00

jobs

Fk mdlr ctdl

2019-07-17 01:05:09 +02:00

keybindings

fixes the bug where you can sometimes get permanently stuck sprinting when using the sprint hotkey (#8033)

2019-02-22 06:09:41 -08:00

mentor

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114

2019-07-05 23:06:57 +02:00

mining

fixes mam tail wag

2018-09-20 01:56:46 -05:00

mob

Fixes Horn coloration issues, allows mammals to choose their meat type

2019-09-13 10:58:04 -05:00

power

…

projectiles

Merge pull request #8928 from Ghommie/Ghommie-cit121

2019-07-25 17:43:14 -07:00

reagents

Merge pull request #9220 from Thalpy/Catnip-Furranium

2019-09-13 10:41:07 -07:00

recycling/disposal

…

research

Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines.

2019-06-22 23:15:51 +02:00

vehicles

Cleans up Modular_citadel

2018-09-21 03:52:13 -05:00

vore

Fixes some runtimes and removes a holodeck exploit

2019-08-08 21:33:42 -05:00