Merge pull request #453 from SkyMarshal/master

Map update, fixed more disposal problems, and missing power line to AI core.
This commit is contained in:
Albert Iordache
2012-02-18 01:09:02 -08:00
10 changed files with 6663 additions and 6639 deletions
+1 -1
View File
@@ -274,7 +274,7 @@
proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
if (ticker.current_state == GAME_STATE_PLAYING)
var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)
a.autosay("[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.", "Arrivals Announcement Computer")
a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer")
del(a)