cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4194 from A-t48/AdminMeteorConfirm

Browse Source 
Fix #3738 Admin spawned meteors has no announcement confirmation
This commit is contained in:
Alex
2014-07-25 09:24:46 +01:00
parent 80b1e03c91 fc5a6f9915
commit 6da164fa57
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+2 -1
View File
@@ -1670,10 +1670,11 @@
log_admin("[key_name(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]")
if("wave")
var/should_announce = alert(usr, "Meteors will be spawned. Would you like to make an announcement?", "Message", "Yes", "No") == "Yes"
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","MW")
message_admins("[key_name_admin(usr)] has spawned meteors")
E = new /datum/round_event/meteor_wave()
E = new /datum/round_event/meteor_wave(should_announce)
if("gravanomalies")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","GA")
code/modules/events/meateor_wave.dm
+2 -1
View File
@@ -5,7 +5,8 @@
max_occurrences = 1
/datum/round_event/meteor_wave/meaty/announce()
priority_announce("Meaty ores have been detected on collision course with the station.", "Oh Crap, Get The Mop.",'sound/AI/meteors.ogg')
if(announce)
priority_announce("Meaty ores have been detected on collision course with the station.", "Oh Crap, Get The Mop.",'sound/AI/meteors.ogg')
/datum/round_event/meteor_wave/meaty/tick()
if(IsMultiple(activeFor, 3))
code/modules/events/meteor_wave.dm
+8 -2
View File
@@ -7,11 +7,17 @@
/datum/round_event/meteor_wave
startWhen = 6
endWhen = 66
var/announce = 1
/datum/round_event/meteor_wave/New(should_announce = 1)
..()
announce = should_announce
/datum/round_event/meteor_wave/announce()
priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/AI/meteors.ogg')
if(announce)
priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/AI/meteors.ogg')
/datum/round_event/meteor_wave/tick()
if(IsMultiple(activeFor, 3))
spawn_meteors(5, meteorsA) //meteor list types defined in gamemode/meteor/meteors.dm
spawn_meteors(5, meteorsA) //meteor list types defined in gamemode/meteor/meteors.dm