cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Magboots check

Browse Source
This commit is contained in:
Cyantime
2017-08-01 21:16:13 -04:00
parent 02dc0d8dba
commit c301abbfc9
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/events/event_container_vr.dm
View File

@@ -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),

7
code/modules/events/meteor_strike_vr.dm
View File

@@ -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, "<span class='danger'>The ground lurches beneath you!</span>")