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

Merge remote-tracking branch 'refs/remotes/Aurorastation/master'

Browse Source
This commit is contained in:
Lord Lag
2016-02-16 17:50:57 +00:00
parent 1106cd7c1f f8bd9ef783
commit fb0715d5cc
15 changed files with 1253 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/procs/dbcore.dm
+3
View File
@@ -181,6 +181,7 @@ DBQuery/proc/SetConversion(column,conversion)
*/
DBQuery/proc/parseArguments(var/query_to_parse = null, var/list/argument_list, var/pass_not_found = 0)
if (!query_to_parse || !argument_list || !argument_list.len)
log_debug("parseArguments() failed! Improper arguments sent!")
return 0
for (var/placeholder in argument_list)
@@ -188,6 +189,7 @@ DBQuery/proc/parseArguments(var/query_to_parse = null, var/list/argument_list, v
if (pass_not_found)
continue
else
log_debug("parseArguments() failed! Key not found: [placeholder].")
return 0
var/argument = argument_list[placeholder]
@@ -199,6 +201,7 @@ DBQuery/proc/parseArguments(var/query_to_parse = null, var/list/argument_list, v
else if (isnum(argument))
argument = "'[argument]'"
else
log_debug("parseArguments() failed! Cannot identify argument!")
return 0
query_to_parse = replacetextEx(query_to_parse, placeholder, argument)
code/modules/admin/admin.dm
+1 -1
View File
@@ -1081,7 +1081,7 @@ proc/admin_notice(var/message, var/rights)
set desc = "(atom path) Spawn an atom"
set name = "Spawn"
if(!check_rights(R_SPAWN)) return
if(!check_rights(R_SPAWN|R_DEV)) return
var/list/types = typesof(/atom)
var/list/matches = new()
code/modules/admin/player_notes_sql.dm
+1 -1
View File
@@ -79,7 +79,7 @@
usr << "Cancelled"
return
var/DBQuery/editquery = dbcon.NewQuery("UPDATE ss13_notes SET content = :new_content, lasteditor = :a_ckey, lasteditdate = Now(), edited = 1 WHERE id = :note_id")
editquery.Execute(list(":new_conent" = new_content, ":a_ckey" = usr.client.ckey, ":note_id" = note_id))
editquery.Execute(list(":new_content" = new_content, ":a_ckey" = usr.client.ckey, ":note_id" = note_id))
/datum/admins/proc/show_notes_sql(var/player_ckey = null, var/admin_ckey = null)
if (!check_rights(R_ADMIN|R_MOD))
code/modules/admin/verbs/adminjump.dm
+5 -5
View File
@@ -8,7 +8,7 @@
set name = "Jump to Area"
set desc = "Area to jump to"
set category = "Admin"
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
return
if(config.allow_admin_jump)
@@ -24,7 +24,7 @@
/client/proc/jumptoturf(var/turf/T in world)
set name = "Jump to Turf"
set category = "Admin"
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
return
if(config.allow_admin_jump)
log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
@@ -40,7 +40,7 @@
set category = "Admin"
set name = "Jump to Mob"
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
return
if(config.allow_admin_jump)
@@ -62,7 +62,7 @@
set category = "Admin"
set name = "Jump to Coordinate"
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
return
if (config.allow_admin_jump)
@@ -82,7 +82,7 @@
set category = "Admin"
set name = "Jump to Key"
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
return
if(config.allow_admin_jump)
code/modules/admin/verbs/warning.dm
+1 -1
View File
@@ -375,7 +375,7 @@
if ("delete")
if(alert("Delete this warning?", "Delete?", "Yes", "No") == "Yes")
var/DBQuery/deleteQuery = dbcon.NewQuery("UPDATE ss13_warnings SET visible = 0 WHERE id = :warning_id")
deleteQuery.Execute(query_details)
deleteQuery.Execute(query_details, 1)
message_admins("\blue [key_name_admin(usr)] deleted one of [ckey]'s warnings.")
log_admin("[key_name(usr)] deleted one of [ckey]'s warnings.")
code/modules/client/client procs.dm
+7
View File
@@ -67,6 +67,13 @@
if("prefs") return prefs.process_link(usr,href_list)
if("vars") return view_var_Topic(href,href_list,hsrc)
if(href_list["warnacknowledge"])
var/queryid = text2num(href_list["warnacknowledge"])
warnings_acknowledge(queryid)
if(href_list["warnview"])
warnings_check()
..() //redirect to hsrc.Topic()
/client/proc/handle_spam_prevention(var/message, var/mute_type)
html/changelog.html
+56
View File
@@ -56,6 +56,62 @@
-->
<div class="commit sansserif">
<h2 class="date">15 February 2016</h2>
<h3 class="author">Lord Lag updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Synthetics should now be able to understand Rootspeak and Vaurcese.</li>
<li class="bugfix">Core Vaurca mechanics are back</li>
</ul>
<h2 class="date">12 February 2016</h2>
<h3 class="author">Ryan784 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixed ChemMaster pill creation spam.</li>
<li class="bugfix">Chaplains can no longer be Vampires.</li>
<li class="bugfix">IPCs will no longer be considered for innapropriate antag positions (Vampire and Changeling).</li>
<li class="bugfix">Changelings will now retain proper abilities using lesser form, and the ability to transform back.</li>
<li class="bugfix">pAI suicide now works correctly.</li>
</ul>
<h2 class="date">01 February 2016</h2>
<h3 class="author">Lady of Ravens updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Ported Aurora's stungloves and modified force gloves.</li>
<li class="rscadd">Ported Aurora's mechanics of heavy machinery eating hair.</li>
</ul>
<h3 class="author">Lord Lag updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Ported the Vaurca.</li>
</ul>
<h3 class="author">Mahzel updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Ported Aurora's intern positions.</li>
<li class="rscadd">Ported Aurora's magnetic door locks.</li>
<li class="rscadd">Ported Aurora's prisoner suits.</li>
</ul>
<h3 class="author">Ryan784 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Ported Aurora's null-rod conversion mechanics for cult.</li>
<li class="rscadd">Ported Aurora's welderbomb delay and related admin/mod actions.</li>
<li class="rscadd">Ported Aurora's horsemask removal spell.</li>
<li class="rscadd">Ported Aurora's glove kits for aliens.</li>
<li class="rscadd">Ported Aurora's gold slime mechanics.</li>
<li class="rscadd">Ported Aurora's lawgiver.</li>
<li class="rscadd">Ported the AI HUD, originally by Jack-Fractal.</li>
<li class="rscadd">Ported Aurora's footstep sounds.</li>
<li class="experiment">Ported the vampire code. Needs a lot of testing and may break.</li>
</ul>
<h3 class="author">Skull132 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Ported Telescience from TGStation.</li>
<li class="rscadd">Ported Aurora's old rifle code, with minor refractors.</li>
<li class="rscadd">Ported Aurora's forensics code. Code refractored by Zuhayr.</li>
<li class="rscadd">Ported SQL based whitelisting, playernotes, warnings. Refractored where necessary.</li>
<li class="tweak">Adjusted the Bay12 paralyze player function to work as our wind function used to work. It also now gives warnings to people nearby if someone was winded.</li>
<li class="tweak">Made tasers to actually fire projectiles again. And not lasers. Tasers are not lasers, sillys.</li>
<li class="tweak">Handcuffing does not require you to have the person in level 2 grab, as it does in vanilla bay.</li>
</ul>
<h2 class="date">06 December 2015</h2>
<h3 class="author">Hubblenaut updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+1179 -1441
View File
File diff suppressed because it is too large Load Diff
html/changelogs/Ryan784-development.yml
-14
View File
@@ -1,14 +0,0 @@
author: Ryan784
delete-after: True
changes:
- rscadd: "Ported Aurora's null-rod conversion mechanics for cult."
- rscadd: "Ported Aurora's welderbomb delay and related admin/mod actions."
- rscadd: "Ported Aurora's horsemask removal spell."
- rscadd: "Ported Aurora's glove kits for aliens."
- rscadd: "Ported Aurora's gold slime mechanics."
- rscadd: "Ported Aurora's lawgiver."
- rscadd: "Ported the AI HUD, originally by Jack-Fractal."
- rscadd: "Ported Aurora's footstep sounds."
- experiment: "Ported the vampire code. Needs a lot of testing and may break."
html/changelogs/Skull132-development.yml
-12
View File
@@ -1,12 +0,0 @@
author: Skull132
delete-after: True
changes:
- rscadd: "Ported Telescience from TGStation."
- rscadd: "Ported Aurora's old rifle code, with minor refractors."
- rscadd: "Ported Aurora's forensics code. Code refractored by Zuhayr."
- rscadd: "Ported SQL based whitelisting, playernotes, warnings. Refractored where necessary."
- tweak: "Adjusted the Bay12 paralyze player function to work as our wind function used to work. It also now gives warnings to people nearby if someone was winded."
- tweak: "Made tasers to actually fire projectiles again. And not lasers. Tasers are not lasers, sillys."
- tweak: "Handcuffing does not require you to have the person in level 2 grab, as it does in vanilla bay."
html/changelogs/[Lord Lag]-[Synthetic Language fix].yml
-6
View File
@@ -1,6 +0,0 @@
author: Lord Lag
delete-after: True
changes:
- bugfix: "Synthetics should now be able to understand Rootspeak and Vaurcese."
html/changelogs/[Lord Lag]-[Vaurca Flag work around].yml
-6
View File
@@ -1,6 +0,0 @@
author: Lord Lag
delete-after: True
changes:
- bugfix: "Core Vaurca mechanics are back"
html/changelogs/ladyofravens-development.yml
-7
View File
@@ -1,7 +0,0 @@
author: Lady of Ravens
delete-after: True
changes:
- rscadd: "Ported Aurora's stungloves and modified force gloves."
- rscadd: "Ported Aurora's mechanics of heavy machinery eating hair."
html/changelogs/lordlag-development.yml
-6
View File
@@ -1,6 +0,0 @@
author: Lord Lag
delete-after: True
changes:
- rscadd: "Ported the Vaurca."
html/changelogs/mahzel-development.yml
-8
View File
@@ -1,8 +0,0 @@
author: Mahzel
delete-after: True
changes:
- rscadd: "Ported Aurora's intern positions."
- rscadd: "Ported Aurora's magnetic door locks."
- rscadd: "Ported Aurora's prisoner suits."