Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720

This commit is contained in:
LetterJay
2017-05-02 11:36:27 -05:00
349 changed files with 14689 additions and 9184 deletions
+27 -27
View File
@@ -198,7 +198,7 @@
if("moveminingshuttle")
if(!check_rights(R_ADMIN))
return
feedback_add_details("admin_secrets_fun_used","Send Mining Shuttle")
SSblackbox.add_details("admin_secrets_fun_used","Send Mining Shuttle")
if(!SSshuttle.toggleShuttle("mining","mining_home","mining_away"))
message_admins("[key_name_admin(usr)] moved mining shuttle")
log_admin("[key_name(usr)] moved the mining shuttle")
@@ -206,7 +206,7 @@
if("movelaborshuttle")
if(!check_rights(R_ADMIN))
return
feedback_add_details("admin_secrets_fun_used","Send Labor Shuttle")
SSblackbox.add_details("admin_secrets_fun_used","Send Labor Shuttle")
if(!SSshuttle.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away"))
message_admins("[key_name_admin(usr)] moved labor shuttle")
log_admin("[key_name(usr)] moved the labor shuttle")
@@ -214,7 +214,7 @@
if("moveferry")
if(!check_rights(R_ADMIN))
return
feedback_add_details("admin_secrets_fun_used","Send Centcom Ferry")
SSblackbox.add_details("admin_secrets_fun_used","Send Centcom Ferry")
if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
message_admins("[key_name_admin(usr)] moved the centcom ferry")
log_admin("[key_name(usr)] moved the centcom ferry")
@@ -226,7 +226,7 @@
if(A)
var/new_perma = !A.perma_docked
A.perma_docked = new_perma
feedback_add_details("admin_toggle","Permadock Arrivals Shuttle|[new_perma]")
SSblackbox.add_details("admin_toggle","Permadock Arrivals Shuttle|[new_perma]")
message_admins("[key_name_admin(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle")
log_admin("[key_name(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle")
else
@@ -276,7 +276,7 @@
if("monkey")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Monkeyize All Humans")
SSblackbox.add_details("admin_secrets_fun_used","Monkeyize All Humans")
for(var/mob/living/carbon/human/H in GLOB.mob_list)
spawn(0)
H.monkeyize()
@@ -287,7 +287,7 @@
return
var/result = input(usr, "Please choose a new species","Species") as null|anything in GLOB.species_list
if(result)
feedback_add_details("admin_secrets_fun_used","Mass Species Change([result])")
SSblackbox.add_details("admin_secrets_fun_used","Mass Species Change([result])")
log_admin("[key_name(usr)] turned all humans into [result]", 1)
message_admins("\blue [key_name_admin(usr)] turned all humans into [result]")
var/newtype = GLOB.species_list[result]
@@ -298,12 +298,12 @@
if(!check_rights(R_FUN))
return
usr.client.triple_ai()
feedback_add_details("admin_secrets_fun_used","Triple AI")
SSblackbox.add_details("admin_secrets_fun_used","Triple AI")
if("power")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Power All APCs")
SSblackbox.add_details("admin_secrets_fun_used","Power All APCs")
log_admin("[key_name(usr)] made all areas powered", 1)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] made all areas powered</span>")
power_restore()
@@ -311,7 +311,7 @@
if("unpower")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Depower All APCs")
SSblackbox.add_details("admin_secrets_fun_used","Depower All APCs")
log_admin("[key_name(usr)] made all areas unpowered", 1)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] made all areas unpowered</span>")
power_failure()
@@ -319,7 +319,7 @@
if("quickpower")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Power All SMESs")
SSblackbox.add_details("admin_secrets_fun_used","Power All SMESs")
log_admin("[key_name(usr)] made all SMESs powered", 1)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] made all SMESs powered</span>")
power_restore_quick()
@@ -333,7 +333,7 @@
var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN)
if(!objective)
return
feedback_add_details("admin_secrets_fun_used","Traitor All ([objective])")
SSblackbox.add_details("admin_secrets_fun_used","Traitor All ([objective])")
for(var/mob/living/carbon/human/H in GLOB.player_list)
if(H.stat == 2 || !H.client || !H.mind) continue
if(is_special_character(H)) continue
@@ -365,7 +365,7 @@
if("changebombcap")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Bomb Cap")
SSblackbox.add_details("admin_secrets_fun_used","Bomb Cap")
var/newBombCap = input(usr,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be above 4)", "New Bomb Cap", GLOB.MAX_EX_LIGHT_RANGE) as num|null
if (newBombCap < 4)
@@ -384,7 +384,7 @@
if("blackout")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Break All Lights")
SSblackbox.add_details("admin_secrets_fun_used","Break All Lights")
message_admins("[key_name_admin(usr)] broke all lights")
for(var/obj/machinery/light/L in GLOB.machines)
L.break_light_tube()
@@ -400,7 +400,7 @@
if(animetype == "Cancel" || droptype == "Cancel")
return
feedback_add_details("admin_secrets_fun_used","Chinese Cartoons")
SSblackbox.add_details("admin_secrets_fun_used","Chinese Cartoons")
message_admins("[key_name_admin(usr)] made everything kawaii.")
for(var/mob/living/carbon/human/H in GLOB.mob_list)
H << sound('sound/AI/animes.ogg')
@@ -430,7 +430,7 @@
if("whiteout")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Fix All Lights")
SSblackbox.add_details("admin_secrets_fun_used","Fix All Lights")
message_admins("[key_name_admin(usr)] fixed all lights")
for(var/obj/machinery/light/L in GLOB.machines)
L.fix()
@@ -441,7 +441,7 @@
if("virus")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Virus Outbreak")
SSblackbox.add_details("admin_secrets_fun_used","Virus Outbreak")
switch(alert("Do you want this to be a random disease or do you have something in mind?",,"Make Your Own","Random","Choose"))
if("Make Your Own")
AdminCreateVirus(usr.client)
@@ -456,7 +456,7 @@
if("retardify")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Mass Braindamage")
SSblackbox.add_details("admin_secrets_fun_used","Mass Braindamage")
for(var/mob/living/carbon/human/H in GLOB.player_list)
to_chat(H, "<span class='boldannounce'>You suddenly feel stupid.</span>")
H.setBrainLoss(60)
@@ -465,7 +465,7 @@
if("eagles")//SCRAW
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Egalitarian Station")
SSblackbox.add_details("admin_secrets_fun_used","Egalitarian Station")
for(var/obj/machinery/door/airlock/W in GLOB.machines)
if(W.z == ZLEVEL_STATION && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
W.req_access = list()
@@ -475,7 +475,7 @@
if("guns")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Summon Guns")
SSblackbox.add_details("admin_secrets_fun_used","Summon Guns")
var/survivor_probability = 0
switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!"))
if("Some Antags")
@@ -488,7 +488,7 @@
if("magic")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Summon Magic")
SSblackbox.add_details("admin_secrets_fun_used","Summon Magic")
var/survivor_probability = 0
switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!"))
if("Some Antags")
@@ -504,22 +504,22 @@
if(!SSevents.wizardmode)
if(alert("Do you want to toggle summon events on?",,"Yes","No") == "Yes")
summonevents()
feedback_add_details("admin_secrets_fun_used","Activate Summon Events")
SSblackbox.add_details("admin_secrets_fun_used","Activate Summon Events")
else
switch(alert("What would you like to do?",,"Intensify Summon Events","Turn Off Summon Events","Nothing"))
if("Intensify Summon Events")
summonevents()
feedback_add_details("admin_secrets_fun_used","Intensify Summon Events")
SSblackbox.add_details("admin_secrets_fun_used","Intensify Summon Events")
if("Turn Off Summon Events")
SSevents.toggleWizardmode()
SSevents.resetFrequency()
feedback_add_details("admin_secrets_fun_used","Disable Summon Events")
SSblackbox.add_details("admin_secrets_fun_used","Disable Summon Events")
if("dorf")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","Dwarf Beards")
SSblackbox.add_details("admin_secrets_fun_used","Dwarf Beards")
for(var/mob/living/carbon/human/B in GLOB.mob_list)
B.facial_hair_style = "Dward Beard"
B.update_hair()
@@ -528,21 +528,21 @@
if("onlyone")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","There Can Be Only One")
SSblackbox.add_details("admin_secrets_fun_used","There Can Be Only One")
usr.client.only_one()
send_to_playing_players('sound/misc/highlander.ogg')
if("delayed_onlyone")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","There Can Be Only One")
SSblackbox.add_details("admin_secrets_fun_used","There Can Be Only One")
usr.client.only_one_delayed()
send_to_playing_players('sound/misc/highlander_delayed.ogg')
if("onlyme")
if(!check_rights(R_FUN))
return
feedback_add_details("admin_secrets_fun_used","There Can Be Only Me")
SSblackbox.add_details("admin_secrets_fun_used","There Can Be Only Me")
only_me()
if("maint_access_brig")