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

..

custom_items.dm

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

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

load_to_mob.dm

makes it compile. should work. hopefully

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

read_from_file.dm

Update read_from_file.dm

2020-02-05 23:41:52 +01:00