From cc340cb73bbce417b2df3b5244b1553c0180bd2d Mon Sep 17 00:00:00 2001
From: kevinz000 <kevinz1234567890@gmail.com>
Date: Sat, 3 Jun 2017 14:00:14 -0700
Subject: [PATCH] stuff

---
 code/game/gamemodes/gang/gang_datum.dm | 18 +++---------------
 code/game/gamemodes/gang/gang_items.dm | 15 +++++++++++++--
 code/game/objects/objs.dm              |  3 +++
 code/modules/clothing/neck/ties.dm     |  3 +++
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm
index cc6cfff8205..a2e7220106e 100644
--- a/code/game/gamemodes/gang/gang_datum.dm
+++ b/code/game/gamemodes/gang/gang_datum.dm
@@ -262,26 +262,14 @@
 		return 0
 	var/static/inner = inner_outfit
 	var/static/outer = outer_outfit
-	for(var/obj/C in gangbanger.contents)
+	for(var/obj/item/C in gangbanger.contents)
 		if(C.type == inner_outfit)
 			. += 2
 			continue
-		if(C.type == outer_outfit)
+		else if(C.type == outer_outfit)
 			. += 2
 			continue
-		switch(C.type)
-			if(/obj/item/clothing/neck/necklace/dope)
-				. += 2
-			if(/obj/item/clothing/head/collectable/petehat/gang)
-				. += 4
-			if(/obj/item/clothing/shoes/gang)
-				. += 6
-			if(/obj/item/clothing/mask/gskull)
-				. += 5
-			if(/obj/item/clothing/gloves/gang)
-				. += 3
-			if(/obj/item/weapon/storage/belt/military/gang)
-				. += 4
+		. += C.gang_contraband_value()
 	adjust_influence(gangsta, .)
 	if(.)
 		announce_to_mind(gangsta, "<span class='notice'>Your influential choice of clothing has increased your influence by [.] points!</span>")
diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm
index 245f682dfac..2799ca9d64d 100644
--- a/code/game/gamemodes/gang/gang_items.dm
+++ b/code/game/gamemodes/gang/gang_items.dm
@@ -118,6 +118,9 @@
 	name = "pimpin' hat"
 	desc = "The undisputed king of style."
 
+/obj/item/clothing/head/collectable/petehat/gang/gang_contraband_value()
+	return 4
+
 /datum/gang_item/clothing/mask
 	name = "Golden Death Mask"
 	id = "mask"
@@ -129,6 +132,8 @@
 	icon_state = "gskull"
 	desc = "Strike terror, and envy, into the hearts of your enemies."
 
+/obj/item/clothing/mask/gskull/gang_contraband_value()
+	return 5
 
 /datum/gang_item/clothing/shoes
 	name = "Bling Boots"
@@ -141,13 +146,15 @@
 	desc = "Stand aside peasants."
 	icon_state = "bling"
 
+/obj/item/clothing/shoes/gang/gang_contraband_value()
+	return 6
+
 /datum/gang_item/clothing/neck
 	name = "Gold Necklace"
 	id = "necklace"
 	cost = 9
 	item_path = /obj/item/clothing/neck/necklace/dope
 
-
 /datum/gang_item/clothing/hands
 	name = "Decorative Brass Knuckles"
 	id = "hand"
@@ -160,6 +167,9 @@
 	icon_state = "knuckles"
 	w_class = 3
 
+/obj/item/clothing/gloves/gang/gang_contraband_value()
+	return 3
+
 /datum/gang_item/clothing/belt
 	name = "Badass Belt"
 	id = "belt"
@@ -173,7 +183,8 @@
 	desc = "The belt buckle simply reads 'BAMF'."
 	storage_slots = 1
 
-
+/obj/item/weapon/storage/belt/military/gang/gang_contraband_value()
+	return 4
 
 ///////////////////
 //WEAPONS
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 20f8e8c15c7..4706e26245e 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -193,3 +193,6 @@
 	..()
 	if(unique_rename)
 		to_chat(user, "<span class='notice'>Use a pen on it to rename it or change its description.</span>")
+
+/obj/proc/gang_contraband_value()
+	return 0
diff --git a/code/modules/clothing/neck/ties.dm b/code/modules/clothing/neck/ties.dm
index 59dc504098a..3affebc270e 100644
--- a/code/modules/clothing/neck/ties.dm
+++ b/code/modules/clothing/neck/ties.dm
@@ -164,6 +164,9 @@
 	icon_state = "bling"
 	item_color = "bling"
 
+/obj/item/clothing/neck/necklace/dope/gang_contraband_value()
+	return 2
+
 ////////////////
 //OONGA BOONGA//
 ////////////////