From 034bf6ce79022274315024d7360f2ae9dd0ab5f6 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 6 May 2018 17:38:25 -0400
Subject: [PATCH] Update verbs.dm

---
 code/datums/verbs.dm | 105 -------------------------------------------
 1 file changed, 105 deletions(-)

diff --git a/code/datums/verbs.dm b/code/datums/verbs.dm
index 889efa89c2..79fe256bb4 100644
--- a/code/datums/verbs.dm
+++ b/code/datums/verbs.dm
@@ -1,107 +1,3 @@
-<<<<<<< HEAD
-/datum/verbs
-	var/name
-	var/list/children
-	var/datum/verbs/parent
-	var/list/verblist
-	var/abstract = FALSE
-
-//returns the master list for verbs of a type
-/datum/verbs/proc/GetList()
-	CRASH("Abstract verblist for [type]")
-
-//do things for each entry in Generate_list
-//return value sets Generate_list[verbpath]
-/datum/verbs/proc/HandleVerb(list/entry, atom/verb/verbpath, ...)
-	return entry
-
-/datum/verbs/New()
-	var/mainlist = GetList()
-	var/ourentry = mainlist[type]
-	children = list()
-	verblist = list()
-	if (ourentry)
-		if (!islist(ourentry)) //some of our childern already loaded
-			qdel(src)
-			CRASH("Verb double load: [type]")
-		Add_children(ourentry)
-
-	mainlist[type] = src
-
-	Load_verbs(type, typesof("[type]/verb"))
-
-	var/datum/verbs/parent = mainlist[parent_type]
-	if (!parent)
-		mainlist[parent_type] = list(src)
-	else if (islist(parent))
-		parent += src
-	else
-		parent.Add_children(list(src))
-
-/datum/verbs/proc/Set_parent(datum/verbs/_parent)
-	parent = _parent
-	if (abstract)
-		parent.Add_children(children)
-		var/list/verblistoftypes = list()
-		for(var/thing in verblist)
-			LAZYADD(verblistoftypes[verblist[thing]], thing)
-
-		for(var/verbparenttype in verblistoftypes)
-			parent.Load_verbs(verbparenttype, verblistoftypes[verbparenttype])
-
-/datum/verbs/proc/Add_children(list/kids)
-	if (abstract && parent)
-		parent.Add_children(kids)
-		return
-
-	for(var/thing in kids)
-		var/datum/verbs/item = thing
-		item.Set_parent(src)
-		if (!item.abstract)
-			children += item
-
-/datum/verbs/proc/Load_verbs(verb_parent_type, list/verbs)
-	if (abstract && parent)
-		parent.Load_verbs(verb_parent_type, verbs)
-		return
-
-	for (var/verbpath in verbs)
-		verblist[verbpath] = verb_parent_type
-
-/datum/verbs/proc/Generate_list(...)
-	. = list()
-	if (length(children))
-		for (var/thing in children)
-			var/datum/verbs/child = thing
-			var/list/childlist = child.Generate_list(arglist(args))
-			if (childlist)
-				var/childname = "[child]"
-				if (childname == "[child.type]")
-					var/list/tree = splittext(childname, "/")
-					childname = tree[tree.len]
-				.[child.type] = "parent=[url_encode(type)];name=[url_encode(childname)]"
-				. += childlist
-
-	for (var/thing in verblist)
-		var/atom/verb/verbpath = thing
-		if (!verbpath)
-			stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]")
-		var/list/entry = list()
-		entry["parent"] = "[type]"
-		entry["name"] = verbpath.desc
-		if (copytext(verbpath.name,1,2) == "@")
-			entry["command"] = copytext(verbpath.name,2)
-		else
-			entry["command"] = replacetext(verbpath.name, " ", "-")
-		
-		.[verbpath] = HandleVerb(arglist(list(entry, verbpath) + args))
-
-/world/proc/LoadVerbs(verb_type)
-	if(!ispath(verb_type, /datum/verbs) || verb_type == /datum/verbs)
-		CRASH("Invalid verb_type: [verb_type]")
-	for (var/typepath in subtypesof(verb_type))
-		new typepath()
-=======
 /datum/verbs
 	var/name
 	var/list/children
@@ -204,4 +100,3 @@
 		CRASH("Invalid verb_type: [verb_type]")
 	for (var/typepath in subtypesof(verb_type))
 		new typepath()
->>>>>>> 9147170... Fix the preference menus not expanding (#37578)