Merge branch 'master' into NEB-consolidation

2017-12-17 20:37:34 -06:00
parent e77c1a8a07 52701ebfee
commit f3390aee98
120 changed files with 402 additions and 381 deletions
@@ -0,0 +1,4 @@
+//Overrides TG's PDA sprites with Cit's PDA sprites. Remind me to turn this into a pref somewhere down the line.
+
+/obj/item/device/pda
+	icon = 'modular_citadel/icons/obj/pda.dmi'