cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-21 03:52:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #111 from ReddeyfishVor/newEvents

Browse Source 
Add moderate severity requirement for electrification
This commit is contained in:
ReddeyfishVor
2018-04-14 22:53:29 -07:00
committed by GitHub
parent a1f1424a63 731187184d
commit 3887bd59cd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/electrified_door.dm
+3 -2
View File
@@ -25,8 +25,9 @@
if(!chosen_door)
return
chosen_door.set_safeties(0)
chosen_door.electrify(-1)
chosen_door.unlock()
if(severity >= EVENT_LEVEL_MODERATE)
chosen_door.electrify(-1)
chosen_door.lock()
chosen_door.health = chosen_door.maxhealth / 6
chosen_door.aiControlDisabled = 1
chosen_door.update_icon()
code/modules/events/event_container_vr.dm
+1 -1
View File
@@ -36,7 +36,7 @@
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Canister Leak", /datum/event/canister_leak, 10, list(ASSIGNMENT_ENGINEER = 20)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 50, list(ASSIGNMENT_ENGINEER = 20), 1, 0, 50),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Economic News", /datum/event/economic_event, 300),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Electrified Door", /datum/event/electrified_door, 0, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_AI = 10)),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Electrified Door", /datum/event/electrified_door, -5, list(ASSIGNMENT_MEDICAL = 5, ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_AI = 10)),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lost Carp", /datum/event/carp_migration, 20, list(ASSIGNMENT_SECURITY = 10), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Meteor Shower", /datum/event/meteor_wave, -15, list(ASSIGNMENT_ENGINEER = 5), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Money Lotto", /datum/event/money_lotto, 0, list(ASSIGNMENT_ANY = 1), 1, 5, 15),