Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42

modular_citadel/code/game/gamemodes/gangs/gang_items.dm

@@ -83,14 +83,12 @@
 			return
 	return TRUE
 
-
 /datum/gang_item/clothing/hat
 	name = "Pimp Hat"
 	id = "hat"
 	cost = 16
 	item_path = /obj/item/clothing/head/collectable/petehat/gang
 
-
 /obj/item/clothing/head/collectable/petehat/gang
 	name = "pimpin' hat"
 	desc = "The undisputed king of style."
@@ -109,7 +107,7 @@
 /datum/gang_item/clothing/shoes
 	name = "Bling Boots"
 	id = "boots"
-	cost = 22
+	cost = 20
 	item_path = /obj/item/clothing/shoes/gang
 
 /obj/item/clothing/shoes/gang
@@ -258,7 +256,6 @@ datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang m
 /datum/gang_item/equipment
 	category = "Purchase Equipment:"
 
-
 /datum/gang_item/equipment/spraycan
 	name = "Territory Spraycan"
 	id = "spraycan"
@@ -275,7 +272,6 @@ datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang m
 	cost = 3
 	item_path = /obj/item/sharpener
 
-
 /datum/gang_item/equipment/emp
 	name = "EMP Grenade"
 	id = "EMP"
@@ -329,6 +325,12 @@ datum/gang_item/equipment/shield
 	cost = 25
 	item_path = /obj/item/shield/riot
 
+datum/gang_item/equipment/gangsheild
+	name = "Tower Shield"
+	id = "metal"
+	cost = 45 //High block of melee and even higher for bullets
+	item_path = /obj/item/shield/riot/tower
+
 /datum/gang_item/equipment/pen
 	name = "Recruitment Pen"
 	id = "pen"
@@ -352,7 +354,6 @@ datum/gang_item/equipment/shield
 		return "(GET ONE FREE)"
 	return ..()
 
-
 /datum/gang_item/equipment/gangtool
 	id = "gangtool"
 	cost = 5
@@ -413,4 +414,4 @@ datum/gang_item/equipment/shield
 
 /datum/gang_item/equipment/dominator/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool)
 	new item_path(user.loc)
-	to_chat(user, spawn_msg)
+	to_chat(user, spawn_msg)

modular_citadel/code/game/gamemodes/gangs/gang_pen.dm

@@ -49,7 +49,7 @@
 			return
 		to_chat(user, "<span class='danger'>This mind is already controlled by someone else!</span>")
 		return
-	if(check && gangster_mind.current.has_trait(TRAIT_MINDSHIELD))  //Check to see if the potential gangster is implanted
+	if(check && HAS_TRAIT(gangster_mind.current, TRAIT_MINDSHIELD))  //Check to see if the potential gangster is implanted
 		to_chat(user, "<span class='danger'>This mind is too strong to control!</span>")
 		return
 	var/mob/living/carbon/human/H = gangster_mind.current // we are sure the dude's human cause it's checked in attack()

modular_citadel/code/game/objects/items/devices/flashlight.dm

@@ -1,31 +0,0 @@
-/obj/item/flashlight
-	light_color = "#FFCC66"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/pen
-	light_color = "#FFDDCC"
-	flashlight_power = 0.3
-
-/obj/item/flashlight/seclite
-	light_color = "#CDDDFF"
-	flashlight_power = 0.9
-
-/obj/item/flashlight/lamp
-	light_color = "#FFDDBB"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/flare
-	light_color = "#FA421A"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/flare/torch
-	light_color = "#FAA44B"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/lantern
-	light_color = "#FFAA44"
-	flashlight_power = 0.75
-
-/obj/item/flashlight/slime
-	light_color = "#FFEEAA"
-	flashlight_power = 0.6

modular_citadel/code/game/objects/items/melee/eutactic_blades.dm

@@ -367,7 +367,7 @@
 			unwield()
 			return
 	..()
-	if(user.has_trait(TRAIT_CLUMSY) && (wielded) && prob(40))
+	if(HAS_TRAIT(user, TRAIT_CLUMSY) && (wielded) && prob(40))
 		impale(user)
 		return
 

modular_citadel/code/game/objects/items/melee/misc.dm

@@ -16,7 +16,7 @@
 		return //CIT CHANGE - ditto
 
 	add_fingerprint(user)
-	if((user.has_trait(TRAIT_CLUMSY)) && prob(50))
+	if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
 		to_chat(user, "<span class ='danger'>You club yourself over the head.</span>")
 		user.Knockdown(60 * force)
 		if(ishuman(user))