Deleting Wizard and Deity.

code/_global_vars/lists/names.dm

@@ -1,12 +1,8 @@
 // All variables here use double quotes to able load information on every startup.
 
 var/global/list/ai_names =           file2list("config/names/ai.txt")
-var/global/list/wizard_first =       file2list("config/names/wizardfirst.txt")
-var/global/list/wizard_second =      file2list("config/names/wizardsecond.txt")
-
 var/global/list/verbs =              file2list("config/names/verbs.txt")
 var/global/list/adjectives =         file2list("config/names/adjectives.txt")
-
 var/global/list/descriptive_slot_names = list(
 	slot_back_str        = "Back",
 	slot_w_uniform_str   = "Uniform",

code/datums/config/config_types/config_mode.dm

@@ -6,7 +6,6 @@
 		/decl/config/lists/mode_allowed,
 		/decl/config/lists/mode_votable,
 		/decl/config/lists/mode_probabilities,
-		/decl/config/toggle/feature_object_spell_system,
 		/decl/config/toggle/traitor_scaling,
 		/decl/config/toggle/protect_roles_from_antagonist,
 		/decl/config/toggle/continuous_rounds,
@@ -78,10 +77,6 @@
 		var/decl/game_mode/game_mode = all_modes[mode_type]
 		game_mode.probability = max(0, value[game_mode.uid])
 
-/decl/config/toggle/feature_object_spell_system
-	uid = "feature_object_spell_system"
-	desc = "Spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard."
-
 /decl/config/toggle/traitor_scaling
 	uid = "traitor_scaling"
 	desc = "If amount of traitors scales or not."
@@ -93,7 +88,7 @@
 /decl/config/toggle/continuous_rounds
 	uid = "continuous_rounds"
 	desc = list(
-		"Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked.",
+		"Remove the # to make rounds which usually end when all antags have died or conditions are met continue until the shuttle is called or the station is nuked.",
 		"Malf and Rev will let the shuttle be called when the antags/protags are dead."
 	)
 

code/datums/extensions/abilities/ability_decl.dm

@@ -250,7 +250,7 @@
 
 		if(!is_purged)
 			for(var/turf/turf in range(user, 1))
-				if(turf.get_null_rod())
+				if(turf.is_purged())
 					is_purged = TRUE
 					break
 

code/datums/supplypacks/nonessent.dm

@@ -73,10 +73,12 @@
 
 /decl/hierarchy/supply_pack/nonessent/wizard
 	name = "Costume - Wizard"
-	contains = list(/obj/item/staff/crystal,
-					/obj/item/clothing/suit/wizrobe/fake,
-					/obj/item/clothing/shoes/sandal,
-					/obj/item/clothing/head/wizard/fake)
+	contains = list(
+		/obj/item/staff/crystal,
+		/obj/item/clothing/suit/wizrobe,
+		/obj/item/clothing/shoes/sandal,
+		/obj/item/clothing/head/wizard/beard
+	)
 	containername = "wizard costume crate"
 
 /decl/hierarchy/supply_pack/nonessent/costume
@@ -170,10 +172,12 @@
 
 /decl/hierarchy/supply_pack/nonessent/witch
 	name = "Costume - Witch"
-	contains = list(/obj/item/clothing/suit/wizrobe/marisa/fake,
-					/obj/item/clothing/shoes/sandal,
-					/obj/item/clothing/head/wizard/marisa/fake,
-					/obj/item/staff/broom)
+	contains = list(
+		/obj/item/clothing/suit/wizrobe/marisa,
+		/obj/item/clothing/shoes/sandal,
+		/obj/item/clothing/head/wizard/marisa,
+		/obj/item/staff/broom
+	)
 	containername = "witch costume crate"
 	containertype = /obj/structure/closet
 

code/datums/trading/traders/misc.dm

@@ -167,8 +167,8 @@
 		/obj/item/clothing/suit/hastur              = TRADER_THIS_TYPE,
 		/obj/item/clothing/suit/imperium_monk       = TRADER_THIS_TYPE,
 		/obj/item/clothing/suit/judgerobe           = TRADER_THIS_TYPE,
-		/obj/item/clothing/suit/wizrobe/magusred    = TRADER_THIS_TYPE,
-		/obj/item/clothing/suit/wizrobe/magusblue   = TRADER_THIS_TYPE,
+		/obj/item/clothing/suit/wizrobe/magus       = TRADER_THIS_TYPE,
+		/obj/item/clothing/suit/wizrobe/magus/red   = TRADER_THIS_TYPE,
 		/obj/item/clothing/costume/gladiator        = TRADER_THIS_TYPE,
 		/obj/item/clothing/costume/kilt             = TRADER_THIS_TYPE,
 		/obj/item/clothing/costume/redcoat          = TRADER_THIS_TYPE,

code/datums/trading/traders/unique.dm

@@ -90,48 +90,3 @@
 		TRADER_BRIBE_ACCEPT      = "Blub will stay for " + TRADER_TOKEN_TIME + " binutes bonger.",
 		TRADER_BRIBE_REFUSAL     = "Blub must go. Blub's beople beed blem."
 	)
-
-//probably could stick soem Howl references in here but like, eh. Haven't seen it in years.
-/datum/trader/ship/unique/wizard
-	name = "Sorcerer"
-	origin = "A moving castle"
-	possible_origins = list(
-		"An indistinct location",
-		"Unknown location",
-		"The Diamond Sphere",
-		"Beyond the Veil",
-		"Deadverse"
-	)
-	possible_wanted_items = list(
-		/mob/living/simple_animal/hostile/mimic          = TRADER_ALL
-	)
-	possible_trading_items = list(
-		/obj/item/clothing/gloves/wizard                 = TRADER_THIS_TYPE,
-		/obj/item/clothing/head/helmet/space/void/wizard = TRADER_THIS_TYPE,
-		/obj/item/clothing/head/wizard                   = TRADER_ALL,
-		/obj/item/clothing/suit/space/void/wizard        = TRADER_THIS_TYPE,
-		/obj/item/toy/figure/wizard                      = TRADER_THIS_TYPE,
-		/obj/item/staff                                  = TRADER_ALL,
-	) //Probably see about getting some more wizard based shit
-
-	speech = list(
-		TRADER_HAIL_GENERIC      = "Hello! Are you here on pleasure or business?",
-		TRADER_HAIL_DENY         = "I'm sorry, but I REALLY don't want to speak to you.",
-		TRADER_TRADE_COMPLETE    = "Pleasure doing business with you!",
-		TRADER_NO_MONEY          = "Cash? Ha! What's cash to a man like me?",
-		TRADER_NOT_ENOUGH        = "Hm, well I do enjoy what you're offering, I prefer a fair trade.",
-		TRADER_FOUND_UNWANTED    = "What? I want oddities! Don't you understand?",
-		TRADER_HOW_MUCH          = "I want dark things, brooding things... things that go bump in the night. Things that bleed wrong, live wrong, are wrong.",
-		TRADER_WHAT_WANT         = "Have anything from a broodish cult?",
-		TRADER_COMPLIMENT_DENY   = "Like I haven't heard that one before!",
-		TRADER_COMPLIMENT_ACCEPT = "Haha! Aren't you nice.",
-		TRADER_INSULT_GOOD       = "Naughty naughty.",
-		TRADER_INSULT_BAD        = "Now where do you get off talking to me like that?",
-		TRADER_BRIBE_ACCEPT      = "Well, if you're not pulling the knob on my staff, I can stay for another " + TRADER_TOKEN_TIME + " minutes.",
-		TRADER_BRIBE_REFUSAL     = "A wizard does not depart early or late, but precisely when they intend to. No.",
-		TRADER_NO_BLACKLISTED    = "I cannot accept such a thing. No trade."
-	)
-
-/datum/trader/ship/unique/wizard/New()
-	speech[TRADER_HAIL_START + SPECIES_GOLEM] = "Interesting... how incredibly interesting... come! Let us do business!"
-	..()

code/game/jobs/access_datum.dm

@@ -460,12 +460,6 @@ var/global/const/access_mercenary = "ACCESS_MERCENARY"
 	desc = "Mercenary"
 	access_type = ACCESS_TYPE_ANTAG
 
-var/global/const/access_wizard = "ACCESS_WIZARD"
-/datum/access/wizard
-	id = access_wizard
-	desc = "Wizard"
-	access_type = ACCESS_TYPE_ANTAG
-
 /*******
 * Misc *
 *******/

code/game/objects/effects/landmarks.dm

@@ -133,17 +133,17 @@
 	new /obj/item/clothing/suit/holidaypriest(loc)
 
 /obj/abstract/landmark/costume/marisawizard/fake/make_costumes()
-	new /obj/item/clothing/head/wizard/marisa/fake(loc)
-	new/obj/item/clothing/suit/wizrobe/marisa/fake(loc)
+	new /obj/item/clothing/head/wizard/marisa(loc)
+	new /obj/item/clothing/suit/wizrobe/marisa(loc)
 
 /obj/abstract/landmark/costume/cutewitch/make_costumes()
 	new /obj/item/clothing/dress/sun(loc)
 	new /obj/item/clothing/head/witchwig(loc)
 	new /obj/item/staff/broom(loc)
 
 /obj/abstract/landmark/costume/fakewizard/make_costumes()
-	new /obj/item/clothing/suit/wizrobe/fake(loc)
-	new /obj/item/clothing/head/wizard/fake(loc)
+	new /obj/item/clothing/suit/wizrobe(loc)
+	new /obj/item/clothing/head/wizard/beard(loc)
 	new /obj/item/staff/(loc)
 
 /obj/abstract/landmark/costume/sexyclown/make_costumes()

code/game/objects/items/devices/radio/intercom.dm

@@ -25,10 +25,6 @@
 	START_PROCESSING(SSobj, src)
 	update_icon()
 
-/obj/item/radio/intercom/wizard
-	name = "enchanted intercom"
-	desc = "Talk into this while you ponder your orb."
-
 /obj/item/radio/intercom/raider
 	name = "piratical intercom"
 	desc = "Pirate radio, but not in the usual sense of the word."

code/game/objects/items/weapons/staff.dm

@@ -1,6 +1,6 @@
 /obj/item/staff
 	name                = "staff"
-	desc                = "A long, heavy length of material, purportedly used by wizards."
+	desc                = "A long, heavy length of material, often used as a simple weapon or for poking things."
 	icon                = 'icons/obj/items/staff.dmi'
 	icon_state          = ICON_STATE_WORLD
 
@@ -42,18 +42,31 @@
 			return TRUE
 	return ..()
 
-// TODO: move back into wizard modpack when the timelines converge.
+// Previously wizard kit; now decorative.
 /obj/item/staff/crystal
-	name = "wizard's staff"
+	name = "crystal staff"
 	icon = 'icons/obj/items/staff_crystal.dmi'
 
-/obj/item/staff/crystal/can_make_broom_with(mob/user, obj/item/thing)
-	return FALSE
-
 /obj/item/staff/crystal/Initialize(ml, material_key)
 	. = ..()
 	update_icon()
 
+/obj/item/staff/crystal/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing)
+	if(overlay)
+		var/crystal_state = "[overlay.icon_state]-crystal"
+		if(check_state_in_icon(crystal_state, overlay.icon))
+			overlay.overlays += overlay_image(overlay.icon, crystal_state, COLOR_WHITE, RESET_COLOR)
+	. = ..()
+
+/obj/item/staff/crystal/on_update_icon()
+	. = ..()
+	var/crystal_state = "[icon_state]-crystal"
+	if(check_state_in_icon(icon, crystal_state))
+		add_overlay(overlay_image(icon, crystal_state, COLOR_WHITE, RESET_COLOR))
+
+/obj/item/staff/crystal/can_make_broom_with(mob/user, obj/item/thing)
+	return FALSE
+
 /obj/item/staff/crystal/apply_additional_mob_overlays(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE)
 	if(overlay)
 		var/crystal_state = "[overlay.icon_state]-crystal"

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

@@ -113,7 +113,7 @@
 	if(length(contents) && storage)
 		storage.make_exact_fit()
 
-// Magic cash bag, used for adminspawn and wizards.
+// Magic cash bag, used for adminspawn.
 /obj/item/bag/cash/infinite
 	storage = /datum/storage/bag/cash/infinite
 

code/game/turfs/turf.dm

@@ -862,3 +862,5 @@
 
 /turf/take_vaporized_reagent(reagent, amount)
 	return assume_gas(reagent, round(amount / REAGENT_UNITS_PER_GAS_MOLE))
+
+/turf/proc/is_purged()

code/modules/clothing/_clothing.dm

@@ -9,7 +9,6 @@
 	icon_state = ICON_STATE_WORLD
 	_base_attack_force = 3
 
-	var/wizard_garb = 0
 	var/flash_protection = FLASH_PROTECTION_NONE	  // Sets the item's level of flash protection.
 	var/tint = TINT_NONE							  // Sets the item's level of visual impairment tint.
 	var/bodytype_equip_flags    // Bitfields; if null, checking is skipped. Determine if a given mob can equip this item or not.

code/modules/clothing/head/wizard.dm

@@ -0,0 +1,32 @@
+// Props from wizard mode, preserved as costume pieces.
+/obj/item/clothing/head/wizard
+	name = "wizard hat"
+	desc = "It has WIZZARD written across it in sequins."
+	icon = 'icons/clothing/head/wizard/wizard.dmi'
+	body_parts_covered = 0
+
+/obj/item/clothing/head/wizard/red
+	name = "red wizard hat"
+	icon = 'icons/clothing/head/wizard/red.dmi'
+
+/obj/item/clothing/head/wizard/beard
+	name = "wizard hat"
+	desc = "It has WIZZARD written across it in sequins. Comes with a cool beard."
+	icon = 'icons/clothing/head/wizard/fake.dmi'
+	body_parts_covered = SLOT_HEAD|SLOT_FACE
+
+/obj/item/clothing/head/wizard/marisa
+	name = "witch hat"
+	desc = "Strange-looking hat-wear. Makes you want to cast fireballs."
+	icon = 'icons/clothing/head/wizard/marisa.dmi'
+
+/obj/item/clothing/head/wizard/magus
+	name = "magus helm"
+	desc = "A mysterious helmet. Hard to see out of."
+	icon = 'icons/clothing/head/wizard/magus.dmi'
+	body_parts_covered = SLOT_HEAD|SLOT_FACE|SLOT_EYES
+
+/obj/item/clothing/head/wizard/cap
+	name = "gentleman's cap"
+	desc = "A checkered gray flat cap."
+	icon = 'icons/clothing/head/flatcap.dmi'

code/modules/clothing/masks/miscellaneous.dm

@@ -93,12 +93,15 @@
 	w_class = ITEM_SIZE_SMALL
 	siemens_coefficient = 0.9
 
-/obj/item/clothing/mask/horsehead/Initialize()
-	. = ..()
-	// The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary
+/obj/item/clothing/mask/horsehead/cursed
+	voicechange = TRUE
 	say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
 	say_verbs = list("whinnies", "neighs", "says")
 
+/obj/item/clothing/mask/horsehead/cursed/equipped(mob/user, slot)
+	. = ..()
+	canremove = (slot == slot_wear_mask_str)
+
 /obj/item/clothing/mask/ai
 	name = "camera MIU"
 	desc = "Allows for direct mental connection to accessible camera channels."

code/modules/clothing/shoes/miscellaneous.dm

@@ -84,7 +84,6 @@
 	icon = 'icons/clothing/feet/sandals.dmi'
 	bodytype_equip_flags = null
 	body_parts_covered = 0
-	wizard_garb = 1
 	can_add_hidden_item = FALSE
 	can_add_cuffs = FALSE