cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #112 from LordLag/master

Browse Source 
Malf dual AI fix attempt, Fixes #55
This commit is contained in:
skull132
2016-02-11 18:45:30 +02:00
parent 860ac3b19f 289cd15b82
commit 665b8373b4
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baystation12.dme
+1
View File
@@ -1275,6 +1275,7 @@
#include "code\modules\mob\living\silicon\decoy\life.dm"
#include "code\modules\mob\living\silicon\pai\admin.dm"
#include "code\modules\mob\living\silicon\pai\death.dm"
#include "code\modules\mob\living\silicon\pai\emote.dm"
#include "code\modules\mob\living\silicon\pai\examine.dm"
#include "code\modules\mob\living\silicon\pai\life.dm"
#include "code\modules\mob\living\silicon\pai\pai.dm"
code/game/jobs/job_controller.dm
+1 -1
View File
@@ -250,7 +250,7 @@ var/global/datum/controller/occupations/job_master
// Loop through all jobs
for(var/datum/job/job in shuffledoccupations) // SHUFFLE ME BABY
if(!job || ticker.mode.disabled_jobs.Find(job.title) )
if(!job || (job.title in ticker.mode.disabled_jobs) ) //11/2/16
continue
if(jobban_isbanned(player, job.title))
code/modules/admin/DB ban/ban_mirroring.dm
+1 -1
View File
@@ -49,7 +49,7 @@
if (bad_data)
var/DBQuery/new_mirror = dbcon.NewQuery("INSERT INTO ss13_ban_mirrors (ban_id, player_ckey, ban_mirror_ip, ban_mirror_computerid, ban_mirror_datetime) VALUES (:ban_id, :ckey, :address, :computerid, NOW())")
new_mirror.Execute(":ban_id" = ban_id, ":ckey" = ckey, ":address" = address, ":computerid" = computer_id)
new_mirror.Execute(list(":ban_id" = ban_id, ":ckey" = ckey, ":address" = address, ":computerid" = computer_id))
log_misc("Mirrored ban #[ban_id] for player [ckey] from [address]-[computer_id].")
code/modules/admin/verbs/adminhelp.dm
+2 -2
View File
@@ -107,8 +107,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
admin_number_afk++
if(X.prefs.toggles & SOUND_ADMINHELP)
X << 'sound/effects/adminhelp.ogg'
else
X << msg
X << msg
//show it to the person adminhelping too
src << "<font color='blue'>PM to-<b>Staff </b>: [original_msg]</font>"
code/modules/mob/living/silicon/ai/latejoin.dm
+2
View File
@@ -1,6 +1,8 @@
var/global/list/empty_playable_ai_cores = list()
/hook/roundstart/proc/spawn_empty_ai()
if("AI" in ticker.mode.disabled_jobs)
return 1 // Don't make empty AI's on malf.
for(var/obj/effect/landmark/start/S in landmarks_list)
if(S.name != "AI")
continue