Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

This commit is contained in:
Aurorablade
2016-02-02 15:35:54 -05:00
145 changed files with 1485 additions and 1290 deletions
+1 -1
View File
@@ -221,7 +221,7 @@
adding += using
//Shuttle
using = new /obj/screen/ai/announcement()
using = new /obj/screen/ai/call_shuttle()
using.name = "Call Emergency Shuttle"
using.icon = 'icons/mob/screen_ai.dmi'
using.icon_state = "call_shuttle"