Merge remote-tracking branch 'upstream/master' into call-it-whatever-the-fuck-i-want

This commit is contained in:
Oposshim
2020-07-09 02:54:49 -04:00
113 changed files with 118244 additions and 132063 deletions
@@ -129,3 +129,8 @@
name = "Kinaris.Co Logo"
desc = "The Kinaris corporate logo."
icon_state = "nanotrasen_sign1"
/obj/structure/sign/logo/kinaris
name = "kinaris logo"
desc = "The Kinaris corprate logo. Radiant."
icon_state = "kinaris_sign1"