shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858

Browse Source 
[MIRROR] Fixed sign description
This commit is contained in:
LetterJay
2017-08-18 13:41:07 -05:00
committed by GitHub
parent f378f66705 db3622ca12
commit 19b8a5a380
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/signs.dm
+3 -3
View File
@@ -321,6 +321,6 @@
icon_state = "direction_bridge"
/obj/structure/sign/logo
name = "station logo"
desc = "A sign: SPACE STATION 13."
icon_state = "ss13sign-1"
name = "nanotrasen logo"
desc = "The Nanotrasen corporate logo."
icon_state = "ss13sign-1"
code/game/objects/structures/signs.dm.rej
+11
View File
@@ -0,0 +1,11 @@
diff a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm (rejected hunks)
@@ -326,6 +326,6 @@
icon_state = "direction_bridge"
/obj/structure/sign/logo
- name = "station logo"
- desc = "A sign: SPACE STATION 13."
+ name = "nanotrasen logo"
+ desc = "The Nanotrasen corporate logo."
icon_state = "nanotrasen_sign1"
\ No newline at end of file