cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressing feedback

Browse Source
This commit is contained in:
dylanstrategie
2015-01-04 22:56:08 +01:00
parent 06fc0ee6b5
commit bf0dfc2623
2 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/admin/admin.dm
View File

@@ -737,17 +737,8 @@ var/global/floorIsLava = 0
<A href='?src=\ref[src];secretsfun=whiteout'>Fix all lights</A><BR> <A href='?src=\ref[src];secretsfun=whiteout'>Fix all lights</A><BR>
<A href='?src=\ref[src];secretsfun=floorlava'>The floor is lava! (DANGEROUS: extremely lame)</A><BR> <A href='?src=\ref[src];secretsfun=floorlava'>The floor is lava! (DANGEROUS: extremely lame)</A><BR>
<A href='?src=\ref[src];secretsfun=togglenarsie'>Toggle Nar-Sie's behaviour</A><BR> <A href='?src=\ref[src];secretsfun=togglenarsie'>Toggle Nar-Sie's behaviour</A><BR>
<BR> <A href='?src=\ref[src];secretsfun=fakealerts'>Trigger a fake alert</A><BR>
<B>False Flags and Bait</B><BR> <A href='?src=\ref[src];secretsfun=fakebooms'>Adds in some Micheal Bay to the shift without major destruction</A><BR>
<I>(Ib's a consbiracy ! The admins want to take our powergaymen away !)</I><BR>
<BR>
<A href='?src=\ref[src];secretsfun=fakebiohazard'>Trigger a fake Biohazard Alert</A><BR>
<A href='?src=\ref[src];secretsfun=fakelifesigns'>Trigger a fake Lifesigns Alert</A><BR>
<A href='?src=\ref[src];secretsfun=fakedelta'>Trigger a fake Malfunction Takeover Notice (DANGEROUS : Silicon valid magnet)</A><BR>
<A href='?src=\ref[src];secretsfun=fakebooms'>Adds in some Micheal Bay to any scene without major destruction</A><BR>
<A href='?src=\ref[src];secretsfun=fakeion'>Trigger a fake Ion Storm Alert (Hazardous to AIs)</A><BR>
<A href='?src=\ref[src];secretsfun=fakemeteor'>Trigger a fake Meteor Alert (Hazardous to morale)</A><BR>
<A href='?src=\ref[src];secretsfun=fakecarps'>Trigger a fake Space Carp Migration Alert</A><BR>
<BR> <BR>
<B>Final Solutions</B><BR> <B>Final Solutions</B><BR>
<I>(Warning, these will end the round!)</I><BR> <I>(Warning, these will end the round!)</I><BR>

81
code/modules/admin/topic.dm
View File

@@ -2633,64 +2633,69 @@
newname = "Admin" newname = "Admin"
D.name = newname D.name = newname
D.real_name = newname D.real_name = newname
//False flags and bait below. May cause mild hilarity or extreme pain //False flags and bait below. May cause mild hilarity or extreme pain. Now in one button
if("fakebiohazard") //GUISE WE HAVE A BLOB if("fakealerts")
feedback_inc("admin_secrets_fun_used",1) feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","FAKEB") feedback_add_details("admin_secrets_fun_used","FAKEA")
message_admins("[key_name_admin(usr)] triggered a FAKE Biohzard Alert.") var/choice = input("Choose the type of fake alert you wish to trigger","False Flag and Bait Panel") in list("Biohazard", "Lifesigns", "Malfunction", "Ion", "Meteor Wave", "Carp Migration", "Return")
var/choice = input("Set the level of the biohazard alert, or leave at 0 to have a random level (1 to 7 supported only)", "Space FEMA Readiness Program", 0) as num //Big fat lists of effects, not very modular but at least there's less buttons
if(!choice || choice > 7 || choice < 0) if(choice == "Return") //Actually fuck this
return //Duh
if(choice == "Biohazard") //GUISE WE HAVE A BLOB
var/levelchoice = input("Set the level of the biohazard alert, or leave at 0 to have a random level (1 to 7 supported only)", "Space FEMA Readiness Program", 0) as num
if(!levelchoice || levelchoice > 7 || levelchoice < 0)
usr << "<span class='warning'>Invalid input range (0 to 7 only)</span>"
return return
biohazard_alert(level = choice) biohazard_alert(level = levelchoice)
if("fakelifesigns") //MUH ALIUMS message_admins("[key_name_admin(usr)] triggered a FAKE Biohzard Alert.")
feedback_inc("admin_secrets_fun_used",1) return
feedback_add_details("admin_secrets_fun_used","FAKEL") if(choice == "Lifesigns") //MUH ALIUMS
message_admins("[key_name_admin(usr)] triggered a FAKE Lifesign Alert.")
command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
world << sound('sound/AI/aliens.ogg') world << sound('sound/AI/aliens.ogg')
if("fakedelta") //BLOW EVERYTHING message_admins("[key_name_admin(usr)] triggered a FAKE Lifesign Alert.")
feedback_inc("admin_secrets_fun_used",1) return
feedback_add_details("admin_secrets_fun_used","FAKET") if(choice == "Malfunction") //BLOW EVERYTHING
var/choice = input("Do you wish to include the Hostile Runtimes warning to have an authentic malfunction takeover alert ?") in list("Yes", "No") var/salertchoice = input("Do you wish to include the Hostile Runtimes warning to have an authentic Malfunction Takeover Alert ?", "Nanotrasen Alert Level Monitor") in list("Yes", "No")
message_admins("[key_name_admin(usr)] triggered a FAKE Malfunction Takeover Alert (Hostile Runtimes alert [choice == "Yes" ? "included":"excluded"])") if(salertchoice == "Yes")
if(choice == "Yes")
command_alert("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert") command_alert("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert")
world << "<font size=4 color='red'>Attention! Delta security level reached!</font>" //Don't ACTUALLY set station alert to Delta to avoid fucking shit up for real world << "<font size=4 color='red'>Attention! Delta security level reached!</font>" //Don't ACTUALLY set station alert to Delta to avoid fucking shit up for real
world << "<font color='red'>[config.alert_desc_delta]</font>" world << "<font color='red'>[config.alert_desc_delta]</font>"
world << sound('sound/AI/aimalf.ogg') //AI got valid world << sound('sound/AI/aimalf.ogg') //AI got valid
message_admins("[key_name_admin(usr)] triggered a FAKE Malfunction Takeover Alert (Hostile Runtimes alert [salertchoice == "Yes" ? "included":"excluded"])")
return
if(choice == "Ion")
command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
world << sound('sound/AI/ionstorm.ogg')
message_admins("[key_name_admin(usr)] triggered a FAKE Ion Alert.")
return
if(choice == "Meteor Wave")
command_alert("A meteor storm has been detected on collision course with the station. Seek shelter within the core of the station immediately.", "Meteor Alert")
world << sound('sound/AI/meteors.ogg')
message_admins("[key_name_admin(usr)] triggered a FAKE Meteor Alert.")
return
if(choice == "Carp Migration")
command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
message_admins("[key_name_admin(usr)] triggered a FAKE Carp Migration Alert.")
return
if("fakebooms") //Micheal Bay is in the house ! if("fakebooms") //Micheal Bay is in the house !
feedback_inc("admin_secrets_fun_used",1) feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","FAKEE") feedback_add_details("admin_secrets_fun_used","FAKEE")
var/choice = input("How much high-budget explosions do you want ?", "Micheal Bay SFX Systems", 1) as num var/choice = input("How much high-budget explosions do you want ?", "Micheal Bay SFX Systems", 1) as num
if(choice > 0) //No negative or null explosion amounts here math genius if(choice < 1) //No negative or null explosion amounts here math genius
usr << "<span class='warning'>Invalid input range (null or negative)</span>"
return
message_admins("[key_name_admin(usr)] improvised himself as Micheal Bay and triggered [round(choice)] fake explosions.") message_admins("[key_name_admin(usr)] improvised himself as Micheal Bay and triggered [round(choice)] fake explosions.")
for(var/i = 1 to choice) for(var/i = 1 to choice)
world << sound('sound/effects/explosionfar.ogg') world << sound('sound/effects/explosionfar.ogg')
sleep(rand(2, 10)) //Sleep 0.2 to 1 second sleep(rand(2, 10)) //Sleep 0.2 to 1 second
if("fakeion")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","FAKEI")
message_admins("[key_name_admin(usr)] triggered a FAKE Ion Alert.")
command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
world << sound('sound/AI/ionstorm.ogg')
if("fakemeteor") //You know it
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","FAKEM")
message_admins("[key_name_admin(usr)] triggered a FAKE Meteor Alert.")
command_alert("A meteor storm has been detected on collision course with the station. Seek shelter within the core of the station immediately.", "Meteor Alert")
world << sound('sound/AI/meteors.ogg')
if("fakecarps")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","FAKEC")
message_admins("[key_name_admin(usr)] triggered a FAKE Carp Migration Alert.")
command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
if(usr) if(usr)
log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]")
if (ok) if(ok)
world << text("<B>A secret has been activated by []!</B>", usr.key) world << text("<B>A secret has been activated by [usr.key]!</B>")
else if(href_list["secretsadmin"]) else if(href_list["secretsadmin"])
if(!check_rights(R_ADMIN)) return if(!check_rights(R_ADMIN))
return
var/ok = 0 var/ok = 0
switch(href_list["secretsadmin"]) switch(href_list["secretsadmin"])