From c301abbfc9ce1f694783bc1cf27da97eec09b72d Mon Sep 17 00:00:00 2001 From: Cyantime Date: Tue, 1 Aug 2017 21:16:13 -0400 Subject: [PATCH] Magboots check --- code/modules/events/event_container_vr.dm | 2 +- code/modules/events/meteor_strike_vr.dm | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/events/event_container_vr.dm b/code/modules/events/event_container_vr.dm index 89b1047dbd0..5a54e974cfe 100644 --- a/code/modules/events/event_container_vr.dm +++ b/code/modules/events/event_container_vr.dm @@ -92,7 +92,7 @@ available_events = list( new /datum/event_meta(EVENT_LEVEL_MAJOR, "Nothing", /datum/event/nothing, 900), new /datum/event_meta(EVENT_LEVEL_MAJOR, "Atmos Leak", /datum/event/atmos_leak, 30, list(ASSIGNMENT_ENGINEER = 25), 1), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Strike", /datum/event/meteor_strike, 5, list(ASSIGNMENT_ENGINEER = 10) ,1) + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Strike", /datum/event/meteor_strike, 10, list(ASSIGNMENT_ENGINEER = 15) ,1) ) add_disabled_events(list( new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob", /datum/event/blob, 10, list(ASSIGNMENT_ENGINEER = 60), 1), diff --git a/code/modules/events/meteor_strike_vr.dm b/code/modules/events/meteor_strike_vr.dm index 95ad79f8a6c..74d2d666115 100644 --- a/code/modules/events/meteor_strike_vr.dm +++ b/code/modules/events/meteor_strike_vr.dm @@ -10,7 +10,7 @@ kill() /datum/event/meteor_strike/announce() - command_announcement.Announce("A meteoroid has been detected entering the atmosphere on a trajectory that will terminate near the surface facilty. Brace for impact.", "Debris Warning") + command_announcement.Announce("A meteoroid has been detected entering the atmosphere on a trajectory that will terminate near the surface facilty. Brace for impact.", "NanoTrasen Orbital Monitoring") /datum/event/meteor_strike/start() new /obj/effect/meteor_falling(strike_target) @@ -60,8 +60,9 @@ var/turf/mob_turf = get_turf(L) if(!(mob_turf.z in impacted.expected_z_levels)) continue - if(!L.buckled) - L.throw_at(get_step_rand(L),1,5) + if(!L.buckled && !issilicon(L)) + if(!L.Check_Shoegrip()) + L.throw_at(get_step_rand(L),1,5) L.Weaken(5) if(L.client) to_chat(L, "The ground lurches beneath you!")