Jay a2ad87bebd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt ...

# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/custom_loadout/custom_items.dm

2020-09-18 19:23:31 -05:00

..

admin

Demodularizing a few reagents, a client var, the rest hud button. (#12329)

2020-05-24 13:21:14 -07:00

client

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

2020-09-16 11:20:43 -05:00

clothing

Adds remaining TOSOrvikepi

2020-06-21 13:25:23 +03:00

custom_loadout

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

2020-09-18 19:23:31 -05:00

mentor

stops kevinz from leaking his IP

2020-08-24 18:42:48 +08:00

mob

okay you can use any emote

2020-08-27 21:04:36 +01:00

projectiles

Removing priority overlays, update_icon() splitup for guns.

2020-08-20 18:33:23 +02:00

reagents

plushie shapeshifter

2020-09-13 03:25:43 +02:00