LetterJay a64dba6270 Merge branch 'flagcape' ...

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

2018-07-06 00:51:42 -05:00

..

__HELPERS

modular_citadel

2018-05-20 23:04:13 -05:00

_globalvars/lists

Mentor System (#5235)

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

_onclick

two major fixes - fixes flavortext and right click exploit

2018-07-04 16:41:55 -04:00

controllers

makes it compile. should work. hopefully

2018-07-02 15:35:11 -04:00

datums

Fixes signals

2018-07-05 01:42:05 -04:00

game

Merge pull request #7293 from LetterN/patch-4

2018-07-06 01:36:15 -04:00

modules

Merge branch 'flagcape'

2018-07-06 00:51:42 -05:00

init.dm

Adds IPC Antennas (#6049)

2018-03-24 12:33:19 -07:00