Forest you overcomplicate things

oopsie x
cmss13-devs · Jul 7, 2023 · aa07d9c · aa07d9c
1 parent 802e543
commit aa07d9c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -398,7 +398,6 @@ SUBSYSTEM_DEF(ticker)
 		var/mob/M = J.spawn_in_player(player)
 		if(istype(M))
 			J.equip_job(M)
-			EquipCustomItems(M)
 
 			if(M.client)
 				var/client/C = M.client
@@ -428,7 +427,6 @@ SUBSYSTEM_DEF(ticker)
 				captainless = FALSE
 			if(player.job)
 				RoleAuthority.equip_role(player, RoleAuthority.roles_by_name[player.job], late_join = FALSE)
-				EquipCustomItems(player)
 			if(player.client)
 				var/client/C = player.client
 				if(C.player_data && C.player_data.playtime_loaded && length(C.player_data.playtimes) == 0)

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
@@ -436,6 +436,8 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
 		if(src.ckey == line)
 			src.donator = 1
 			add_verb(src, /client/proc/set_ooc_color_self)
+			add_verb(src, /client/proc/claim_donor)
+			to_chat(src, SPAN_WARNING("If you have special donor gear, you may claim it from the OOC tab."))
 
 	//if(prefs.window_skin & TOGGLE_WINDOW_SKIN)
 	// set_night_skin()

diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
@@ -8,13 +8,6 @@ GLOBAL_LIST_FILE_LOAD(custom_items, "config/custom_items.txt")
 
 /proc/EquipCustomItems(mob/living/carbon/human/M)
 	var/client/donor = M.client
-	if(!donor.donator)
-		return FALSE
-	var/wanted = alert(M, "Do you want to use your donor gear this round?\nYou will still receive this prompt if you are a donator without special gear.\n\nNote: You may claim your donor gear at a later point.", "Use Donor Gear?", "Yes", "No")
-	if(wanted != "Yes")
-		to_chat(M, SPAN_WARNING("You have chosen not to use your donor gear this round. It may be claimed later in the OOC tab."))
-		add_verb(donor, /client/proc/claim_donor)
-		return FALSE
 	remove_verb(donor, /client/proc/claim_donor)
 	for(var/line in GLOB.custom_items)
 		// split & clean up

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
@@ -245,7 +245,6 @@
 
 	var/mob/living/carbon/human/character = create_character(TRUE) //creates the human and transfers vars and mind
 	RoleAuthority.equip_role(character, RoleAuthority.roles_for_mode[rank], late_join = TRUE)
-	EquipCustomItems(character)
 
 	if(security_level > SEC_LEVEL_BLUE || EvacuationAuthority.evac_status)
 		to_chat(character, SPAN_HIGHDANGER("As you stagger out of hypersleep, the sleep bay blares: '[EvacuationAuthority.evac_status ? "VESSEL UNDERGOING EVACUATION PROCEDURES, SELF DEFENSE KIT PROVIDED" : "VESSEL IN HEIGHTENED ALERT STATUS, SELF DEFENSE KIT PROVIDED"]'."))