Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge

code/modules/admin/admin.dm

@@ -1010,6 +1010,46 @@ var/global/floorIsLava = 0
 	var/datum/seed/S = plant_controller.seeds[seedtype]
 	S.harvest(usr,0,0,1)
 
+/datum/admins/proc/spawn_custom_item()
+	set category = "Debug"
+	set desc = "Spawn a custom item."
+	set name = "Spawn Custom Item"
+
+	if(!check_rights(R_SPAWN))	return
+
+	var/owner = input("Select a ckey.", "Spawn Custom Item") as null|anything in custom_items
+	if(!owner|| !custom_items[owner])
+		return
+
+	var/list/possible_items = custom_items[owner]
+	var/datum/custom_item/item_to_spawn = input("Select an item to spawn.", "Spawn Custom Item") as null|anything in possible_items
+	if(!item_to_spawn)
+		return
+
+	item_to_spawn.spawn_item(get_turf(usr))
+
+/datum/admins/proc/check_custom_items()
+
+	set category = "Debug"
+	set desc = "Check the custom item list."
+	set name = "Check Custom Items"
+
+	if(!check_rights(R_SPAWN))	return
+
+	if(!custom_items)
+		usr << "Custom item list is null."
+		return
+
+	if(!custom_items.len)
+		usr << "Custom item list not populated."
+		return
+
+	for(var/assoc_key in custom_items)
+		usr << "[assoc_key] has:"
+		var/list/current_items = custom_items[assoc_key]
+		for(var/datum/custom_item/item in current_items)
+			usr << "- name: [item.name] icon: [item.item_icon] path: [item.item_path] desc: [item.item_desc]"
+
 /datum/admins/proc/spawn_plant()
 	set category = "Debug"
 	set desc = "Spawn a spreading plant effect."

code/modules/admin/admin_verbs.dm

@@ -115,6 +115,8 @@ var/list/admin_verbs_fun = list(
 	)
 var/list/admin_verbs_spawn = list(
 	/datum/admins/proc/spawn_fruit,
+	/datum/admins/proc/spawn_custom_item,
+	/datum/admins/proc/check_custom_items,
 	/datum/admins/proc/spawn_plant,
 	/datum/admins/proc/spawn_atom,		/*allows us to spawn instances*/
 	/client/proc/respawn_character,

code/modules/admin/verbs/debug.dm

@@ -597,7 +597,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/thunderdome(M), slot_head)
 
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(M), slot_r_hand)
-			M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_l_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/material/knife(M), slot_l_hand)
 			M.equip_to_slot_or_del(new /obj/item/weapon/grenade/smokebomb(M), slot_r_store)
 
 
@@ -620,10 +620,10 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(M), slot_head)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/rollingpin(M), slot_r_hand)
-			M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_l_hand)
-			M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_r_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/material/kitchen/rollingpin(M), slot_r_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/material/knife(M), slot_l_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/material/knife(M), slot_r_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/material/knife(M), slot_s_store)
 
 		if ("tournament janitor")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(M), slot_w_uniform)
@@ -687,7 +687,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.registered_name = M.real_name
 			M.equip_to_slot_or_del(W, slot_wear_id)
 
-			var/obj/item/weapon/twohanded/fireaxe/fire_axe = new(M)
+			var/obj/item/weapon/material/twohanded/fireaxe/fire_axe = new(M)
 			M.equip_to_slot_or_del(fire_axe, slot_r_hand)
 
 		if("masked killer")
@@ -699,10 +699,10 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/plain/monocle(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit)
-			M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/material/knife(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/scalpel(M), slot_r_store)
 
-			var/obj/item/weapon/twohanded/fireaxe/fire_axe = new(M)
+			var/obj/item/weapon/material/twohanded/fireaxe/fire_axe = new(M)
 			M.equip_to_slot_or_del(fire_axe, slot_r_hand)
 
 			for(var/obj/item/carried_item in M.contents)

code/modules/admin/verbs/striketeam.dm

@@ -4,7 +4,7 @@ var/const/commandos_possible = 6 //if more Commandos are needed in the future
 /client/proc/strike_team()
 	set category = "Fun"
 	set name = "Spawn Strike Team"
-	set desc = "Spawns a death squad if you want to run an admin event."
+	set desc = "Spawns a strike team if you want to run an admin event."
 
 	if(!src.holder)
 		src << "Only administrators may use this command."
@@ -20,12 +20,12 @@ var/const/commandos_possible = 6 //if more Commandos are needed in the future
 
 	var/datum/antagonist/deathsquad/team
 
-	var/choice = input(usr, "Select type of strike team:") as null|anything in list("Death Squad", "Mercenaries")
+	var/choice = input(usr, "Select type of strike team:") as null|anything in list("Heavy Asset Protection", "Mercenaries")
 	if(!choice)
 		return
 
 	switch(choice)
-		if("Death Squad")
+		if("Heavy Asset Protection")
 			team = deathsquad
 		if("Mercenaries")
 			team = commandos