"
@@ -84,7 +84,7 @@
establish_db_connection()
if(dbcon.IsConnected())
- var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM erro_poll_question WHERE id = [pollid]")
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM [format_table_name("poll_question")] WHERE id = [pollid]")
select_query.Execute()
var/pollstarttime = ""
@@ -109,7 +109,7 @@
switch(polltype)
//Polls that have enumerated options
if("OPTION")
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT optionid FROM erro_poll_vote WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT optionid FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
voted_query.Execute()
var/voted = 0
@@ -121,7 +121,7 @@
var/list/datum/polloption/options = list()
- var/DBQuery/options_query = dbcon.NewQuery("SELECT id, text FROM erro_poll_option WHERE pollid = [pollid]")
+ var/DBQuery/options_query = dbcon.NewQuery("SELECT id, text FROM [format_table_name("poll_option")] WHERE pollid = [pollid]")
options_query.Execute()
while(options_query.NextRow())
var/datum/polloption/PO = new()
@@ -162,7 +162,7 @@
//Polls with a text input
if("TEXT")
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT replytext FROM erro_poll_textreply WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT replytext FROM [format_table_name("poll_textreply")] WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
voted_query.Execute()
var/voted = 0
@@ -204,7 +204,7 @@
//Polls with a text input
if("NUMVAL")
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT o.text, v.rating FROM erro_poll_option o, erro_poll_vote v WHERE o.pollid = [pollid] AND v.ckey = '[usr.ckey]' AND o.id = v.optionid")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT o.text, v.rating FROM [format_table_name("poll_option")] o, erro_poll_vote v WHERE o.pollid = [pollid] AND v.ckey = '[usr.ckey]' AND o.id = v.optionid")
voted_query.Execute()
var/output = "
Player poll"
@@ -230,7 +230,7 @@
var/minid = 999999
var/maxid = 0
- var/DBQuery/option_query = dbcon.NewQuery("SELECT id, text, minval, maxval, descmin, descmid, descmax FROM erro_poll_option WHERE pollid = [pollid]")
+ var/DBQuery/option_query = dbcon.NewQuery("SELECT id, text, minval, maxval, descmin, descmid, descmax FROM [format_table_name("poll_option")] WHERE pollid = [pollid]")
option_query.Execute()
while(option_query.NextRow())
var/optionid = text2num(option_query.item[1])
@@ -273,7 +273,7 @@
src << browse(output,"window=playerpoll;size=500x500")
if("MULTICHOICE")
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT optionid FROM erro_poll_vote WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT optionid FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
voted_query.Execute()
var/list/votedfor = list()
@@ -286,7 +286,7 @@
var/maxoptionid = 0
var/minoptionid = 0
- var/DBQuery/options_query = dbcon.NewQuery("SELECT id, text FROM erro_poll_option WHERE pollid = [pollid]")
+ var/DBQuery/options_query = dbcon.NewQuery("SELECT id, text FROM [format_table_name("poll_option")] WHERE pollid = [pollid]")
options_query.Execute()
while(options_query.NextRow())
var/datum/polloption/PO = new()
@@ -345,7 +345,7 @@
establish_db_connection()
if(dbcon.IsConnected())
- var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
select_query.Execute()
var/validpoll = 0
@@ -363,7 +363,7 @@
usr << "\red Poll is not valid."
return
- var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
+ var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
select_query2.Execute()
var/validoption = 0
@@ -378,7 +378,7 @@
var/alreadyvoted = 0
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM erro_poll_vote WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
voted_query.Execute()
while(voted_query.NextRow())
@@ -399,7 +399,7 @@
adminrank = usr.client.holder.rank
- var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
+ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
insert_query.Execute()
usr << "\blue Vote successful."
@@ -415,7 +415,7 @@
establish_db_connection()
if(dbcon.IsConnected())
- var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
select_query.Execute()
var/validpoll = 0
@@ -432,7 +432,7 @@
var/alreadyvoted = 0
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM erro_poll_textreply WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_textreply")] WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
voted_query.Execute()
while(voted_query.NextRow())
@@ -457,7 +457,7 @@
usr << "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again."
return
- var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_textreply (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
+ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_textreply")] (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
insert_query.Execute()
usr << "\blue Feedback logging successful."
@@ -473,7 +473,7 @@
establish_db_connection()
if(dbcon.IsConnected())
- var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
select_query.Execute()
var/validpoll = 0
@@ -488,7 +488,7 @@
usr << "\red Poll is not valid."
return
- var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
+ var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
select_query2.Execute()
var/validoption = 0
@@ -503,7 +503,7 @@
var/alreadyvoted = 0
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM erro_poll_vote WHERE optionid = [optionid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_vote")] WHERE optionid = [optionid] AND ckey = '[usr.ckey]'")
voted_query.Execute()
while(voted_query.NextRow())
@@ -519,7 +519,7 @@
adminrank = usr.client.holder.rank
- var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
+ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
insert_query.Execute()
usr << "\blue Vote successful."
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 363675b723c..b60ebe12c5d 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -1,11 +1,12 @@
datum/preferences
//The mob should have a gender you want before running this proc. Will run fine without H
- proc/randomize_appearance_for(var/mob/living/carbon/human/H)
- if(H)
- if(H.gender == MALE)
- gender = MALE
- else
- gender = FEMALE
+ proc/random_character(gender_override)
+ if(gender_override)
+ gender = gender_override
+ else
+ gender = pick(MALE, FEMALE)
+ underwear = random_underwear(gender)
+ undershirt = random_undershirt(gender)
if(species == "Human")
s_tone = random_skin_tone()
h_style = random_hair_style(gender, species)
@@ -16,12 +17,8 @@ datum/preferences
randomize_eyes_color()
if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Vulpkanin")
randomize_skin_color()
- underwear = rand(1,underwear_m.len)
- undershirt = rand(1,undershirt_t.len)
backbag = 2
age = rand(AGE_MIN,AGE_MAX)
- if(H)
- copy_to(H,1)
proc/randomize_hair_color(var/target = "hair")
@@ -256,12 +253,16 @@ datum/preferences
var/icon/underwear_s = null
- if(underwear > 0 && underwear < 7 && current_species.flags & HAS_UNDERWEAR)
- underwear_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "underwear[underwear]_[g]_s")
+ if(underwear && current_species.flags & HAS_UNDERWEAR)
+ var/datum/sprite_accessory/underwear/U = underwear_list[underwear]
+ if(U)
+ underwear_s = new/icon(U.icon, "[U.icon_state]_s", ICON_OVERLAY)
var/icon/undershirt_s = null
- if(undershirt > 0 && undershirt < 45 && current_species.flags & HAS_UNDERWEAR)
- undershirt_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "undershirt[undershirt]_s")
+ if(undershirt && current_species.flags & HAS_UNDERWEAR)
+ var/datum/sprite_accessory/undershirt/U2 = undershirt_list[undershirt]
+ if(U2)
+ undershirt_s = new/icon(U2.icon, "[U2.icon_state]_s", ICON_OVERLAY)
var/icon/clothes_s = null
var/uniform_dmi='icons/mob/uniform.dmi'
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 24959d7e151..45fe53c3d82 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -17,16 +17,29 @@
conversion in savefile.dm
*/
+/proc/init_sprite_accessory_subtypes(var/prototype, var/list/L, var/list/male, var/list/female)
+ if(!istype(L)) L = list()
+ if(!istype(male)) male = list()
+ if(!istype(female)) female = list()
+
+ for(var/path in subtypesof(prototype))
+ var/datum/sprite_accessory/D = new path()
+
+ L[D.name] = D
+
+ switch(D.gender)
+ if(MALE) male += D.name
+ if(FEMALE) female += D.name
+ else
+ male += D.name
+ female += D.name
+ return L
+
/datum/sprite_accessory
-
- var/icon // the icon file the accessory is located in
- var/icon_state // the icon_state of the accessory
- var/preview_state // a custom preview state for whatever reason
-
- var/name // the preview name of the accessory
-
- // Determines if the accessory will be skipped or included in random hair generations
- var/gender = NEUTER
+ var/icon //the icon file the accessory is located in
+ var/icon_state //the icon_state of the accessory
+ var/name //the preview name of the accessory
+ var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations
// Restrict some styles to specific species
var/list/species_allowed = list("Human")
@@ -935,3 +948,316 @@
icon_state = "default"
icon = 'icons/mob/human_races/r_skrell.dmi'
species_allowed = list("Skrell")
+
+///////////////////////////
+// Underwear Definitions //
+///////////////////////////
+/datum/sprite_accessory/underwear
+ icon = 'icons/mob/underwear.dmi'
+
+ species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Grey","Plasmaman","Skellington")
+
+ nude
+ name = "Nude"
+ icon_state = null
+ gender = NEUTER
+
+ male_white
+ name = "Mens White"
+ icon_state = "male_white"
+ gender = MALE
+
+ male_grey
+ name = "Mens Grey"
+ icon_state = "male_grey"
+ gender = MALE
+
+ male_green
+ name = "Mens Green"
+ icon_state = "male_green"
+ gender = MALE
+
+ male_blue
+ name = "Mens Blue"
+ icon_state = "male_blue"
+ gender = MALE
+
+ male_black
+ name = "Mens Black"
+ icon_state = "male_black"
+ gender = MALE
+
+ male_mankini
+ name = "Mankini"
+ icon_state = "male_mankini"
+ gender = MALE
+
+ female_red
+ name = "Ladies Red"
+ icon_state = "female_red"
+ gender = FEMALE
+
+ female_white
+ name = "Ladies White"
+ icon_state = "female_white"
+ gender = FEMALE
+
+ female_yellow
+ name = "Ladies Yellow"
+ icon_state = "female_yellow"
+ gender = FEMALE
+
+ female_blue
+ name = "Ladies Blue"
+ icon_state = "female_blue"
+ gender = FEMALE
+
+ female_black
+ name = "Ladies Black"
+ icon_state = "female_black"
+ gender = FEMALE
+
+ female_kinky
+ name = "Ladies Kinky"
+ icon_state = "female_kinky"
+ gender = FEMALE
+
+////////////////////////////
+// Undershirt Definitions //
+////////////////////////////
+/datum/sprite_accessory/undershirt
+ icon = 'icons/mob/underwear.dmi'
+
+ species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Grey","Plasmaman","Skellington")
+
+/datum/sprite_accessory/undershirt/nude
+ name = "Nude"
+ icon_state = null
+ gender = NEUTER
+
+//plain color shirts
+/datum/sprite_accessory/undershirt/shirt_white
+ name = "White Shirt"
+ icon_state = "shirt_white"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_black
+ name = "Black Shirt"
+ icon_state = "shirt_black"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_grey
+ name = "Grey Shirt"
+ icon_state = "shirt_grey"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_red
+ name = "Red Shirt"
+ icon_state = "shirt_red"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_blue
+ name = "Blue Shirt"
+ icon_state = "shirt_blue"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_yellow
+ name = "Yellow Shirt"
+ icon_state = "shirt_yellow"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_green
+ name = "Green Shirt"
+ icon_state = "shirt_green"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_darkblue
+ name = "Dark Blue Shirt"
+ icon_state = "shirt_darkblue"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_darkred
+ name = "Dark Red Shirt"
+ icon_state = "shirt_darkred"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_darkgreen
+ name = "Dark Green Shirt"
+ icon_state = "shirt_darkgreen"
+ gender = NEUTER
+//end plain color shirts
+
+/datum/sprite_accessory/undershirt/shirt_heart
+ name = "Heart Shirt"
+ icon_state = "shirt_heart"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_corgi
+ name = "Corgi Shirt"
+ icon_state = "shirt_corgi"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_jack
+ name = "Union Jack Shirt"
+ icon_state = "shirt_jack"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/love_nt
+ name = "I Love NT Shirt"
+ icon_state = "shirt_lovent"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/peace
+ name = "Peace Shirt"
+ icon_state = "shirt_peace"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/mondmondjaja
+ name = "Band Shirt"
+ icon_state = "shirt_band"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/pacman
+ name = "Pogoman Shirt"
+ icon_state = "shirt_pogoman"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_ss13
+ name = "SS13 Shirt"
+ icon_state = "shirt_ss13"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_question
+ name = "Question Mark Shirt"
+ icon_state = "shirt_question"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_skull
+ name = "Skull Shirt"
+ icon_state = "shirt_skull"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_commie
+ name = "Communist Shirt"
+ icon_state = "shirt_commie"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_nano
+ name = "Nanotrasen Shirt"
+ icon_state = "shirt_nano"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_meat
+ name = "Meat Shirt"
+ icon_state = "shirt_meat"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_tiedie
+ name = "Tiedie Shirt"
+ icon_state = "shirt_tiedie"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blue_striped
+ name = "Striped Blue Shirt"
+ icon_state = "shirt_bluestripe"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/brightblue_striped
+ name = "Striped Bright Blue Shirt"
+ icon_state = "shirt_brightbluestripe"
+ gender = NEUTER
+
+
+//short sleeved
+/datum/sprite_accessory/undershirt/short_white
+ name = "White Short-sleeved Shirt"
+ icon_state = "short_white"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/short_purple
+ name = "Purple Short-sleeved Shirt"
+ icon_state = "short_purple"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/short_blue
+ name = "Blue Short-sleeved Shirt"
+ icon_state = "short_blue"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/short_green
+ name = "Green Short-sleeved Shirt"
+ icon_state = "short_green"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/short_black
+ name = "Black Short-sleeved Shirt"
+ icon_state = "short_black"
+ gender = NEUTER
+//end short sleeved
+
+//polo shirts
+/datum/sprite_accessory/undershirt/polo_blue
+ name = "Blue Polo Shirt"
+ icon_state = "polo_blue"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/polo_red
+ name = "Red Polo Shirt"
+ icon_state = "polo_red"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/polo_greyelllow
+ name = "Grey-Yellow Polo Shirt"
+ icon_state = "polo_greyellow"
+ gender = NEUTER
+//end polo shirts
+
+//sport shirts
+/datum/sprite_accessory/undershirt/sport_green
+ name = "Green Sports Shirt"
+ icon_state = "sport_green"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/sport_red
+ name = "Red Sports Shirt"
+ icon_state = "sport_red"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/sport_blue
+ name = "Blue Sports Shirt"
+ icon_state = "sport_blue"
+ gender = NEUTER
+//end sport shirts
+
+/datum/sprite_accessory/undershirt/jersey_red
+ name = "Red Jersey"
+ icon_state = "jersey_red"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/jersey_blue
+ name = "Blue Jersey"
+ icon_state = "jersey_blue"
+ gender = NEUTER
+
+
+//tanktops
+/datum/sprite_accessory/undershirt/tank_white
+ name = "White Tank-Top"
+ icon_state = "tank_white"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tank_black
+ name = "Black Tank-Top"
+ icon_state = "tank_black"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tank_grey
+ name = "Grey Tank-Top"
+ icon_state = "tank_grey"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tank_fire
+ name = "Fire Tank-Top"
+ icon_state = "tank_fire"
+ gender = NEUTER
+//end tanktops
\ No newline at end of file
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index bd2734c5134..93aa753e446 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -121,8 +121,9 @@
O.add_ai_verbs()
O.rename_self("ai",1)
- . = O
- qdel(src)
+ spawn
+ qdel(src)
+ return O
/mob/living/carbon/human/make_into_mask(var/should_gib = 0)
for(var/t in organs)
@@ -481,7 +482,7 @@
return 1
//Friendly Creatures!
- if(ispath(MP, /mob/living/carbon/primitive/diona) && !jobban_isbanned(src, "Dionaea"))
+ if(ispath(MP, /mob/living/simple_animal/diona) && !jobban_isbanned(src, "Dionaea"))
return 1
//Not in here? Must be untested!
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index 08a946e547c..d2ccb0a698c 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -236,9 +236,9 @@ var/list/organ_cache = list()
if(owner && vital)
if(user)
- user.attack_log += "\[[time_stamp()]\]
removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)])"
- owner.attack_log += "\[[time_stamp()]\]
had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])"
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ user.attack_log += "\[[time_stamp()]\]
removed a vital organ ([src]) from [key_name(owner)] (INTENT: [uppertext(user.a_intent)])"
+ owner.attack_log += "\[[time_stamp()]\]
had a vital organ ([src]) removed by [key_name(user)] (INTENT: [uppertext(user.a_intent)])"
+ msg_admin_attack("[key_name_admin(user)] removed a vital organ ([src]) from [key_name_admin(owner)]")
owner.death()
owner = null
diff --git a/code/modules/organs/organ_alien.dm b/code/modules/organs/organ_alien.dm
index 0031fffead4..82b4c549bb5 100644
--- a/code/modules/organs/organ_alien.dm
+++ b/code/modules/organs/organ_alien.dm
@@ -9,7 +9,7 @@
del(src)
spawn(1) // So it has time to be thrown about by the gib() proc.
- var/mob/living/carbon/primitive/diona/D = new(get_turf(organ))
+ var/mob/living/simple_animal/diona/D = new(get_turf(organ))
diona.request_player(D)
del(organ)
*/
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index a30d2de451e..8f228eb30f4 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -107,17 +107,17 @@
if(src.active==1)
src.active = 0
user << "You turn off the [src]."
- msg_admin_attack("Emitter turned off by [key_name(user, user.client)][isAntag(user) ? "(ANTAG)" : ""](
?) in ([x],[y],[z] -
JMP)",0,1)
- log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])")
- investigate_log("turned
off by [user.key]","singulo")
+ message_admins("Emitter turned off by [key_name_admin(user)] in ([x],[y],[z] -
JMP)",0,1)
+ log_game("Emitter turned off by [key_name(user)] in ([x],[y],[z])")
+ investigate_log("turned
off by [key_name(usr)]","singulo")
else
src.active = 1
user << "You turn on the [src]."
src.shot_number = 0
src.fire_delay = 100
- msg_admin_attack("Emitter turned on by [key_name(user, user.client)][isAntag(user) ? "(ANTAG)" : ""](
?) in ([x],[y],[z] -
JMP)",0,1)
- log_game("Emitter turned on by [user.ckey]([user]) in ([x],[y],[z])")
- investigate_log("turned
on by [user.key]","singulo")
+ message_admins("Emitter turned on by [key_name_admin(user)] in ([x],[y],[z] -
JMP)",0,1)
+ log_game("Emitter turned on by [key_name(user)] in ([x],[y],[z])")
+ investigate_log("turned
on by [key_name(usr)]","singulo")
update_icon()
else
user << "\red The controls are locked!"
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 05543580e79..490af2d6fb9 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -122,9 +122,11 @@
if(strength > strength_upper_limit)
strength = strength_upper_limit
else
- msg_admin_attack("PA Control Computer increased to [strength] by [key_name(usr, usr.client)][isAntag(usr) ? "(ANTAG)" : ""](
?) in ([x],[y],[z] -
JMP)",0,1)
- log_game("PA Control Computer increased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])")
- use_log += text("\[[time_stamp()]\]
[usr.name] ([usr.ckey]) has increased the PA Control Computer to [strength].")
+ message_admins("PA Control Computer increased to [strength] by [key_name_admin(usr)] in ([x],[y],[z] -
JMP)",0,1)
+ log_game("PA Control Computer increased to [strength] by [key_name(usr)] in ([x],[y],[z])")
+ investigate_log("increased to
[strength] by [key_name(usr)]","singulo")
+ use_log += text("\[[time_stamp()]\]
[usr.name] ([key_name(usr)]) has increased the PA Control Computer to [strength].")
+
investigate_log("increased to
[strength] by [usr.key]","singulo")
strength_change()
@@ -134,8 +136,11 @@
if(strength < 0)
strength = 0
else
- investigate_log("decreased to
[strength] by [usr.key]","singulo")
- use_log += text("\[[time_stamp()]\]
[usr.name] ([usr.ckey]) has decreased the PA Control Computer to [strength].")
+ message_admins("PA Control Computer decreased to [strength] by [key_name_admin(usr)] in ([x],[y],[z] -
JMP)",0,1)
+ log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in ([x],[y],[z])")
+ investigate_log("decreased to
[strength] by [key_name(usr)]","singulo")
+ use_log += text("\[[time_stamp()]\]
[usr.name] ([key_name(usr)]) has decreased the PA Control Computer to [strength].")
+
strength_change()
/obj/machinery/particle_accelerator/control_box/power_change()
@@ -215,7 +220,7 @@
src.active = !src.active
investigate_log("turned [active?"
ON":"
OFF"] by [usr ? usr.key : "outside forces"]","singulo")
if (active)
- msg_admin_attack("PA Control Computer turned ON by [key_name(usr, usr.client)][isAntag(usr) ? "(ANTAG)" : ""](
?) in ([x],[y],[z] -
JMP)",0,1)
+ msg_admin_attack("PA Control Computer turned ON by [key_name(usr, usr.client)](
?) in ([x],[y],[z] -
JMP)",0,1)
log_game("PA Control Computer turned ON by [usr.ckey]([usr]) in ([x],[y],[z])")
use_log += text("\[[time_stamp()]\]
[usr.name] ([usr.ckey]) has turned on the PA Control Computer.")
if(src.active)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 5fc9e1ae4b0..12dd496303d 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -313,7 +313,7 @@
var/mob/living/user = AM
user.dust()
power += 200
- message_admins("[src] has consumed [key_name_admin(user)]
? (
FLW)
(JMP).")
+ message_admins("[src] has consumed [key_name_admin(user)]
(JMP).")
investigate_log("has consumed [key_name(user)].", "supermatter")
else if(isobj(AM) && !istype(AM, /obj/effect))
investigate_log("has consumed [AM].", "supermatter")
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index c279baaa290..f236200337b 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -98,7 +98,7 @@
qdel(src)
return
- if (!user.IsAdvancedToolUser() || istype(user, /mob/living/carbon/primitive/diona))
+ if (!user.IsAdvancedToolUser() || istype(user, /mob/living/simple_animal/diona))
user << "\red You don't have the dexterity to do this!"
return
if(istype(user, /mob/living))
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 9453212b48d..d4204d7535e 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -137,18 +137,18 @@
playsound(loc, hitsound, 20, 1, -1)
visible_message("\red [A.name] is hit by the [src.name] in the [parse_zone(def_zone)]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
if(istype(firer, /mob))
- M.attack_log += "\[[time_stamp()]\]
[firer]/[firer.ckey] shot
[M]/[M.ckey] with a
[src.type][reagent_note]"
- firer.attack_log += "\[[time_stamp()]\]
[firer]/[firer.ckey] shot
[M]/[M.ckey] with a
[src.type][reagent_note]"
+ M.attack_log += "\[[time_stamp()]\]
[key_name(firer)] shot
[M]/[M.ckey] with a
[src.type][reagent_note]"
+ firer.attack_log += "\[[time_stamp()]\]
[key_name(firer)] shot
[M]/[M.ckey] with a
[src.type][reagent_note]"
if(M.ckey && chatlog_attacks)
- msg_admin_attack("[firer] ([firer.ckey])[isAntag(firer) ? "(ANTAG)" : ""] shot [M] ([M.ckey]) with a [src][reagent_note] (
JMP)") //BS12 EDIT ALG
+ msg_admin_attack("[key_name_admin(firer)] shot [key_name_admin(M)] with a [src][reagent_note]") //BS12 EDIT ALG
if(!iscarbon(firer))
M.LAssailant = null
else
M.LAssailant = firer
else
- M.attack_log += "\[[time_stamp()]\]
UNKNOWN SUBJECT (No longer exists) shot
[M]/[M.ckey] with a
[src][reagent_note]"
+ M.attack_log += "\[[time_stamp()]\]
UNKNOWN SUBJECT (No longer exists) shot
[key_name(M)] with a
[src][reagent_note]"
if(M.ckey && chatlog_attacks)
- msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src][reagent_note] (
JMP)") //BS12 EDIT ALG
+ msg_admin_attack("UNKNOWN shot [key_name_admin(M)] with a [src][reagent_note] (
JMP)") //BS12 EDIT ALG
spawn(0)
if(A)
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 6ffa7a03a46..03dd8cfbcf6 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -562,6 +562,7 @@
var/count = 1
if (href_list["createpill_multiple"]) count = isgoodnumber(input("Select the number of pills to make.", 10, pillamount) as num)
if (count > 20) count = 20 //Pevent people from creating huge stacks of pills easily. Maybe move the number to defines?
+ if (count <= 0) return
var/amount_per_pill = reagents.total_volume/count
if (amount_per_pill > 50) amount_per_pill = 50
var/name = reject_bad_text(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)"))
diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm
index 75825c4939c..585e468c70e 100644
--- a/code/modules/reagents/dartgun.dm
+++ b/code/modules/reagents/dartgun.dm
@@ -180,15 +180,15 @@
M.attack_log += "\[[time_stamp()]\]
[user]/[user.ckey] shot
[M]/[M.ckey] with a
dartgun ([R])"
user.attack_log += "\[[time_stamp()]\]
[user]/[user.ckey] shot
[M]/[M.ckey] with a
dartgun ([R])"
if(M.ckey)
- msg_admin_attack("[user] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] shot [M] ([M.ckey]) with a dartgun ([R]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] shot [M] ([M.ckey]) with a dartgun ([R]).")
if(!iscarbon(user))
M.LAssailant = null
else
M.LAssailant = user
else
- M.attack_log += "\[[time_stamp()]\]
UNKNOWN SUBJECT (No longer exists) shot
[M]/[M.ckey] with a
dartgun ([R])"
- msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a
dartgun ([R]) (
JMP)")
+ M.attack_log += "\[[time_stamp()]\]
UNKNOWN SUBJECT (No longer exists) shot
[key_name_admin(M)] with a
dartgun ([R])"
+ msg_admin_attack("UNKNOWN shot [key_name(M)] with a
dartgun ([R]) (
JMP)")
if(D.reagents)
D.reagents.trans_to(M, 15)
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index bf1d964c971..63e6304dd55 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -610,8 +610,8 @@ datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volu
H.adjustToxLoss(50)
..()
return
- else if(istype(M,/mob/living/carbon/primitive/diona)) //plantmen monkeys (diona) take EVEN MORE damage
- var/mob/living/carbon/primitive/diona/D = M
+ else if(istype(M,/mob/living/simple_animal/diona)) //plantmen monkeys (diona) take EVEN MORE damage
+ var/mob/living/simple_animal/diona/D = M
D.adjustToxLoss(100)
..()
return
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 253613a7360..0097cf45907 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -70,10 +70,10 @@
for(var/datum/reagent/R in src.reagents.reagent_list)
injected += R.name
var/contained = english_list(injected)
- M.attack_log += text("\[[time_stamp()]\]
Has been squirted with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]")
- user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to squirt [M.name] ([M.key]). Reagents: [contained]")
+ M.attack_log += text("\[[time_stamp()]\]
Has been squirted with [src.name] by [key_name(user)]. Reagents: [contained]")
+ user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to squirt [key_name(M)]. Reagents: [contained]")
if(M.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] squirted [key_name_admin(M)] with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
M.LAssailant = null
else
@@ -88,8 +88,8 @@
badshit += reagents_to_log[bad_reagent]
if(badshit.len)
var/hl="\red
([english_list(badshit)]) \black"
- message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (
JMP)")
- log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
+ message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl]")
+ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "\blue You transfer [trans] units of the solution."
diff --git a/code/modules/reagents/reagent_containers/drugs.dm b/code/modules/reagents/reagent_containers/drugs.dm
index d6804f54778..312cbf297a2 100644
--- a/code/modules/reagents/reagent_containers/drugs.dm
+++ b/code/modules/reagents/reagent_containers/drugs.dm
@@ -67,8 +67,8 @@
badshit += reagents_to_log[bad_reagent]
if(badshit.len)
var/hl="\red
([english_list(badshit)]) \black"
- message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (
JMP)")
- log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
+ message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl]")
+ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "\blue You transfer [trans] units of the solution to [target]."
diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm
index f79dc8ded09..309f928288b 100644
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -48,10 +48,10 @@
for(var/mob/O in viewers(world.view, user))
O.show_message("\red [user] feeds [M] [src].", 1)
- M.attack_log += text("\[[time_stamp()]\]
Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]")
- user.attack_log += text("\[[time_stamp()]\]
Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]")
+ M.attack_log += text("\[[time_stamp()]\]
Has been fed [src.name] by [key_name(user)] Reagents: [reagentlist(src)]")
+ user.attack_log += text("\[[time_stamp()]\]
Fed [src.name] by [key_name(M)] Reagents: [reagentlist(src)]")
if(M.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [src.name] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
M.LAssailant = null
else
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 15f585051e6..7396f307955 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -55,9 +55,9 @@
for(var/mob/O in viewers(world.view, user))
O.show_message("\red [user] feeds [M] [src].", 1)
- M.attack_log += text("\[[time_stamp()]\]
Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]")
- user.attack_log += text("\[[time_stamp()]\]
Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]")
- log_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ M.attack_log += text("\[[time_stamp()]\]
Has been fed [src.name] by [key_name(user)] Reagents: [reagentlist(src)]")
+ user.attack_log += text("\[[time_stamp()]\]
Fed [M.name] by [key_name(M)] Reagents: [reagentlist(src)]")
+ log_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
M.LAssailant = null
else
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index 20da18a668f..205837633de 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -97,10 +97,10 @@
else O.show_message(text("\red
[target] has attacked himself with a bottle of [src.name]!"), 1)
//Attack logs
- user.attack_log += text("\[[time_stamp()]\]
Has attacked [target.name] ([target.ckey]) with a bottle!")
- target.attack_log += text("\[[time_stamp()]\]
Has been smashed with a bottle by [user.name] ([user.ckey])")
+ user.attack_log += text("\[[time_stamp()]\]
Has attacked [key_name(target)] with a bottle!")
+ target.attack_log += text("\[[time_stamp()]\]
Has been smashed with a bottle by [key_name(user)]")
if(target.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] attacked [target.name] ([target.ckey]) with a bottle. (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with a bottle. (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
target.LAssailant = null
else
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index cf4f8794bf0..608fbc405be 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -85,10 +85,10 @@
for(var/datum/reagent/R in src.reagents.reagent_list)
injected += R.name
var/contained = english_list(injected)
- M.attack_log += text("\[[time_stamp()]\]
Has been splashed with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]")
- user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to splash [M.name] ([M.key]). Reagents: [contained]")
+ M.attack_log += text("\[[time_stamp()]\]
Has been splashed with [src.name] by [key_name(user)]. Reagents: [contained]")
+ user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to splash [key_name(M)]. Reagents: [contained]")
if(M.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] splashed [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] splashed [key_name_admin(M)] with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
M.LAssailant = null
else
@@ -129,8 +129,8 @@
badshit += reagents_to_log[bad_reagent]
if(badshit.len)
var/hl="\red
([english_list(badshit)]) \black"
- message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (
JMP)")
- log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
+ message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl]")
+ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "\blue You transfer [trans] units of the solution to [target]."
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index e24378fb137..72d4c18297c 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -33,10 +33,10 @@
for(var/datum/reagent/R in src.reagents.reagent_list)
injected += R.name
var/contained = english_list(injected)
- M.attack_log += text("\[[time_stamp()]\]
Has been injected with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]")
- user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to inject [M.name] ([M.key]). Reagents: [contained]")
+ M.attack_log += text("\[[time_stamp()]\]
Has been injected with [src.name] by [key_name(user)]. Reagents: [contained]")
+ user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to inject [key_name(M)]. Reagents: [contained]")
if(M.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] injected [key_name_admin(M)] with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
M.LAssailant = null
else
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index e56d26560f7..0e706d5ebe5 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -54,10 +54,10 @@
for(var/mob/O in viewers(world.view, user))
O.show_message("
[user] forces [M] to [apply_method] [src].", 1)
- M.attack_log += text("\[[time_stamp()]\]
Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]")
- user.attack_log += text("\[[time_stamp()]\]
Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]")
+ M.attack_log += text("\[[time_stamp()]\]
Has been fed [src.name] by [key_name(user)] Reagents: [reagentlist(src)]")
+ user.attack_log += text("\[[time_stamp()]\]
Fed [src.name] to [key_name(M)]) Reagents: [reagentlist(src)]")
if(M.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
M.LAssailant = null
else
diff --git a/code/modules/reagents/reagent_containers/robodropper.dm b/code/modules/reagents/reagent_containers/robodropper.dm
index 8f2a1d4e9e5..c5da1639304 100644
--- a/code/modules/reagents/reagent_containers/robodropper.dm
+++ b/code/modules/reagents/reagent_containers/robodropper.dm
@@ -33,8 +33,8 @@
badshit += reagents_to_log[bad_reagent]
if(badshit.len)
var/hl="\red
([english_list(badshit)]) \black"
- message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (
JMP)")
- log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
+ message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl]")
+ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
else if(ismob(target))
if(istype(target , /mob/living/carbon/human))
@@ -78,10 +78,10 @@
for(var/datum/reagent/R in src.reagents.reagent_list)
injected += R.name
var/contained = english_list(injected)
- M.attack_log += text("\[[time_stamp()]\]
Has been squirted with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]")
- user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to squirt [M.name] ([M.key]). Reagents: [contained]")
+ M.attack_log += text("\[[time_stamp()]\]
Has been squirted with [src.name] by [key_name(user)]. Reagents: [contained]")
+ user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to squirt [key_name(M)]. Reagents: [contained]")
if(M.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] squirted [key_name_admin(M)] with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
M.LAssailant = null
else
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index fe255c9caf7..252f7ed0208 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -51,10 +51,10 @@
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].")
if(reagents.has_reagent("facid"))
- message_admins("[key_name_admin(user)] fired Fluorosulfuric Acid from \a [src].")
+ message_admins("[key_name_admin(user)] fired fluorosulfuric acid from \a [src].")
log_game("[key_name(user)] fired Fluorosulfuric Acid from \a [src].")
if(reagents.has_reagent("lube"))
- message_admins("[key_name_admin(user)] fired Space lube from \a [src].")
+ message_admins("[key_name_admin(user)] fired space lube from \a [src].")
log_game("[key_name(user)] fired Space lube from \a [src].")
return
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index ab2040ffd1a..8211ff7f8d7 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -193,10 +193,10 @@
for(var/datum/reagent/R in src.reagents.reagent_list)
injected += R.name
var/contained = english_list(injected)
- M.attack_log += text("\[[time_stamp()]\]
Has been injected with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]")
- user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to inject [M.name] ([M.key]). Reagents: [contained]")
+ M.attack_log += text("\[[time_stamp()]\]
Has been injected with [src.name] by [key_name(user)]. Reagents: [contained]")
+ user.attack_log += text("\[[time_stamp()]\]
Used the [src.name] to inject [key_name(M)]. Reagents: [contained]")
if(M.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] injected [key_name_admin(M)] with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
M.LAssailant = null
else
@@ -215,8 +215,8 @@
badshit += reagents_to_log[bad_reagent]
if(badshit.len)
var/hl="\red
([english_list(badshit)]) \black"
- message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (
JMP)")
- log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
+ message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] ")
+ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
spawn(5)
var/datum/reagent/blood/B
@@ -281,7 +281,7 @@
user.attack_log += "\[[time_stamp()]\]
Attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])"
target.attack_log += "\[[time_stamp()]\]
Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])"
if(target.ckey)
- msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: [uppertext(user.a_intent)])")
if(!iscarbon(user))
target.LAssailant = null
else
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 4c042f04a12..95d4d13ad1c 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -124,10 +124,10 @@
for (var/mob/C in viewers(src))
C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
qdel(G)
- usr.attack_log += text("\[[time_stamp()]\]
Has placed [GM.name] ([GM.ckey]) in disposals.")
- GM.attack_log += text("\[[time_stamp()]\]
Has been placed in disposals by [usr.name] ([usr.ckey])")
+ usr.attack_log += text("\[[time_stamp()]\]
Has placed [key_name(GM)] in disposals.")
+ GM.attack_log += text("\[[time_stamp()]\]
Has been placed in disposals by [key_name(user)]")
if(GM.ckey)
- msg_admin_attack("[usr] ([usr.ckey])[isAntag(usr) ? "(ANTAG)" : ""] placed [GM] ([GM.ckey]) in a disposals unit. (
JMP)")
+ msg_admin_attack("[key_name_admin(user)] placed [key_name_admin(GM)] in a disposals unit. (
JMP)")
return
if(!I) return
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 21182bd0e10..ac92bd70b33 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -284,14 +284,12 @@
if(deliveryCheck == 0)
H.destinationTag = 1
- air_contents = new() // new empty gas resv.
-
sleep(10)
playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0)
sleep(5) // wait for animation to finish
H.init(src) // copy the contents of disposer to holder
-
+ air_contents = new() // The holder just took our gas; replace it
H.start(src) // start the holder processing movement
flushing = 0
// now reset disposal state
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index da6bf1244bf..34a10b97f1d 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -295,7 +295,7 @@ var/obj/machinery/blackbox_recorder/blackbox
if(!dbcon.IsConnected()) return
var/round_id
- var/DBQuery/query = dbcon.NewQuery("SELECT MAX(round_id) AS round_id FROM erro_feedback")
+ var/DBQuery/query = dbcon.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]")
query.Execute()
while(query.NextRow())
round_id = query.item[1]
@@ -305,7 +305,7 @@ var/obj/machinery/blackbox_recorder/blackbox
round_id++
for(var/datum/feedback_variable/FV in feedback)
- var/sql = "INSERT INTO erro_feedback VALUES (null, Now(), [round_id], \"[FV.get_variable()]\", [FV.get_value()], \"[FV.get_details()]\")"
+ var/sql = "INSERT INTO [format_table_name("feedback")] VALUES (null, Now(), [round_id], \"[FV.get_variable()]\", [FV.get_value()], \"[FV.get_details()]\")"
var/DBQuery/query_insert = dbcon.NewQuery(sql)
query_insert.Execute()
diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm
index b9b53b274d2..1733895a91f 100644
--- a/code/modules/scripting/IDE.dm
+++ b/code/modules/scripting/IDE.dm
@@ -11,7 +11,6 @@ client/verb/tcssave()
var/tcscode=winget(src, "tcscode", "text")
var/msg="[mob.name] is adding script to server [Server]: [tcscode]"
diary << msg
- message_admins("[mob.name] has uploaded a NTLS script to [Machine.SelectedServer] ([mob.x],[mob.y],[mob.z] -
JMP)",0,1)
Server.setcode( tcscode ) // this actually saves the code from input to the server
src << output(null, "tcserror") // clear the errors
else
@@ -36,7 +35,7 @@ client/verb/tcscompile()
if(Machine.SelectedServer)
var/obj/machinery/telecomms/server/Server = Machine.SelectedServer
Server.setcode( winget(src, "tcscode", "text") ) // save code first
- var/list/compileerrors = Server.compile() // then compile the code!
+ var/list/compileerrors = Server.compile(usr) // then compile the code!
// Output all the compile-time errors
src << output(null, "tcserror")
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index b0909f87af6..87f478938f3 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -122,7 +122,7 @@
confirmed = 0
trigger_event(event)
log_game("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]")
- message_admins("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]", 1)
+ message_admins("[key_name_admin(event_triggered_by)] ([admin_jump_link(event_triggered_by, "holder")]) triggered and [key_name_admin(event_confirmed_by)] ([admin_jump_link(event_confirmed_by, "holder")]) confirmed event [event]", 1)
reset()
/obj/machinery/keycard_auth/proc/receive_request(var/obj/machinery/keycard_auth/source)
diff --git a/code/modules/surgery/braincore.dm b/code/modules/surgery/braincore.dm
index a11df776f3a..3a12e06abbe 100644
--- a/code/modules/surgery/braincore.dm
+++ b/code/modules/surgery/braincore.dm
@@ -92,9 +92,9 @@
if(borer)
borer.detatch() //Should remove borer if the brain is removed - RR
- user.attack_log += "\[[time_stamp()]\]
Debrained [target.name] ([target.ckey]) with [tool.name] (INTENT: [uppertext(user.a_intent)])"
- target.attack_log += "\[[time_stamp()]\]
Debrained by [user.name] ([user.ckey]) with [tool.name] (INTENT: [uppertext(user.a_intent)])"
- msg_admin_attack("[user.name] ([user.ckey]) debrained [target.name] ([target.ckey]) with [tool.name] (INTENT: [uppertext(user.a_intent)]) (
JMP)")
+ user.attack_log += "\[[time_stamp()]\]
Debrained [key_name(target)] with [tool.name] (INTENT: [uppertext(user.a_intent)])"
+ target.attack_log += "\[[time_stamp()]\]
Debrained by [key_name(user)] with [tool.name] (INTENT: [uppertext(user.a_intent)])"
+ msg_admin_attack("[key_name_admin(user)] debrained [key_name_admin(target)] with [tool.name]")
var/obj/item/organ/brain/B = target.internal_organs_by_name["brain"]
if(B && istype(B))
diff --git a/code/modules/vehicle/train/train.dm b/code/modules/vehicle/train/train.dm
index e180b52ee0f..aaf88bdbd18 100644
--- a/code/modules/vehicle/train/train.dm
+++ b/code/modules/vehicle/train/train.dm
@@ -55,7 +55,7 @@
if(istype(load, /mob/living/carbon/human))
var/mob/living/D = load
D << "\red You hit [M]!"
- msg_admin_attack("[D.name] ([D.ckey])[isAntag(D) ? "(ANTAG)" : ""] hit [M.name] ([M.ckey]) with [src]. (
JMP)")
+ msg_admin_attack("[key_name_admin(D)] hit [key_name_admin(M)] with [src].")
//-------------------------------------------
diff --git a/code/modules/vehicle/train/trains/ambulance.dm b/code/modules/vehicle/train/trains/ambulance.dm
index a6ba690d166..36baeecd86a 100644
--- a/code/modules/vehicle/train/trains/ambulance.dm
+++ b/code/modules/vehicle/train/trains/ambulance.dm
@@ -162,10 +162,10 @@
var/mob/living/carbon/human/D = load
D << "\red \b You ran over [H]!"
visible_message("
\red \The [src] ran over [H]!")
- attack_log += text("\[[time_stamp()]\]
ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])")
- msg_admin_attack("[D.name] ([D.ckey])[isAntag(D) ? "(ANTAG)" : ""] ran over [H.name] ([H.ckey]). (
JMP)")
+ attack_log += text("\[[time_stamp()]\]
ran over [key_name(H)], driven by [key_name(D)]")
+ msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]")
else
- attack_log += text("\[[time_stamp()]\]
ran over [H.name] ([H.ckey])")
+ attack_log += text("\[[time_stamp()]\]
ran over [key_name(H)]")
//-------------------------------------------
diff --git a/code/modules/vehicle/train/trains/janicart.dm b/code/modules/vehicle/train/trains/janicart.dm
index 11fdf993b0b..0894d1b9e44 100644
--- a/code/modules/vehicle/train/trains/janicart.dm
+++ b/code/modules/vehicle/train/trains/janicart.dm
@@ -212,10 +212,10 @@
var/mob/living/carbon/human/D = load
D << "\red \b You ran over [H]!"
visible_message("
\red \The [src] ran over [H]!")
- attack_log += text("\[[time_stamp()]\]
ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])")
- msg_admin_attack("[D.name] ([D.ckey])[isAntag(D) ? "(ANTAG)" : ""] ran over [H.name] ([H.ckey]). (
JMP)")
+ attack_log += text("\[[time_stamp()]\]
ran over [key_name(H)], driven by [key_name(D)]")
+ msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]")
else
- attack_log += text("\[[time_stamp()]\]
ran over [H.name] ([H.ckey])")
+ attack_log += text("\[[time_stamp()]\]
ran over [key_name(H)]")
//-------------------------------------------
diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt
index 4bb4e58b096..01d38fd1c56 100644
--- a/config/example/dbconfig.txt
+++ b/config/example/dbconfig.txt
@@ -20,6 +20,8 @@ PASSWORD mypassword
FEEDBACK_DATABASE paradise
FEEDBACK_LOGIN mylogin
FEEDBACK_PASSWORD mypassword
+# Table prefix - make sure you properly prefix the tables currently marked as erro_ in the .sql file as this is not fully implemented
+FEEDBACK_TABLEPREFIX erro
# Track population and death statistics
# Comment this out to disable
diff --git a/html/create_object.html b/html/create_object.html
index a1f115b7839..ac47cc7769b 100644
--- a/html/create_object.html
+++ b/html/create_object.html
@@ -27,7 +27,7 @@
