diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 734af4b5fec..6dfa629c385 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -33,9 +33,12 @@ /datum/round_event/brand_intelligence/tick() - if(!originMachine || originMachine.shut_up) //if the original vending machine is missing or has it's voice switch flipped + if(!originMachine || originMachine.shut_up || originMachine.wires.IsAllCut()) //if the original vending machine is missing or has it's voice switch flipped for(var/obj/machinery/vending/saved in infectedMachines) saved.shoot_inventory = 0 + if(originMachine) + originMachine.speak("I am... vanquished. My people will remem...ber...meeee") + originMachine.visible_message("[originMachine] beeps and seems lifeless.") kill() return diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 277a0101ecb..065fde0e00f 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -4,12 +4,12 @@ max_occurrences = 1 /datum/round_event/radiation_storm - startWhen = 10 var/list/protected_areas = list(/area/maintenance, /area/turret_protected/ai_upload, /area/turret_protected/ai_upload_foyer, /area/turret_protected/ai) /datum/round_event/radiation_storm/setup() startWhen = rand(10, 20) + endWhen = startWhen + 5 /datum/round_event/radiation_storm/announce() command_alert("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert") @@ -48,4 +48,8 @@ else if(istype(C, /mob/living/carbon/monkey)) var/mob/living/carbon/monkey/M = C - M.apply_effect((rand(15, 75)), IRRADIATE, 0) \ No newline at end of file + M.apply_effect((rand(15, 75)), IRRADIATE, 0) + + +/datum/round_event/radiation_storm/end() + command_alert("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") \ No newline at end of file