Anonymous 11ff7802bb Merge branch 'master' into assu ...

# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

2019-10-26 18:06:56 +03:00

..

admin

fixes the poly tgs command not working at all

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

arousal

Merge pull request #9100 from cebutris/got-milk

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

cargo

gone_reduced_to_atoms

2019-09-12 23:06:46 -04:00

client

Adds ASSU suit+helmet and loadout stuff

2019-10-20 23:52:06 +03:00

clothing

Merge pull request #9603 from Ghommie/Ghommie-cit267

2019-10-25 20:12:35 -07:00

custom_loadout

changes donator item from glasses to a hat

2019-10-13 17:47:11 -05:00

food_and_drinks/snacks

Heck

2019-09-19 01:45:21 +01:00

integrated_electronics/subtypes

Updated integrated circuits

2019-05-09 15:25:48 -07: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

gone_reduced_to_atoms

2019-09-12 23:06:46 -04:00

mob

Merge pull request #9329 from Citadel-Station-13/kevinz000-patch-87

2019-10-25 23:15:11 -04:00

power

…

projectiles

Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more

2019-10-15 03:48:44 -04:00

reagents

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

2019-10-24 10:10:07 +02:00

recycling/disposal

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

research/designs

Unmodularize research.

2019-10-24 23:28:15 +02:00

vehicles

Porting GetComponent macros removal, and some related changes.

2019-10-23 15:04:28 +02:00