Merge branch 'master' into pubby

This commit is contained in:
Dahlular
2020-07-08 07:01:36 -06:00
173 changed files with 7447 additions and 5486 deletions
+4 -4
View File
@@ -121,13 +121,13 @@
setDir(turn(dir, 90))
/obj/structure/sign/nanotrasen
name = "\improper Nanotrasen Logo"
desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!"
name = "\improper Kinaris.Corp Logo"
desc = "A sign with the Kinaris Logo on it. Blessed be Kinaris!"
icon_state = "nanotrasen"
/obj/structure/sign/logo
name = "nanotrasen logo"
desc = "The Nanotrasen corporate logo."
name = "Kinaris.Co Logo"
desc = "The Kinaris corporate logo."
icon_state = "nanotrasen_sign1"
/obj/structure/sign/logo/kinaris