Small fixes a/ wizard removing start

code/__DEFINES/role_preferences.dm

@@ -35,7 +35,6 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_BROTHER = /datum/game_mode/traitor/bros,
 	ROLE_OPERATIVE = /datum/game_mode/nuclear,
 	ROLE_CHANGELING = /datum/game_mode/changeling,
-	ROLE_WIZARD = /datum/game_mode/wizard,
 	ROLE_MALF,
 	ROLE_REV = /datum/game_mode/revolution,
 	ROLE_ALIEN,

code/game/alternate_appearance.dm

@@ -164,7 +164,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
 		return TRUE
 	if (istype(M, /mob/living/simple_animal/hostile/construct/wraith))
 		return TRUE
-	if(isrevenant(M) || iseminence(M) || iswizard(M))
+	if(isrevenant(M) || iseminence(M))
 		return TRUE
 	return FALSE
 

code/game/objects/items/plushes.dm

@@ -544,13 +544,6 @@
 	icon_state = "plush-idiot"
 	toysound = list('sound/effects/idiot.ogg' = 1)
 
-/obj/item/toy/plush/plush_vladick
-	name = "Vladick's plush"
-	desc = "Best gay battle unit ever."
-	icon = 'icons/obj/plushes.dmi'
-	icon_state = "plush-vladick"
-	toysound = list('sound/effects/vladikmoan.ogg' = 1)
-
 /obj/item/toy/plush/plush_deathclaw
 	name = "Plushie non-death claw"
 	desc = "Cute and dangerous little boy."

code/game/turfs/simulated/floor/f13_floors.dm

@@ -44,8 +44,8 @@
 #define DESOLATE_PLANT_SPAWN_LIST list(/obj/structure/flora/grass/wasteland = 1)
 
 /turf/open/floor/plating/f13/outside/desert
-	name = "песок"
-	desc = "Песок. Много песка."
+	name = "sand"
+	desc = "Sand, a lot of sand."
 	icon = 'icons/turf/f13desert.dmi'
 	icon_state = "wasteland1"
 

code/modules/QuestMachines/quests/coureer.dm

@@ -1,6 +1,6 @@
 /datum/bounty_quest/faction/courier/qst_0
 	name = "The errand boy"
-	desc = "Here's another parcel, you know what to do."
+	desc = "Here's another parcel, you know what to do"
 	employer = "Post Office"
 	employer_icon = 'icons/bounty_employers/employer_00.png'
 	need_message = "Deliver the package and return the stamp."

code/modules/antagonists/wizard/equipment/soulstone.dm

@@ -251,9 +251,7 @@
 	S.cancel_camera()
 	name = "soulstone: Shade of [T.real_name]"
 	icon_state = "soulstone2"
-	if(U && (iswizard(U) || usability))
-		to_chat(S, "Your soul has been captured! You are now bound to [U.real_name]'s will. Help [U.p_them()] succeed in [U.p_their()] goals at all costs.")
-	else if(U && iscultist(U))
+	if(U && iscultist(U))
 		to_chat(S, "Your soul has been captured! You are now bound to the cult's will. Help them succeed in their goals at all costs.")
 	if(vic && U)
 		to_chat(U, "<span class='info'><b>Capture successful!</b>:</span> [T.real_name]'s soul has been ripped from [T.p_their()] body and stored within the soul stone.")

code/modules/client/preferences.dm

@@ -324,17 +324,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<table width='100%'><tr><td width='24%' valign='top'>"
 
 			dat += "<b>Species:</b><BR><a href='?_src_=prefs;preference=species;task=input'>[pref_species.name]</a><BR>"
-
-			dat += "<b>Underwear:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a>"
-			if(GLOB.underwear_list[underwear]?.has_color)
-				dat += "<b>Underwear Color:</b> <span style='border:1px solid #161616; background-color: #[undie_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=undie_color;task=input'>Change</a><BR>"
-			dat += "<b>Undershirt:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a>"
-			if(GLOB.undershirt_list[undershirt]?.has_color)
-				dat += "<b>Undershirt Color:</b> <span style='border:1px solid #161616; background-color: #[shirt_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=shirt_color;task=input'>Change</a><BR>"
-			dat += "<b>Socks:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=socks;task=input'>[socks]</a>"
-			if(GLOB.socks_list[socks]?.has_color)
-				dat += "<b>Socks Color:</b> <span style='border:1px solid #161616; background-color: #[socks_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=socks_color;task=input'>Change</a><BR>"
-			dat += "<b>Backpack:</b><BR><a href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a><BR>"
+			//dat += "<b>Backpack:</b><BR><a href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a><BR>"
 			dat += "<b>Uplink Spawn Location:</b><BR><a href ='?_src_=prefs;preference=uplink_loc;task=input'>[uplink_spawn_loc]</a><BR></td>"
 			dat += "</td>"
 
@@ -640,7 +630,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<font color=red><b>You are banned from antagonist roles.</b></font>"
 				src.be_special = list()
 
-
 			for (var/i in GLOB.special_roles)
 				if(jobban_isbanned(user, i))
 					dat += "<b>Be [capitalize(i)]:</b> <a href='?_src_=prefs;jobbancheck=[i]'>BANNED</a><br>"

code/modules/events/wizard/shuffle.dm

@@ -82,8 +82,6 @@
 	var/list/mobs	 = list()
 
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-		if(H.stat || !H.mind || iswizard(H))
-			continue //the wizard(s) are spared on this one
 		mobs += H
 
 	if(!mobs)

code/modules/fallout/mob/simple_animal/mobs/fallout_NPC.dm

@@ -539,7 +539,7 @@
 	check_friendly_fire = 1
 	status_flags = CANPUSH
 	del_on_death = 1
-	speak = "Yes!"
+	speak = ""
 	speak_emote = list("rushes")
 	speak_chance = 2
 
@@ -571,7 +571,7 @@
 	check_friendly_fire = 1
 	status_flags = CANPUSH
 	del_on_death = 1
-	speak = "Yes!"
+	speak = ""
 	speak_emote = list("rushes")
 	speak_chance = 2
 

code/modules/mob/dead/new_player/new_player.dm

@@ -46,35 +46,14 @@
 				output += "<p>\[ [LINKIFY_READY("Ready", PLAYER_READY_TO_PLAY)] | [LINKIFY_READY("Not Ready", PLAYER_NOT_READY)] | <b> Observe </b> \]</p>"
 	*/
 		output += "<p>Game will start soon!</p>"
-		output += "<p><a href='byond://?src=[REF(src)];refresh=1'>(Refresh)</a></p>"
+		output += "<p><a href='byond://?src=[REF(src)];refresh=1'>Refresh</a></p>"
 	else
 		output += "<p><a href='byond://?src=[REF(src)];manifest=1'>Player List</a></p>"
 		output += "<p><a href='byond://?src=[REF(src)];late_join=1'>Join Game!</a></p>"
-
-	if(!IsGuestKey(src.key))
-		if (SSdbcore.Connect())
-			var/isadmin = 0
-			if(src.client && src.client.holder)
-				isadmin = 1
-			var/datum/DBQuery/query_get_new_polls = SSdbcore.NewQuery("SELECT id FROM [format_table_name("poll_question")] WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM [format_table_name("poll_vote")] WHERE ckey = \"[ckey]\") AND id NOT IN (SELECT pollid FROM [format_table_name("poll_textreply")] WHERE ckey = \"[ckey]\")")
-			var/rs = REF(src)
-			if(query_get_new_polls.Execute())
-				var/newpoll = 0
-				if(query_get_new_polls.NextRow())
-					newpoll = 1
-
-				if(newpoll)
-					output += "<p><b><a href='byond://?src=[rs];showpoll=1'>Show Player Polls</A> (NEW!)</b></p>"
-				else
-					output += "<p><a href='byond://?src=[rs];showpoll=1'>Show Player Polls</A></p>"
-			qdel(query_get_new_polls)
-			if(QDELETED(src))
-				return
-
 	output += "</center>"
 
 	//src << browse(output,"window=playersetup;size=210x240;can_close=0")
-	var/datum/browser/popup = new(src, "playersetup", "<div align='center'>New Player Options</div>", 250, 265)
+	var/datum/browser/popup = new(src, "playersetup", "<div align='center'>Player Options</div>", 250, 265)
 	popup.set_window_options("can_close=0")
 	popup.set_content(output)
 	popup.open(0)

code/modules/mob/mob_helpers.dm

@@ -356,12 +356,6 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 			if("changeling")
 				if(M.mind.has_antag_datum(/datum/antagonist/changeling,TRUE))
 					return 2
-			if("wizard")
-				if(iswizard(M))
-					return 2
-			if("apprentice")
-				if(M.mind in SSticker.mode.apprentices)
-					return 2
 			if("monkey")
 				if(isliving(M))
 					var/mob/living/L = M

code/modules/spells/spell_types/rightandwrong.dm

@@ -88,10 +88,6 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
 /proc/give_guns(mob/living/carbon/human/H)
 	if(H.stat == DEAD || !(H.client))
 		return
-	if(H.mind)
-		if(iswizard(H) || H.mind.has_antag_datum(/datum/antagonist/survivalist/guns))
-			return
-
 	if(prob(GLOB.summon_guns_triggered) && !(H.mind.has_antag_datum(/datum/antagonist)))
 		SSticker.mode.traitors += H.mind
 
@@ -110,10 +106,6 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
 /proc/give_magic(mob/living/carbon/human/H)
 	if(H.stat == DEAD || !(H.client))
 		return
-	if(H.mind)
-		if(iswizard(H) || H.mind.has_antag_datum(/datum/antagonist/survivalist/magic))
-			return
-
 	if(prob(GLOB.summon_magic_triggered) && !(H.mind.has_antag_datum(/datum/antagonist)))
 		H.mind.add_antag_datum(/datum/antagonist/survivalist/magic)
 		H.log_message("<font color='red'>Was made into a survivalist, and trusts no one!</font>", INDIVIDUAL_ATTACK_LOG)

config/game_options.txt

@@ -544,14 +544,3 @@ ROUNDSTART_TRAITS
 
 ## A cap on how many monkeys may be created via monkey cubes
 MONKEYCAP 64
-
-## Breast cups selectable from the character creation menu. Keep em lowercase.
-BREASTS_CUPS_PREFS a
-BREASTS_CUPS_PREFS b
-BREASTS_CUPS_PREFS c
-BREASTS_CUPS_PREFS d
-BREASTS_CUPS_PREFS e
-
-## Minimum and maximum limits for penis length from the character creation menu.
-PENIS_MIN_INCHES_PREFS 1
-PENIS_MAX_INCHES_PREFS 20

fallout13/donat/_lists.dm

@@ -221,7 +221,6 @@ GLOBAL_LIST_INIT(donations_list, list(
 		new /datum/donate_info("Deathclaw Plush",			/obj/item/toy/plush/plush_deathclaw,				150),
 		new /datum/donate_info("Supermutant Plush",			/obj/item/toy/plush/plush_super,					150),
 		new /datum/donate_info("Ghoul Plush",				/obj/item/toy/plush/plush_ghoul,					150),
-		new /datum/donate_info("Vladick Plush",				/obj/item/toy/plush/plush_vladick,					150),
 		new /datum/donate_info("Urist Plush",				/obj/item/toy/plush/plush_urist,					150),
 		new /datum/donate_info("Ulyess Plush",				/obj/item/toy/plush/plush_bearnbull,				150),
 		new /datum/donate_info("Khan Plush",				/obj/item/toy/plush/plush_punk,						150),