Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters

This commit is contained in:
kevinz000
2020-02-10 04:29:22 -07:00
227 changed files with 7890 additions and 7395 deletions
+2 -1
View File
@@ -100,7 +100,8 @@
bot_access_flags = CLEAN_BOT
/obj/item/cartridge/lawyer
name = "\improper P.R.O.V.E. cartridge"
name = "\improper S.P.A.M. cartridge"
desc = "Introducing the Station Public Announcement Messenger cartridge, featuring the unique ability to broadcast-mark messages, designed for lawyers across Nanotrasen to advertise their useful and important services."
icon_state = "cart-law"
access = CART_SECURITY
spam_enabled = 1