Merge pull request #5902 from WilsonWeave/BOOTS-AND-SHOES,-BOOTS-AND-…

…SHOES Boots and Gloves
sojourn-13 · Dec 11, 2024 · 8e3349a · 8e3349a
2 parents c0e9edd + 5a24739
commit 8e3349a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
@@ -32,7 +32,7 @@
 
 /obj/item/clothing/gloves/insulated/guild
 	name = "Artificers insulated gloves"
-	desc = "A pare of insulated gloves woven into a thicker fire restant pare."
+	desc = "A pair of insulated gloves woven into a thicker fire resistant pair."
 	icon_state = "guild_yellow"
 	item_state = "guild_yellow"
 	armor_list = list(melee = 5, bullet = 3, energy = 3, bomb = 10, bio = 100, rad = 100)

diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
@@ -67,4 +67,12 @@
 	mag_slow = 2
 	icon_base = "mercboots"
 	action_button_name = "Toggle Magboots"
+	armor_list = list(
+		melee = 8,
+		bullet = 5,
+		energy = 6,
+		bomb = 75,
+		bio = 100,
+		rad = 75
+	)
 	price_tag = 275
diff --git a/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm b/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm
@@ -64,7 +64,8 @@
 			/obj/item/clothing/suit/storage/vest,
 			/obj/item/clothing/head/helmet/tanker,
 			/obj/item/clothing/suit/armor/bulletproof,
-			/obj/item/clothing/suit/armor/laserproof
+			/obj/item/clothing/suit/armor/laserproof,
+			/obj/item/clothing/gloves/thick/swat
 		)
 	)
 	hidden_inventory = list(