Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
@@ -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"
@@ -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
@@ -209,7 +209,7 @@
 	icon_state = "mist"
 	layer = FLY_LAYER
 	anchored = TRUE
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT


 /obj/machinery/shower/attack_hand(mob/M)