and finally, the modules folder. Now I can publish and take a break

2018-07-02 01:19:37 -04:00
parent 91805b8789
commit b1688405d9
380 changed files with 2204 additions and 1588 deletions
@@ -222,7 +222,7 @@
 		if(ACCESS_ENGINE)
 			return "Engineering"
 		if(ACCESS_ENGINE_EQUIP)
-			return "Power Equipment"
+			return "Power and Engineering Equipment"
 		if(ACCESS_MAINT_TUNNELS)
 			return "Maintenance"
 		if(ACCESS_EXTERNAL_AIRLOCKS)
@@ -143,8 +143,10 @@ GLOBAL_PROTECT(exp_to_update)
 		L.update_exp_list(mins,ann)

 /datum/controller/subsystem/blackbox/proc/update_exp_db()
-	SSdbcore.MassInsert(format_table_name("role_time"), GLOB.exp_to_update, "ON DUPLICATE KEY UPDATE minutes = minutes + VALUES(minutes)")
-	LAZYCLEARLIST(GLOB.exp_to_update)
+	set waitfor = FALSE
+	var/list/old_minutes = GLOB.exp_to_update
+	GLOB.exp_to_update = null
+	SSdbcore.MassInsert(format_table_name("role_time"), old_minutes, "ON DUPLICATE KEY UPDATE minutes = minutes + VALUES(minutes)")

 //resets a client's exp to what was in the db.
 /client/proc/set_exp_from_db()
@@ -154,10 +156,12 @@ GLOBAL_PROTECT(exp_to_update)
 		return -1
 	var/datum/DBQuery/exp_read = SSdbcore.NewQuery("SELECT job, minutes FROM [format_table_name("role_time")] WHERE ckey = '[sanitizeSQL(ckey)]'")
 	if(!exp_read.Execute())
+		qdel(exp_read)
 		return -1
 	var/list/play_records = list()
 	while(exp_read.NextRow())
 		play_records[exp_read.item[1]] = text2num(exp_read.item[2])
+	qdel(exp_read)

 	for(var/rtype in SSjob.name_occupations)
 		if(!play_records[rtype])
@@ -186,7 +190,9 @@ GLOBAL_PROTECT(exp_to_update)
 	var/datum/DBQuery/flag_update = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET flags = '[prefs.db_flags]' WHERE ckey='[sanitizeSQL(ckey)]'")

 	if(!flag_update.Execute())
+		qdel(flag_update)
 		return -1
+	qdel(flag_update)


 /client/proc/update_exp_list(minutes, announce_changes = FALSE)
@@ -264,10 +270,12 @@ GLOBAL_PROTECT(exp_to_update)
 	var/datum/DBQuery/flags_read = SSdbcore.NewQuery("SELECT flags FROM [format_table_name("player")] WHERE ckey='[ckey]'")

 	if(!flags_read.Execute())
+		qdel(flags_read)
 		return FALSE

 	if(flags_read.NextRow())
 		prefs.db_flags = text2num(flags_read.item[1])
 	else if(isnull(prefs.db_flags))
 		prefs.db_flags = 0	//This PROBABLY won't happen, but better safe than sorry.
+	qdel(flags_read)
 	return TRUE
@@ -18,7 +18,7 @@ Clown
 	minimal_access = list(ACCESS_THEATRE)

 /datum/job/clown/after_spawn(mob/living/carbon/human/H, mob/M)
-	H.rename_self("clown", M.client)
+	H.apply_pref_name("clown", M.client)

 /datum/outfit/job/clown
 	name = "Clown"
@@ -81,7 +81,7 @@ Mime
 	minimal_access = list(ACCESS_THEATRE)

 /datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
-	H.rename_self("mime", M.client)
+	H.apply_pref_name("mime", M.client)

 /datum/outfit/job/mime
 	name = "Mime"
@@ -49,7 +49,7 @@
 	var/exp_type_department = ""

 	//The amount of good boy points playing this role will earn you towards a higher chance to roll antagonist next round
-	//can be overriden by antag_rep.txt config
+	//can be overridden by antag_rep.txt config
 	var/antag_rep = 10

 //Only override this proc
@@ -81,7 +81,7 @@
 	if(CONFIG_GET(flag/enforce_human_authority) && (title in GLOB.command_positions))
 		if(H.dna.species.id != "human")
 			H.set_species(/datum/species/human)
-			H.rename_self("human", H.client)
+			H.apply_pref_name("human", H.client)
 		purrbation_remove(H, silent=TRUE)

 	//Equip the rest of the gear
@@ -34,7 +34,7 @@ AI
 			H.forceMove(lateJoinCore.loc)
 			qdel(lateJoinCore)
 	var/mob/living/silicon/ai/AI = H
-	AI.rename_self("ai", M.client)			//If this runtimes oh well jobcode is fucked.
+	AI.apply_pref_name("ai", M.client)			//If this runtimes oh well jobcode is fucked.

 	//we may have been created after our borg
 	if(SSticker.current_state == GAME_STATE_SETTING_UP)
@@ -85,4 +85,4 @@ Cyborg
 	return H.Robotize(FALSE, latejoin)

 /datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M)
-	R.rename_self("cyborg", M.client)
+	R.updatename(M.client)