mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-06 15:34:35 +00:00
-Added more cameras to Telecomms.
-Made telecomms look symmetrical again. -Added the telecommunication blackout event to the RNG. Admins can trigger it and they have an option to alert the crew. -AI can now properly use their multitool. (forgot to uncomment) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4536 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -92,14 +92,13 @@
|
||||
IonStorm()
|
||||
if(14)
|
||||
spacevine_infestation()
|
||||
// TODO: Uncomment this after feature freeze -Giacom
|
||||
//if(15)
|
||||
// communications_blackout()
|
||||
if(15)
|
||||
communications_blackout()
|
||||
|
||||
/proc/communications_blackout()
|
||||
/proc/communications_blackout(var/silent = 1)
|
||||
|
||||
//Uncomment below if you want communication blackouts to have a warning.
|
||||
//command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
|
||||
if(!silent) command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
|
||||
for(var/obj/machinery/telecomms/T in telecomms_list)
|
||||
T.emp_act(1)
|
||||
|
||||
|
||||
@@ -244,9 +244,9 @@
|
||||
// Let's double check
|
||||
if(!issilicon(user) && istype(user.get_active_hand(), /obj/item/device/multitool))
|
||||
P = user.get_active_hand()
|
||||
//else if(isAI(user))
|
||||
// var/mob/living/silicon/ai/U = user
|
||||
// P = U.aiMulti
|
||||
else if(isAI(user))
|
||||
var/mob/living/silicon/ai/U = user
|
||||
P = U.aiMulti
|
||||
else if(isrobot(user) && in_range(user, src))
|
||||
if(istype(user.get_active_hand(), /obj/item/device/multitool))
|
||||
P = user.get_active_hand()
|
||||
|
||||
@@ -210,7 +210,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
|
||||
if(prob(100/severity))
|
||||
if(!(stat & EMPED))
|
||||
stat |= EMPED
|
||||
spawn(1200/severity)
|
||||
spawn(1600/severity)
|
||||
stat &= ~EMPED
|
||||
..()
|
||||
|
||||
|
||||
@@ -1964,7 +1964,11 @@ var/global/BSACooldown = 0
|
||||
if("comms_blackout")
|
||||
feedback_inc("admin_secrets_fun_used",1)
|
||||
feedback_add_details("admin_secrets_fun_used","CB")
|
||||
communications_blackout()
|
||||
var/answer = alert(usr, "Would you like to alert the crew?", "Alert", "Yes", "No")
|
||||
if(answer == "Yes")
|
||||
communications_blackout(0)
|
||||
else
|
||||
communications_blackout(1)
|
||||
message_admins("[key_name_admin(usr)] triggered a communications blackout.", 1)
|
||||
if("spaceninja")
|
||||
feedback_inc("admin_secrets_fun_used",1)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user