Armor changes and additions (#4509)

* Armor changes and additions Added: Clothing now has a accessible UI as with tools, you can currently only check the armor stats. Added generic helmets to go along with their suit counterparts. Added generic reinforced shoes and jackboots for the general crew, which helps highlight Ironhammer's palette in-game. Refactor: Moved some suits and headwear out of the Security uniform file. Space suit helmets no longer an unnecessary subtype of helmet. An armor type has been created for head items, and it follows close to the layout of suits. Moved head/helmet.dm into head/armor.dm. Mapchanges: Replaces the paths of the aforementioned items. Balance: Preacher's coat and jacket follow after the stats of the Guild jackets. The SCAF suits have been unashamedly buffed so that they outperform all equipment onboard the ship. Helmets perform better against melee, while relatively keeping the general stats of their suit counterparts. Combat RIGs have been adjusted as they already still out-perform nearly everything in the repo. Acolyte armor has been beefed up, while taking on an additional slowdown malus. The light RIG has been adjusted, and no longer gives full bio protection since it's not airtight. Hazard RIG, generic voidsuit, and gem-encrusted voidsuit have been given slight adjustements regarding their energy armor. The Syndicate space suit now actually is capable of performing some kind of role. Excelsior armor has been given straight buffs, suffers from the same problem of players avoiding it due to not being able to compete with other onboard suits, while being a clear declaration. Fixes: The Agrolyte skaf is no longer offset of the mob sprite by one pixel. Tweaks: Adjusted the cloth spawners for the new items with stats in mind. Acolytes can find jackets in their lockers as an alternative to their heavier skafs. * Re-adjusts some values Re-adjusts some values with feedback from Coureere. * Small oversight. Only melee was meant to have a higher stat. * ironhammer bulletproof helmet Removes armor values from combat gloves, and changes their object path. * Removes the armor UI * Removes unused tmpl file.
Shadow-Quill · Jan 27, 2020 · e4d8f96 · e4d8f96
1 parent 22867bd
commit e4d8f96
Show file tree

Hide file tree

Showing 83 changed files with 794 additions and 635 deletions.
diff --git a/cev_eris.dme b/cev_eris.dme
@@ -1408,9 +1408,9 @@
 #include "code\modules\clothing\gloves\color.dm"
 #include "code\modules\clothing\gloves\miscellaneous.dm"
 #include "code\modules\clothing\gloves\stungloves.dm"
+#include "code\modules\clothing\head\armor.dm"
 #include "code\modules\clothing\head\collectable.dm"
 #include "code\modules\clothing\head\hardhat.dm"
-#include "code\modules\clothing\head\helmet.dm"
 #include "code\modules\clothing\head\jobs.dm"
 #include "code\modules\clothing\head\misc.dm"
 #include "code\modules\clothing\head\misc_special.dm"

diff --git a/code/__DEFINES/items_clothing.dm b/code/__DEFINES/items_clothing.dm
@@ -1,6 +1,6 @@
 #define HUMAN_STRIP_DELAY        40   // Takes 40ds = 4s to strip someone.
 
-#define SHOES_SLOWDOWN          -1.0  // How much shoes slow you down by default. Negative values speed you up.
+#define SHOES_SLOWDOWN          -1	  // How much shoes slow you down by default. Negative values speed you up.
 
 #define CANDLE_LUM 3 // For how bright candles are.
 

diff --git a/code/datums/craft/recipes/clothing.dm b/code/datums/craft/recipes/clothing.dm
@@ -35,7 +35,7 @@
 
 /datum/craft_recipe/clothing/combat_helmet
 	name = "combat helmet"
-	result = /obj/item/clothing/head/helmet/handmade
+	result = /obj/item/clothing/head/armor/helmet/handmade
 	steps = list(
 		list(/obj/item/weapon/reagent_containers/glass/bucket, 1, "time" = 30),
 		list(CRAFT_MATERIAL, 4, MATERIAL_STEEL),

diff --git a/code/datums/outfits/antagonist/mercenary.dm b/code/datums/outfits/antagonist/mercenary.dm
@@ -3,6 +3,7 @@
 	hierarchy_type = /decl/hierarchy/outfit/antagonist/mercenary
 
 	uniform = /obj/item/clothing/under/turtleneck
+	gloves = /obj/item/clothing/gloves/security/tactical
 	l_ear = /obj/item/device/radio/headset
 	shoes = /obj/item/clothing/shoes/magboots/merc
 	pda_slot = slot_belt

diff --git a/code/datums/outfits/jobs/church.dm b/code/datums/outfits/jobs/church.dm
@@ -14,7 +14,7 @@
 	l_ear = /obj/item/device/radio/headset/heads/preacher
 	id_type = /obj/item/weapon/card/id/chaplain
 	uniform = /obj/item/clothing/under/rank/preacher
-	suit = /obj/item/clothing/suit/chaplain_hoodie/coat
+	suit = /obj/item/clothing/suit/neotheology_coat
 	shoes = /obj/item/clothing/shoes/reinforced
 	gloves = /obj/item/clothing/gloves/thick
 	backpack_contents = list(/obj/item/weapon/book/ritual/cruciform/priest = 1)

diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm
@@ -1,8 +1,8 @@
 /decl/hierarchy/outfit/job/security
 	hierarchy_type = /decl/hierarchy/outfit/job/security
 	l_ear = /obj/item/device/radio/headset/headset_sec
-	gloves = /obj/item/clothing/gloves/thick
-	shoes = /obj/item/clothing/shoes/jackboots
+	gloves = /obj/item/clothing/gloves/security/ironhammer
+	shoes = /obj/item/clothing/shoes/jackboots/ironhammer
 	id_type = /obj/item/weapon/card/id/sec
 	pda_type = /obj/item/modular_computer/pda/security
 	backpack_contents = list(/obj/item/weapon/handcuffs = 1)
@@ -15,7 +15,7 @@
 	name = OUTFIT_JOB_NAME("Ironhammer Commander")
 	l_ear = /obj/item/device/radio/headset/heads/hos
 	uniform = /obj/item/clothing/under/rank/ih_commander
-	suit = /obj/item/clothing/suit/armor/hos
+	suit = /obj/item/clothing/suit/armor/greatcoat/ironhammer
 	l_pocket = /obj/item/device/flash
 	gloves = /obj/item/clothing/gloves/stungloves
 	glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
@@ -37,13 +37,11 @@
 
 /decl/hierarchy/outfit/job/security/inspector
 	name = OUTFIT_JOB_NAME("Ironhammer Inspector")
-	head = /obj/item/clothing/head/det
 	uniform = /obj/item/clothing/under/rank/inspector
 	suit = /obj/item/clothing/suit/storage/detective/ironhammer
 	head = /obj/item/clothing/head/det
-	gloves = /obj/item/clothing/gloves/thick/swat
 	l_pocket = /obj/item/device/flash
-	shoes = /obj/item/clothing/shoes/reinforced
+	shoes = /obj/item/clothing/shoes/reinforced/ironhammer
 	belt = /obj/item/weapon/gun/energy/gun/martin
 	r_hand = /obj/item/weapon/storage/briefcase/crimekit
 	id_type = /obj/item/weapon/card/id/det
@@ -72,6 +70,6 @@
 	suit = /obj/item/clothing/suit/armor/vest/ironhammer
 	mask = /obj/item/clothing/mask/balaclava/tactical
 	glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
-	head = /obj/item/clothing/head/helmet
+	head = /obj/item/clothing/head/armor/helmet/ironhammer
 	gloves = /obj/item/clothing/gloves/stungloves
 	backpack_contents = list(/obj/item/weapon/handcuffs = 1, /obj/item/device/lighting/toggleable/flashlight/seclite = 1, /obj/item/weapon/cell/small/high = 2, /obj/item/weapon/gun/energy/gun/martin = 1)
diff --git a/code/datums/uplink/neotheology.dm b/code/datums/uplink/neotheology.dm
@@ -72,7 +72,7 @@ A small pool of thematically appropriate religious items that are generally chea
 /datum/uplink_item/item/neotheology/coat
 	name = "Preacher Coat"
 	item_cost = 3
-	path = /obj/item/clothing/suit/chaplain_hoodie
+	path = /obj/item/clothing/suit/neotheology_coat
 
 /*
 	Guns: All taken from the NeoTheology Armory of the New Testament

diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm
@@ -5,7 +5,7 @@
 			for(var/i=1,i<=rand(1,5),i++)
 				new /obj/item/weapon/a_gift(T)
 	//for(var/mob/living/simple_animal/corgi/Ian/Ian in SSmobs.mob_list)
-	//	Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
+	//	Ian.place_on_head(new /obj/item/clothing/head/space/santahat(Ian))
 
 /proc/ChristmasEvent()
 	for(var/obj/structure/flora/tree/pine/xmas in world)

diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
@@ -243,8 +243,8 @@
 
 /mob/living/carbon/human/tracking_status()
 	//Cameras can't track people wearing an agent card or a ninja hood.
-	if(istype(head, /obj/item/clothing/head/helmet/space/rig))
-		var/obj/item/clothing/head/helmet/space/rig/helmet = head
+	if(istype(head, /obj/item/clothing/head/space/rig))
+		var/obj/item/clothing/head/space/rig/helmet = head
 		if(helmet.prevent_track())
 			return TRACKING_TERMINATE
 

diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
@@ -184,7 +184,7 @@
 		/obj/item/clothing/suit,
 		/obj/item/clothing/shoes/magboots,
 		/obj/item/blueprints,
-		/obj/item/clothing/head/helmet/space,
+		/obj/item/clothing/head/space,
 		/obj/item/weapon/storage/internal
 	)
 

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
@@ -864,7 +864,7 @@ There are 9 wires.
 		var/mob/living/carbon/human/H = user
 		if(H.getBrainLoss() >= 60)
 			playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
-			if(!istype(H.head, /obj/item/clothing/head/helmet))
+			if(!istype(H.head, /obj/item/clothing/head/armor/helmet))
 				visible_message(SPAN_WARNING("[user] headbutts the airlock."))
 				var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD)
 				H.Stun(8)

diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
@@ -23,7 +23,7 @@
 	var/mob/living/carbon/OCCUPANT = null
 	var/obj/item/clothing/suit/space/SUIT = null
 	var/SUIT_TYPE = null
-	var/obj/item/clothing/head/helmet/space/HELMET = null
+	var/obj/item/clothing/head/space/HELMET = null
 	var/HELMET_TYPE = null
 	var/obj/item/clothing/mask/MASK = null  //All the stuff that's gonna be stored insiiiiiiiiiiiiiiiiiiide, nyoro~n
 	var/MASK_TYPE = null //Erro's idea on standarising SSUs whle keeping creation of other SSU types easy: Make a child SSU, name it something then set the TYPE vars to your desired suit output. New() should take it from there by itself.
@@ -449,7 +449,7 @@
 		return
 	else if(istype(I, /obj/item/clothing/suit/space))
 		load(I, user, SLOT_SUIT)
-	else if(istype(I, /obj/item/clothing/head/helmet))
+	else if(istype(I, /obj/item/clothing/head/space))
 		load(I, user, SLOT_HELMET)
 	else if(istype(I, /obj/item/clothing/mask))
 		load(I, user, SLOT_MASK)
@@ -464,7 +464,7 @@
 /obj/machinery/suit_storage_unit/standard_unit
 	overlay_color = "#B0B0B0"
 	SUIT_TYPE = /obj/item/clothing/suit/space
-	HELMET_TYPE = /obj/item/clothing/head/helmet/space
+	HELMET_TYPE = /obj/item/clothing/head/space
 	MASK_TYPE = /obj/item/clothing/mask/breath
 
 /obj/machinery/suit_storage_unit/medical

diff --git a/code/game/objects/effects/spawners/corpsespawner.dm b/code/game/objects/effects/spawners/corpsespawner.dm
@@ -90,10 +90,10 @@
 	corpseuniform = /obj/item/clothing/under/syndicate
 	corpsesuit = /obj/item/clothing/suit/armor/vest
 	corpseshoes = /obj/item/clothing/shoes/jackboots
-	corpsegloves = /obj/item/clothing/gloves/thick/swat
+	corpsegloves = /obj/item/clothing/gloves/security
 	corpseradio = /obj/item/device/radio/headset
 	corpsemask = /obj/item/clothing/mask/gas
-	corpsehelmet = /obj/item/clothing/head/helmet
+	corpsehelmet = /obj/item/clothing/head/armor/helmet
 	corpseback = /obj/item/weapon/storage/backpack
 	corpseid = 1
 	corpseidjob = "Operative"
@@ -106,7 +106,7 @@
 	corpseuniform = /obj/item/clothing/under/syndicate
 	corpsesuit = /obj/item/clothing/suit/space/void/merc
 	corpseshoes = /obj/item/clothing/shoes/jackboots
-	corpsegloves = /obj/item/clothing/gloves/thick/swat
+	corpsegloves = /obj/item/clothing/gloves/security
 	corpseradio = /obj/item/device/radio/headset
 	corpsemask = /obj/item/clothing/mask/gas/syndicate
 	corpseback = /obj/item/weapon/tank/jetpack/oxygen
@@ -187,7 +187,7 @@
 	corpseglasses = /obj/item/clothing/glasses/eyepatch
 	corpsemask = /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba
 	corpsehelmet = /obj/item/clothing/head/centhat
-	corpsegloves = /obj/item/clothing/gloves/thick/swat
+	corpsegloves = /obj/item/clothing/gloves/security
 	corpseshoes = /obj/item/clothing/shoes/jackboots
 	corpsepocket1 = /obj/item/weapon/flame/lighter/zippo
 	corpseid = 1

diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
@@ -20,7 +20,7 @@
 
 /obj/item/device/radio/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
-	if(istype(W, /obj/item/clothing/head/helmet))
+	if(istype(W, /obj/item/clothing/head/armor/helmet))
 		if(!b_stat)
 			to_chat(user, SPAN_NOTICE("[src] is not ready to be attached!"))
 			return

diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm
@@ -27,7 +27,7 @@
 	var/new_light_overlay
 	var/new_mob_icon_file
 
-/obj/item/clothing/head/helmet/space/void/attackby(var/obj/item/O, var/mob/user)
+/obj/item/clothing/head/space/void/attackby(var/obj/item/O, var/mob/user)
 	if(istype(O,/obj/item/device/kit/suit))
 		var/obj/item/device/kit/suit/kit = O
 		name = "[kit.new_name] suit helmet"

diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
@@ -34,7 +34,7 @@
 			return TRUE
 
 		if(affecting.organ_tag == BP_HEAD)
-			if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
+			if(H.head && istype(H.head,/obj/item/clothing/head/space))
 				to_chat(user, SPAN_WARNING("You can't apply [src] through [H.head]!"))
 				return 1
 		else

diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -42,7 +42,7 @@
 				ear_safety += 2
 			if(HULK in M.mutations)
 				ear_safety += 1
-			if(istype(M:head, /obj/item/clothing/head/helmet))
+			if(istype(M:head, /obj/item/clothing/head/armor/helmet))
 				ear_safety += 1
 
 //Flashing everyone

diff --git a/code/game/objects/items/weapons/storage/deferred.dm b/code/game/objects/items/weapons/storage/deferred.dm
@@ -224,7 +224,7 @@
 	/obj/item/clothing/under/serbiansuit = 1,
 	/obj/item/clothing/head/soft/green2soft = 1,
 	/obj/item/clothing/suit/armor/bulletproof/serbian/green = 1,
-	/obj/item/clothing/head/helmet/altyn = 1,
+	/obj/item/clothing/head/armor/altyn = 1,
 	/obj/item/clothing/mask/balaclava/tactical = 1,
 	/obj/item/clothing/shoes/jackboots = 1,
 	/obj/item/clothing/gloves/fingerless = 1)
@@ -237,7 +237,7 @@
 	/obj/item/clothing/under/serbiansuit/brown = 1,
 	/obj/item/clothing/head/soft/tan2soft = 1,
 	/obj/item/clothing/suit/armor/bulletproof/serbian/tan = 1,
-	/obj/item/clothing/head/helmet/altyn/brown = 1,
+	/obj/item/clothing/head/armor/altyn/brown = 1,
 	/obj/item/clothing/mask/balaclava/tactical = 1,
 	/obj/item/clothing/shoes/jackboots = 1,
 	/obj/item/clothing/gloves/fingerless = 1)
@@ -249,7 +249,7 @@
 	initial_contents = list(
 	/obj/item/clothing/under/serbiansuit/black = 1,
 	/obj/item/clothing/suit/armor/bulletproof/serbian = 1,
-	/obj/item/clothing/head/helmet/altyn/black = 1,
+	/obj/item/clothing/head/armor/altyn/black = 1,
 	/obj/item/clothing/mask/balaclava/tactical = 1,
 	/obj/item/clothing/shoes/jackboots = 1,
 	/obj/item/clothing/gloves/fingerless = 1,
@@ -262,7 +262,7 @@
 	initial_contents = list(
 	/obj/item/clothing/under/serbiansuit = 1,
 	/obj/item/clothing/suit/armor/flak/green = 1,
-	/obj/item/clothing/head/helmet/altyn/maska = 1,
+	/obj/item/clothing/head/armor/altyn/maska = 1,
 	/obj/item/clothing/mask/balaclava/tactical = 1,
 	/obj/item/clothing/shoes/jackboots = 1,
 	/obj/item/clothing/gloves/fingerless = 1,
@@ -276,7 +276,7 @@
 	/obj/item/clothing/under/serbiansuit = 1,
 	/obj/item/clothing/head/soft/green2soft = 1,
 	/obj/item/clothing/suit/armor/flak = 1,
-	/obj/item/clothing/head/helmet/steelpot = 1,
+	/obj/item/clothing/head/armor/steelpot = 1,
 	/obj/item/clothing/shoes/jackboots = 1,
 	/obj/item/clothing/gloves/fingerless = 1,
 	/obj/item/weapon/storage/fancy/cigarettes = 1)
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -18,7 +18,7 @@
 			new /obj/effect/spawner/newbomb/timer/syndicate(src)
 			new /obj/item/device/powersink(src)
 			new /obj/item/clothing/suit/space/syndicate(src)
-			new /obj/item/clothing/head/helmet/space/syndicate(src)
+			new /obj/item/clothing/head/space/syndicate(src)
 			new /obj/item/clothing/mask/gas/syndicate(src)
 			new /obj/item/weapon/tank/emergency_oxygen/double(src)
 			return
@@ -55,7 +55,7 @@
 /*			if("lordsingulo")
 			new /obj/item/device/radio/beacon/syndicate(src)
 			new /obj/item/clothing/suit/space/syndicate(src)
-			new /obj/item/clothing/head/helmet/space/syndicate(src)
+			new /obj/item/clothing/head/space/syndicate(src)
 			new /obj/item/clothing/mask/gas/syndicate(src)
 			new /obj/item/weapon/tank/emergency_oxygen/double(src)
 			new /obj/item/weapon/card/emag(src)

diff --git a/code/game/objects/landmarks/costume.dm b/code/game/objects/landmarks/costume.dm
@@ -10,7 +10,7 @@
 
 /obj/landmark/costume/gladiator/New()
 	new /obj/item/clothing/under/gladiator(src.loc)
-	new /obj/item/clothing/head/helmet/gladiator(src.loc)
+	new /obj/item/clothing/head/gladiator(src.loc)
 
 /obj/landmark/costume/madscientist/New()
 	//new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)

diff --git a/code/game/objects/random/cloth.dm b/code/game/objects/random/cloth.dm
@@ -53,15 +53,22 @@
 	icon_state = "armor-grey"
 
 /obj/random/cloth/armor/item_to_spawn()
-	return pickweight(list(/obj/item/clothing/suit/armor/bulletproof = 10,
-				/obj/item/clothing/suit/space/captain = 1,
+	return pickweight(list(/obj/item/clothing/suit/armor/vest = 20,
+				/obj/item/clothing/suit/armor/vest/security = 15,
+				/obj/item/clothing/suit/armor/vest/detective  = 10,
+				/obj/item/clothing/suit/armor/vest/ironhammer = 2,
+				/obj/item/clothing/suit/armor/vest/handmade = 5,
+				/obj/item/clothing/suit/armor/flak = 5,
+				/obj/item/clothing/suit/armor/flak/green = 5,
+				/obj/item/clothing/suit/armor/bulletproof = 10,
+				/obj/item/clothing/suit/armor/bulletproof/ironhammer = 2,
+				/obj/item/clothing/suit/armor/bulletproof/serbian = 2,
+				/obj/item/clothing/suit/armor/bulletproof/serbian/green = 2,
+				/obj/item/clothing/suit/armor/bulletproof/serbian/tan = 2,
+				/obj/item/clothing/suit/armor/laserproof = 4,
 				/obj/item/clothing/suit/armor/heavy = 2,
 				/obj/item/clothing/suit/armor/heavy/riot = 4,
-				/obj/item/clothing/suit/armor/laserproof = 2,
-				/obj/item/clothing/suit/armor/vest/detective  = 10,
-				/obj/item/clothing/suit/armor/vest/handmade = 20,
-				/obj/item/clothing/suit/space/void/SCAF = 1,
-				/obj/item/clothing/suit/armor/vest/security = 20))
+				/obj/item/clothing/suit/storage/vest/merc = 2))
 
 /obj/random/cloth/armor/low_chance
 	name = "low chance random armor"
@@ -118,8 +125,8 @@
 				/obj/item/clothing/suit/bio_suit/scientist = 5,
 				/obj/item/clothing/suit/bio_suit/security = 5,
 				/obj/item/clothing/suit/bio_suit/virology = 5,
-				/obj/item/clothing/suit/radiation = 30,
-				/obj/item/clothing/suit/space/bomb = 20))
+				/obj/item/clothing/suit/radiation = 15,
+				/obj/item/clothing/suit/space/bomb = 10))
 
 /obj/random/cloth/hazmatsuit/low_chance
 	name = "low chance random hazmat suit"
@@ -168,7 +175,6 @@
 				/obj/item/clothing/under/suit_jacket/red = 5,
 				/obj/item/clothing/under/suit_jacket = 5,
 				/obj/item/clothing/under/turtleneck = 5,
-				/obj/item/clothing/under/tactical = 5,
 				/obj/item/clothing/under/syndicate = 5))
 
 /obj/random/cloth/under/low_chance
@@ -186,9 +192,18 @@
 	icon_state = "armor-grey"
 
 /obj/random/cloth/helmet/item_to_spawn()
-	return pickweight(list(/obj/item/clothing/head/helmet = 5,
-				/obj/item/clothing/head/helmet/riot = 5,
-				/obj/item/clothing/head/helmet/space/void/SCAF = 1))
+	return pickweight(list(/obj/item/clothing/head/armor/helmet = 20,
+				/obj/item/clothing/head/armor/helmet/visor = 15,
+				/obj/item/clothing/head/armor/helmet/dermal = 2,
+				/obj/item/clothing/head/armor/helmet/ironhammer = 2,
+				/obj/item/clothing/head/armor/bulletproof = 10,
+				/obj/item/clothing/head/armor/laserproof = 4,
+				/obj/item/clothing/head/armor/riot = 4,
+				/obj/item/clothing/head/armor/steelpot = 10,
+				/obj/item/clothing/head/armor/altyn = 2,
+				/obj/item/clothing/head/armor/altyn/brown = 2,
+				/obj/item/clothing/head/armor/altyn/black = 2,
+				/obj/item/clothing/head/armor/altyn/maska = 1))
 
 /obj/random/cloth/helmet/low_chance
 	name = "low chance random helmet"
@@ -276,8 +291,8 @@
 				/obj/item/clothing/gloves/insulated/cheap = 7,
 				/obj/item/clothing/gloves/latex = 9,
 				/obj/item/clothing/gloves/thick = 5,
-				/obj/item/clothing/gloves/thick/combat = 1,
-				/obj/item/clothing/gloves/thick/swat = 2,
+				/obj/item/clothing/gloves/security/tactical = 1,
+				/obj/item/clothing/gloves/security = 2,
 				/obj/item/clothing/gloves/stungloves = 1))
 
 /obj/random/cloth/gloves/low_chance