Merge branch 'master' of github.com:tgstation/-tg-station

Conflicts:
	code/modules/mob/new_player/new_player.dm

code/controllers/configuration.dm

@@ -58,6 +58,7 @@
 	var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database
 
 	//game_options.txt configs
+	var/force_random_names = 0
 	var/list/mode_names = list()
 	var/list/modes = list()				// allowed modes
 	var/list/votable_modes = list()		// votable modes
@@ -332,6 +333,8 @@
 					use_recursive_explosions = 1
 				if("humans_need_surnames")
 					humans_need_surnames = 1
+				if("force_random_names")
+					config.force_random_names = 1
 				if("allow_ai")
 					config.allow_ai = 1
 				else

code/game/gamemodes/gameticker.dm

@@ -24,8 +24,6 @@ var/global/datum/controller/gameticker/ticker
 	var/Bible_name			// name of the bible
 	var/Bible_deity_name
 
-	var/random_players = 0 	// if set to nonzero, ALL players who latejoin or declare-ready join will have random appearances/genders
-
 	var/list/syndicate_coalition = list() // list of traitor-compatible factions
 	var/list/factions = list()			  // list of all factions
 	var/list/availablefactions = list()	  // list of factions with openings

code/game/objects/items/devices/PDA/PDA.dm

@@ -5,7 +5,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 
 /obj/item/device/pda
-	name = "PDA"
+	name = "\improper PDA"
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "pda"

code/game/objects/items/weapons/storage/bags.dm

@@ -53,7 +53,7 @@
 // -----------------------------
 
 /obj/item/weapon/storage/bag/ore
-	name = "Mining Satchel"
+	name = "mining satchel"
 	desc = "This little bugger can be used to store and transport ores."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "satchel"
@@ -70,9 +70,9 @@
 // -----------------------------
 
 /obj/item/weapon/storage/bag/plants
+	name = "plant bag"
 	icon = 'icons/obj/hydroponics.dmi'
 	icon_state = "plantbag"
-	name = "Plant Bag"
 	storage_slots = 50; //the number of plant pieces it can carry.
 	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
 	max_w_class = 3
@@ -104,10 +104,10 @@
 // However, making it a storage/bag allows us to reuse existing code in some places. -Sayu
 
 /obj/item/weapon/storage/bag/sheetsnatcher
+	name = "sheet snatcher"
+	desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "sheetsnatcher"
-	name = "Sheet Snatcher"
-	desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
 
 	var/capacity = 300; //the number of sheets it can carry.
 	w_class = 3
@@ -234,6 +234,6 @@
 // -----------------------------
 
 /obj/item/weapon/storage/bag/sheetsnatcher/borg
-	name = "Sheet Snatcher 9000"
+	name = "sheet snatcher 9000"
 	desc = ""
 	capacity = 500//Borgs get more because >specialization

code/modules/admin/verbs/randomverbs.dm

@@ -780,12 +780,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set name = "Make Everyone Random"
 	set desc = "Make everyone have a random appearance. You can only use this before rounds!"
 
-	if (ticker && ticker.mode)
+	if(ticker && ticker.mode)
 		usr << "Nope you can't do this, the game's already started. This only works before rounds!"
 		return
 
-	if(ticker.random_players)
-		ticker.random_players = 0
+	if(config.force_random_names)
+		config.force_random_names = 0
 		message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.", 1)
 		usr << "Disabled."
 		return
@@ -803,7 +803,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	usr << "<i>Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet</i>."
 
-	ticker.random_players = 1
+	config.force_random_names = 1
 	feedback_add_details("admin_verb","MER") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 

code/modules/mob/new_player/new_player.dm

@@ -308,7 +308,7 @@
 		var/mob/living/carbon/human/new_character = new(loc)
 		new_character.lastarea = get_area(loc)
 
-		if(ticker.random_players || appearance_isbanned(new_character))
+		if(config.force_random_names || appearance_isbanned(new_character))
 			client.prefs.random_character()
 			client.prefs.real_name = random_name(gender)
 		client.prefs.copy_to(new_character)

config/game_options.txt

@@ -45,6 +45,9 @@ ANIMAL_DELAY 0
 ## If uncommented this adds a random surname to a player's name if they only specify one name.
 #HUMANS_NEED_SURNAMES
 
+## If uncommented, this forces all players to use random names !and appearances!.
+#FORCE_RANDOM_NAMES
+
 
 ### ALERT LEVELS ###
 ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced.