cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-29 15:46:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/supermatter/supermatter.dm
This commit is contained in:
SoundScopes
2014-11-06 01:25:13 +00:00
parent 7696545af2 3944ec5f5d
commit 4090f46636
31 changed files with 526 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/IsBanned.dm
+21
View File
@@ -17,6 +17,27 @@ world/IsBanned(key,address,computer_id)
AddBan(ckey(key), computer_id, "Use of ToR", "Automated Ban", 0, 0)
return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [config.banappeals]")
if(config && config.ip_blacklist_enabled)
testing("Loading Blacklist")
var/text = file2text("data/ip_blacklist.txt")
if (!text)
error("Failed to load data/ip_blacklist.txt")
else
var/list/lines = text2list(text, "\n")
for(var/line in lines)
if (!line)
continue
if (copytext(line, 1, 2) == ";")
continue
var/banned_address = copytext(line, 1, length(line)+1)
testing("Blacklist: address:[address] - banned_address:[banned_address]")
if(banned_address == address)
log_access("Failed Login: [src] - Blacklisted IP")
message_admins("\blue Failed Login: [src] - Blacklisted IP")
AddBan(ckey(key), computer_id, "Bad IP", "Automated Ban", 0, 0)
return list("reason"="IP Blacklisted", "desc"="\nReason: This IP has been blacklisted from the server.\nIf you believe this is a mistake, please request help at [config.banappeals]")
if(config.ban_legacy_system)
code/modules/admin/admin.dm
+76 -3
View File
@@ -740,12 +740,50 @@ var/global/floorIsLava = 0
ooc_allowed = !( ooc_allowed )
if (ooc_allowed)
world << "<B>The OOC channel has been globally enabled!</B>"
ooc_dev_allowed = 1
ooc_mod_allowed = 1
else
world << "<B>The OOC channel has been globally disabled!</B>"
log_admin("[key_name(usr)] toggled OOC.")
message_admins("[key_name_admin(usr)] toggled OOC.", 1)
feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/toggledevooc()
set category = "Server"
set desc="Toggles Developer OOC"
set name="Toggle Dev OOC"
if(ooc_allowed)
usr << "OOC needs to be muted first"
return
ooc_dev_allowed = !( ooc_dev_allowed )
var/looc_status
if (ooc_dev_allowed)
looc_status = "Enabled"
else
looc_status = "Disabled"
log_admin("[key_name(usr)] [looc_status] Developer OOC.")
message_admins("[key_name_admin(usr)] [looc_status] Developer OOC.", 1)
msg_scopes("<B>Developer OOC has been [looc_status]</B>",1,1)
feedback_add_details("admin_verb","TDOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/togglemodooc()
set category = "Server"
set desc="Toggles Moderators OOC"
set name="Toggle Mod OOC"
if(ooc_allowed)
usr << "OOC needs to be muted first"
return
ooc_mod_allowed = !( ooc_mod_allowed )
var/looc_status
if (ooc_mod_allowed)
looc_status = "Enabled"
else
looc_status = "Disabled"
log_admin("[key_name(usr)] toggled Mod OOC.")
message_admins("[key_name_admin(usr)] [looc_status] Moderator OOC.", 1)
message_mods("<B>Moderator OOC has been [looc_status]</B>")
feedback_add_details("admin_verb","TMOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/togglelooc()
set category = "Server"
set desc="Globally Toggles LOOC"
@@ -753,14 +791,49 @@ var/global/floorIsLava = 0
looc_allowed = !( looc_allowed )
if (looc_allowed)
world << "<B>The LOOC channel has been globally enabled!</B>"
looc_dev_allowed = 1
looc_mod_allowed = 1
else
world << "<B>The LOOC channel has been globally disabled!</B>"
log_admin("[key_name(usr)] toggled LOOC.")
message_admins("[key_name_admin(usr)] toggled LOOC.", 1)
feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/toggledevlooc()
set category = "Server"
set desc="Toggles Developer LOOC"
set name="Toggle Dev LOOC"
if(looc_allowed)
usr << "Looc needs to be muted first"
return
looc_dev_allowed = !( looc_dev_allowed )
var/looc_status
if (looc_dev_allowed)
looc_status = "Enabled"
else
looc_status = "Disabled"
log_admin("[key_name(usr)] [looc_status] Developer LOOC.")
message_admins("[key_name_admin(usr)] [looc_status] Developer LOOC.", 1)
msg_scopes("<B>Developer LOOC has been [looc_status]</B>",1,1)
feedback_add_details("admin_verb","TDLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/togglemodlooc()
set category = "Server"
set desc="Toggles Moderator LOOC"
set name="Toggle Mod LOOC"
if(looc_allowed)
usr << "Looc needs to be muted first"
return
looc_mod_allowed = !( looc_mod_allowed )
var/looc_status
if (looc_mod_allowed)
looc_status = "Enabled"
else
looc_status = "Disabled"
log_admin("[key_name(usr)] [looc_status] Moderator LOOC.")
message_admins("[key_name_admin(usr)] [looc_status] Moderator LOOC.", 1)
message_mods("<B>Moderator LOOC has been [looc_status]</B>")
feedback_add_details("admin_verb","TMLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/toggledsay()
set category = "Server"
@@ -879,8 +952,8 @@ var/global/floorIsLava = 0
if (!ticker || ticker.current_state != GAME_STATE_PREGAME)
ticker.delay_end = !ticker.delay_end
log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
message_mods("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
message_admins("\blue [key_name(usr)] [ticker.delay_end ? "<font color=#FF0000>delayed</font> the round end" : "has made the round end <font color=#00FF00>normally</font>"].", 1)
message_mods("\blue [key_name(usr)] [ticker.delay_end ? "<font color=#FF0000>delayed</font> the round end" : "has made the round end <font color=#00FF00>normally</font>"].", 1)
return //alert("Round end delayed", null, null, null, null, null)
going = !( going )
if (!( going ))
code/modules/admin/admin_verbs.dm
+49 -1
View File
@@ -59,7 +59,11 @@ var/list/admin_verbs_admin = list(
/client/proc/secrets,
/client/proc/toggleprayers,
/datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/
/datum/admins/proc/toggledevooc,
/datum/admins/proc/togglemodooc,
/datum/admins/proc/togglelooc,
/datum/admins/proc/togglemodlooc,
/datum/admins/proc/toggledevlooc,
/datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/
/datum/admins/proc/toggledsay, /*toggles dsay on/off for everyone*/
/client/proc/game_panel, /*game panel, allows to change game-mode etc*/
@@ -138,6 +142,7 @@ var/list/admin_verbs_dev = list(
/client/proc/cmd_dev_say,
/client/proc/cmd_dev_bst,
/client/proc/cmd_dev_reset_gravity,
/client/proc/cmd_dev_reset_floating,
/client/proc/togglescopeslogs
)
var/list/admin_verbs_spawn = list(
@@ -188,7 +193,10 @@ var/list/admin_verbs_debug = list(
/client/proc/toggledebuglogs,
/client/proc/SDQL_query,
/client/proc/SDQL2_query,
/client/proc/cmd_dev_reset_gravity
/client/proc/cmd_dev_reset_gravity,
/client/proc/cmd_dev_reset_floating,
/client/proc/cleartox,
/client/proc/fillspace
)
var/list/admin_verbs_possess = list(
/proc/possess,
@@ -330,6 +338,7 @@ var/list/admin_verbs_mod = list(
admin_verbs_rejuv,
admin_verbs_sounds,
admin_verbs_spawn,
admin_verbs_dev,
/*Debug verbs added by "show debug verbs"*/
/client/proc/Cell,
/client/proc/do_not_use_these,
@@ -961,3 +970,42 @@ var/list/admin_verbs_mod = list(
usr << "You now will get advanced debug logs"
else
usr << "You now won't get advanced debug logs"
/client/proc/cleartox()
set category = "Special Verbs"
set name = "Clear Toxin/Fire in Zone"
if(!check_rights(R_DEBUG))
return
var/datum/gas_mixture/environment = usr.loc.return_air()
environment.toxins_archived = null
environment.toxins = 0
environment.carbon_dioxide = 0
environment.carbon_dioxide_archived = null
environment.oxygen = 21.8366
environment.oxygen_archived = null
environment.nitrogen = 82.1472
environment.nitrogen_archived = null
environment.temperature_archived = null
environment.temperature = 293.15
environment.update_values()
var/turf/simulated/location = get_turf(usr)
if(location.zone)
for(var/turf/T in location.zone.contents)
for(var/obj/fire/F in T.contents)
del(F)
for(var/obj/fire/FF in world)
del(FF)
/client/proc/fillspace()
set category = "Special Verbs"
set name = "Fill Space with floor"
if(!check_rights(R_DEBUG))
return
var/area/location = usr.loc.loc
if(location.name != "Space")
for(var/turf/space/S in location)
S.ChangeTurf(/turf/simulated/floor/plating)
if(location.name == "Space")
for(var/turf/space/S in range(2,usr.loc))
S.ChangeTurf(/turf/simulated/floor/plating)
code/modules/admin/player_panel.dm
+3 -1
View File
@@ -81,7 +81,9 @@
body += "<a href='?src=\ref[src];traitor="+ref+"'>TP</a> - "
body += "<a href='?src=\ref[usr];priv_msg=\ref"+ref+"'>PM</a> - "
body += "<a href='?src=\ref[src];subtlemessage="+ref+"'>SM</a> - "
body += "<a href='?src=\ref[src];adminplayerobservejump="+ref+"'>JMP</a><br>"
body += "<a href='?src=\ref[src];adminplayerobservejump="+ref+"'>JMP</a> - "
body += "<a href='?src=\ref[src];admin_wind_player="+ref+"'>WIND</a><br>"
if(antagonist > 0)
body += "<font size='2'><a href='?src=\ref[src];check_antagonist=1'><font color='red'><b>Antagonist</b></font></a></font>";
code/modules/admin/topic.dm
+17
View File
@@ -2768,3 +2768,20 @@
if("list")
PlayerNotesPage(text2num(href_list["index"]))
return
if(href_list["admin_wind_player"])
var/mob/M = locate(href_list["admin_wind_player"])
if(!ismob(M))
usr << "This can only be used on instances of type /mob"
return
if(!M.ckey) //sanity
usr << "This mob has no ckey"
return
if(alert("Wind [M]?",,"Yes","No")!="Yes")
return
M.weakened = 500
return