Merge pull request #4845 from Fox-McCloud/armor-rebalance

TG Armor Rebalance

code/game/objects/items.dm

@@ -44,7 +44,7 @@
 	var/permeability_coefficient = 1 // for chemicals/diseases
 	var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
 	var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
-	var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	var/armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	var/armour_penetration = 0 //percentage of armour effectiveness to remove
 	var/list/allowed = null //suit storage stuff.
 	var/obj/item/device/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.

code/game/objects/items/weapons/melee/energy.dm

@@ -63,6 +63,7 @@
 	w_class_on = 5
 	hitsound = "swing_hit"
 	flags = CONDUCT | NOSHIELD
+	armour_penetration = 100
 	origin_tech = "combat=3"
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	attack_verb_on = list()
@@ -83,6 +84,7 @@
 	throw_range = 5
 	hitsound = "swing_hit"
 	flags = NOSHIELD
+	armour_penetration = 35
 	origin_tech = "magnets=3;syndicate=4"
 	sharp = 1
 	edge = 1
@@ -205,6 +207,7 @@
 	throw_range = 1
 	w_class = 4//So you can't hide it in your pocket or some such.
 	flags = NOSHIELD
+	armour_penetration = 50
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/datum/effect/system/spark_spread/spark_system
 

code/game/objects/items/weapons/staff.dm

@@ -9,6 +9,7 @@
 	throw_range = 5
 	w_class = 2.0
 	flags = NOSHIELD
+	armour_penetration = 100
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
 
 /obj/item/weapon/twohanded/staff/broom

code/game/objects/items/weapons/twohanded.dm

@@ -206,6 +206,7 @@
 	wieldsound = 'sound/weapons/saberon.ogg'
 	unwieldsound = 'sound/weapons/saberoff.ogg'
 	flags = NOSHIELD
+	armour_penetration = 35
 	origin_tech = "magnets=3;syndicate=4"
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharp = 1
@@ -293,6 +294,7 @@
 	force_wielded = 18 // Was 13, Buffed - RR
 	throwforce = 20
 	throw_speed = 3
+	armour_penetration = 10
 	no_spin_thrown = 1 // Thrown spears that spin look dumb. -Fox
 	flags = NOSHIELD
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
@@ -370,6 +372,7 @@
 	wieldsound = 'sound/weapons/chainsawstart.ogg'
 	hitsound = null
 	flags = NOSHIELD
+	armour_penetration = 35
 	origin_tech = "materials=6;syndicate=4"
 	attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered")
 	sharp = 1

code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm

@@ -20,7 +20,7 @@
 	new /obj/item/clothing/suit/holidaypriest(src)
 	new /obj/item/clothing/under/wedding/bride_white(src)
 	new /obj/item/weapon/storage/backpack/cultpack (src)
-	new /obj/item/clothing/head/helmet/knight/templar(src)
+	new /obj/item/clothing/head/helmet/riot/knight/templar(src)
 	new /obj/item/clothing/suit/armor/riot/knight/templar(src)
 	new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
 	new /obj/item/weapon/storage/fancy/candle_box/eternal(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -317,8 +317,8 @@
 		..()
 		new /obj/item/clothing/under/det(src)
 		new /obj/item/clothing/suit/storage/det_suit(src)
-		new /obj/item/clothing/suit/storage/forensics/blue(src)
-		new /obj/item/clothing/suit/storage/forensics/red(src)
+		new /obj/item/clothing/suit/storage/det_suit/forensics/blue(src)
+		new /obj/item/clothing/suit/storage/det_suit/forensics/red(src)
 		new /obj/item/clothing/gloves/color/black(src)
 		new /obj/item/clothing/head/det_hat(src)
 		new /obj/item/clothing/shoes/brown(src)