Merge pull request #188 from Markolie/master

Fix away mission atmos, bug fixes
This commit is contained in:
Fox-McCloud
2015-01-18 01:32:45 -05:00
13 changed files with 12377 additions and 12374 deletions
+1 -1
View File
@@ -1604,7 +1604,7 @@
var/obj/item/fax = locate(href_list["AdminFaxView"])
if (istype(fax, /obj/item/weapon/paper))
var/obj/item/weapon/paper/P = fax
P.show_content(usr)
P.show_content(usr,1)
else if (istype(fax, /obj/item/weapon/photo))
var/obj/item/weapon/photo/H = fax
H.show(usr)
+1 -1
View File
@@ -7,7 +7,7 @@
/datum/event/blob/announce()
command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. Nanotrasen has issued a directive 7-10. The station is to be considered quarantined.", "Biohazard Alert")
world << sound('sound/AI/outbreak7.ogg')
world << sound('sound/AI/blob_confirmed.ogg')
for (var/mob/living/silicon/ai/aiPlayer in player_list)
if (aiPlayer.client)
+3 -2
View File
@@ -1,3 +1,4 @@
/datum/event/mass_hallucination/start()
for(var/mob/living/carbon/C in living_mob_list)
C.hallucination += rand(70, 100)
for(var/mob/living/carbon/human/C in living_mob_list)
if(!(C.species.flags & IS_SYNTHETIC))
C.hallucination += rand(70, 100)