diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 7d53a0c812c..5e8bdf4a957 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -1,17 +1,22 @@ -/datum/event/communications_blackout - var/silent = 1 //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. - /datum/event/communications_blackout/announce() - if(!silent) - command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT") + var/list/alerts = list( "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you*%fj00)`5vc-BZZT", \ + "Ionospheric anomalies detected. Temporary telecommunication failu*3mga;b4;'1v¬-BZZZT", \ + "Ionospheric anomalies detected. Temporary telec#MCi46:5.;@63-BZZZZT", \ + "Ionospheric anomalies dete'fZ\\kg5_0-BZZZZZT", \ + "Ionospheri:%£ MCayj^j<.3-BZZZZZZT", \ + "#4nd%;f4y6,>£%-BZZZZZZZT") + + var/alert = pick(alerts) + + for(var/mob/living/silicon/ai/A in player_list) //AIs are always aware of communication blackouts. + A << "
" + A << "[alert]" + A << "
" + + if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. + command_alert(alert) /datum/event/communications_blackout/start() - //if(prob(25)) - // silent = 0 - for(var/mob/living/silicon/ai/A in player_list) //AIs are always aware of communication blackouts. - A << "
" - A << "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT" - A << "
" for(var/obj/machinery/telecomms/T in telecomms_list) T.emp_act(1) \ No newline at end of file diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 6bedda3ad32..977c491d2d0 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -1,8 +1,8 @@ var/list/allEvents = typesof(/datum/event) - /datum/event var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event -var/eventTimeLower = 5000 -var/eventTimeUpper = 10000 +var/eventTimeLower = 9000 //15 minutes +var/eventTimeUpper = 15000 //25 minutes var/scheduledEvent = null diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 7221c11856e..892367c4d18 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -78,17 +78,17 @@ ..() /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob) - if(!stat && M.a_intent == "help") - M.visible_message("\red [M] tips over [src].","\red You tip over [src].") - src.Weaken(30) - icon_state = "cow_dead" + if(!stat && M.a_intent == "disarm" && icon_state != icon_dead) + M.visible_message("[M] tips over [src].","You tip over [src].") + Weaken(30) + icon_state = icon_dead spawn(rand(20,50)) if(!stat) - icon_state = "cow" - var/list/responses = list( "\red [src] looks at you imploringly.", - "\red [src] looks at you pleadingly", - "\red [src] looks at you with a resigned expression.", - "\red [src] seems resigned to it's fate.") + icon_state = icon_living + var/list/responses = list( "[src] looks at you imploringly.", + "[src] looks at you pleadingly", + "[src] looks at you with a resigned expression.", + "[src] seems resigned to it's fate.") M << pick(responses) else ..() @@ -118,8 +118,8 @@ New() ..() - pixel_x = rand(-6,6) - pixel_y = rand(-6,6) + pixel_x = rand(-6, 6) + pixel_y = rand(0, 10) /mob/living/simple_animal/chick/Life() ..() @@ -152,13 +152,13 @@ New() ..() - pixel_x = rand(-6,6) - pixel_y = rand(-6,6) + pixel_x = rand(-6, 6) + pixel_y = rand(0, 10) /mob/living/simple_animal/chicken/Life() ..() if(!stat && prob(1)) - src.visible_message("[src] [pick("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")]") + visible_message("[src] [pick("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")]") var/obj/item/weapon/reagent_containers/food/snacks/egg/E = new(src.loc) E.pixel_x = rand(-6,6) E.pixel_y = rand(-6,6) @@ -169,7 +169,7 @@ obj/item/weapon/reagent_containers/food/snacks/egg/var/amount_grown = 0 amount_grown += rand(1,2) if(amount_grown >= 100) if(prob(50)) - src.visible_message("[src] hatches with a quiet cracking sound.") + visible_message("[src] hatches with a quiet cracking sound.") new /mob/living/simple_animal/chick(src.loc) processing_objects.Remove(src) del(src) diff --git a/tgstation.dme b/tgstation.dme index c3f214b0fcb..02984bb6613 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -722,6 +722,7 @@ #include "code\modules\detectivework\scanner.dm" #include "code\modules\events\alien_infestation.dm" #include "code\modules\events\blob.dm" +#include "code\modules\events\brand_intelligence.dm" #include "code\modules\events\carp_migration.dm" #include "code\modules\events\communications_blackout.dm" #include "code\modules\events\disease_outbreak.dm" @@ -732,7 +733,6 @@ #include "code\modules\events\prison_break.dm" #include "code\modules\events\radiation_storm.dm" #include "code\modules\events\spacevine.dm" -#include "code\modules\events\spider_infestation.dm" #include "code\modules\events\spontaneous_appendicitis.dm" #include "code\modules\flufftext\Dreaming.dm" #include "code\modules\flufftext\Hallucination.dm"