boot knives for special factions (#16689)

tgstation · Oct 21, 2024 · 63b8a30 · 63b8a30
1 parent 259952c
commit 63b8a30
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 43 deletions.
diff --git a/_maps/map_files/Campaign maps/nt_base/nt_base.dmm b/_maps/map_files/Campaign maps/nt_base/nt_base.dmm
@@ -32494,7 +32494,7 @@
 /turf/open/floor/plating/ground/snow/layer0,
 /area/gelida/landing_zone_2)
 "xNQ" = (
-/obj/item/clothing/shoes/veteran/pmc{
+/obj/item/clothing/shoes/marine/pmc{
 	name = "steel toe boots"
 	},
 /obj/machinery/light,

diff --git a/_maps/map_files/deltastation/deltastation.dmm b/_maps/map_files/deltastation/deltastation.dmm
@@ -76831,7 +76831,7 @@
 /obj/effect/spawner/random/misc/structure/securecloset/regular,
 /obj/item/clothing/under/syndicate/combat,
 /obj/item/clothing/gloves/combat,
-/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/marine/srf,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/item/clothing/under/syndicate,
 /turf/open/floor/prison/redfloor,
@@ -91030,7 +91030,7 @@
 /obj/item/clothing/under/syndicate,
 /obj/item/clothing/under/syndicate,
 /obj/item/clothing/gloves/combat,
-/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/marine/srf,
 /turf/open/floor/prison/redfloor,
 /area/deltastation/asteroidcaves/ship)
 "sBb" = (
@@ -115229,8 +115229,8 @@
 /obj/effect/spawner/random/engineering/plasteel,
 /obj/effect/spawner/random/engineering/plasteel,
 /obj/effect/spawner/random/engineering/plasteel,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/marine/srf,
+/obj/item/clothing/shoes/marine/srf,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/light{
 	dir = 4

diff --git a/_maps/map_files/gelida_iv/gelida_iv.dmm b/_maps/map_files/gelida_iv/gelida_iv.dmm
@@ -35884,7 +35884,7 @@
 /turf/open/floor/plating/ground/snow/layer0,
 /area/gelida/landing_zone_2)
 "xNQ" = (
-/obj/item/clothing/shoes/veteran/pmc{
+/obj/item/clothing/shoes/marine/pmc{
 	name = "steel toe boots"
 	},
 /obj/machinery/light,

diff --git a/code/datums/jobs/job/mercenaries.dm b/code/datums/jobs/job/mercenaries.dm
@@ -21,7 +21,7 @@
 	id = /obj/item/card/id/silver
 	ears = /obj/item/radio/headset/distress/dutch
 	w_uniform = /obj/item/clothing/under/marine/veteran/mercenary
-	shoes = /obj/item/clothing/shoes/veteran/pmc
+	shoes = /obj/item/clothing/shoes/marine/pmc/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary
 	gloves = /obj/item/clothing/gloves/combat
 	head = /obj/item/clothing/head/helmet/marine/veteran/mercenary
@@ -43,7 +43,7 @@
 	id = /obj/item/card/id/silver
 	ears = /obj/item/radio/headset/distress/dutch
 	w_uniform = /obj/item/clothing/under/marine/veteran/mercenary/miner
-	shoes = /obj/item/clothing/shoes/veteran/pmc
+	shoes = /obj/item/clothing/shoes/marine/pmc/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner
 	gloves = /obj/item/clothing/gloves/combat
 	head = /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner
@@ -66,7 +66,7 @@
 	ears = /obj/item/radio/headset/distress/dutch
 	w_uniform = /obj/item/clothing/under/marine/veteran/mercenary/engineer
 	belt = /obj/item/storage/belt/utility/full
-	shoes = /obj/item/clothing/shoes/veteran/pmc
+	shoes = /obj/item/clothing/shoes/marine/pmc/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary/engineer
 	gloves = /obj/item/clothing/gloves/combat
 	head = /obj/item/clothing/head/helmet/marine/veteran/mercenary/engineer

diff --git a/code/datums/jobs/job/pmc.dm b/code/datums/jobs/job/pmc.dm
@@ -22,7 +22,7 @@
 	belt = /obj/item/storage/belt/marine
 	ears = /obj/item/radio/headset/distress/pmc
 	w_uniform = /obj/item/clothing/under/marine/veteran/pmc/holster
-	shoes = /obj/item/clothing/shoes/veteran/pmc
+	shoes = /obj/item/clothing/shoes/marine/pmc/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/helmet/marine/veteran/pmc
@@ -85,7 +85,7 @@
 	belt = /obj/item/belt_harness/marine
 	ears = /obj/item/radio/headset/distress/pmc
 	w_uniform = /obj/item/clothing/under/marine/veteran/pmc/holster
-	shoes = /obj/item/clothing/shoes/veteran/pmc
+	shoes = /obj/item/clothing/shoes/marine/pmc/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/gunner
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner
@@ -144,7 +144,7 @@
 	belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70_pmc
 	ears = /obj/item/radio/headset/distress/pmc
 	w_uniform = /obj/item/clothing/under/marine/veteran/pmc/webbing
-	shoes = /obj/item/clothing/shoes/veteran/pmc
+	shoes = /obj/item/clothing/shoes/marine/pmc/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/sniper
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/helmet/marine/veteran/pmc/sniper
@@ -195,7 +195,7 @@
 	belt = /obj/item/storage/belt/marine
 	ears = /obj/item/radio/headset/distress/pmc
 	w_uniform = /obj/item/clothing/under/marine/veteran/pmc/leader/holster
-	shoes = /obj/item/clothing/shoes/veteran/pmc
+	shoes = /obj/item/clothing/shoes/marine/pmc/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/leader
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/helmet/marine/veteran/pmc/leader

diff --git a/code/datums/jobs/job/special_forces.dm b/code/datums/jobs/job/special_forces.dm
@@ -21,7 +21,7 @@
 	ears = /obj/item/radio/headset/distress/dutch
 	mask = /obj/item/clothing/mask/gas/specops
 	w_uniform = /obj/item/clothing/under/marine/specops
-	shoes = /obj/item/clothing/shoes/combat
+	shoes = /obj/item/clothing/shoes/marine/srf/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/specops
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/modular/m10x
@@ -80,7 +80,7 @@
 	ears = /obj/item/radio/headset/distress/dutch
 	mask = /obj/item/clothing/mask/gas/specops
 	w_uniform = /obj/item/clothing/under/marine/specops
-	shoes = /obj/item/clothing/shoes/combat
+	shoes = /obj/item/clothing/shoes/marine/srf/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/specops/support
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/modular/m10x
@@ -135,7 +135,7 @@
 	ears = /obj/item/radio/headset/distress/dutch
 	mask = /obj/item/clothing/mask/gas/specops
 	w_uniform = /obj/item/clothing/under/marine/specops
-	shoes = /obj/item/clothing/shoes/combat
+	shoes = /obj/item/clothing/shoes/marine/srf/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/specops/support
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/modular/m10x/welding
@@ -195,7 +195,7 @@
 	belt = /obj/item/storage/belt/lifesaver/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/specops/medic
 	head = /obj/item/clothing/head/modular/m10x
-	shoes = /obj/item/clothing/shoes/combat
+	shoes = /obj/item/clothing/shoes/marine/srf/full
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	glasses = /obj/item/clothing/glasses/hud/health
 	suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed
@@ -241,7 +241,7 @@
 	mask = /obj/item/clothing/mask/gas/specops
 	w_uniform = /obj/item/clothing/under/marine/specops
 	glasses = /obj/item/clothing/glasses/night
-	shoes = /obj/item/clothing/shoes/combat
+	shoes = /obj/item/clothing/shoes/marine/srf/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/specops/leader
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/beret/sec

diff --git a/code/datums/jobs/job/vsd.dm b/code/datums/jobs/job/vsd.dm
@@ -27,7 +27,7 @@
 	ears = /obj/item/radio/headset/distress/vsd
 	glasses = /obj/item/clothing/glasses/night/vsd
 	w_uniform = /obj/item/clothing/under/vsd/webbing
-	shoes = /obj/item/clothing/shoes/marine/vsd
+	shoes = /obj/item/clothing/shoes/marine/vsd/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/vsd
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/helmet/marine/vsd
@@ -159,7 +159,7 @@
 	ears = /obj/item/radio/headset/distress/vsd
 	glasses = /obj/item/clothing/glasses/meson
 	w_uniform = /obj/item/clothing/under/vsd/webbing
-	shoes = /obj/item/clothing/shoes/marine/vsd
+	shoes = /obj/item/clothing/shoes/marine/vsd/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/desert
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/helmet/marine/vsd/secondary
@@ -248,7 +248,7 @@
 	belt = /obj/item/storage/belt/lifesaver/full/upp
 	glasses = /obj/item/clothing/glasses/hud/health
 	w_uniform = /obj/item/clothing/under/vsd/medic
-	shoes = /obj/item/clothing/shoes/marine/vsd
+	shoes = /obj/item/clothing/shoes/marine/vsd/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/vsd
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	head = /obj/item/clothing/head/helmet/marine/vsd/medic
@@ -363,7 +363,7 @@
 	ears = /obj/item/radio/headset/distress/vsd
 	glasses = /obj/item/clothing/glasses/night/vsd
 	w_uniform = /obj/item/clothing/under/vsd/webbing
-	shoes = /obj/item/clothing/shoes/marine/vsd
+	shoes = /obj/item/clothing/shoes/marine/vsd/full
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	r_store = /obj/item/storage/pouch/medical_injectors/firstaid
 	back = /obj/item/storage/backpack/lightpack/vsd
@@ -566,7 +566,7 @@
 	ears = /obj/item/radio/headset/distress/vsd
 	glasses = /obj/item/clothing/glasses/meson
 	w_uniform = /obj/item/clothing/under/vsd/webbing
-	shoes = /obj/item/clothing/shoes/marine/vsd
+	shoes = /obj/item/clothing/shoes/marine/vsd/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/vsd/juggernaut
 	suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
@@ -614,7 +614,7 @@
 	ears = /obj/item/radio/headset/distress/vsd
 	glasses = /obj/item/clothing/glasses/meson
 	w_uniform = /obj/item/clothing/under/vsd/webbing
-	shoes = /obj/item/clothing/shoes/marine/vsd
+	shoes = /obj/item/clothing/shoes/marine/vsd/full
 	wear_suit = /obj/item/clothing/suit/storage/marine/vsd/eod
 	suit_store = /obj/item/weapon/gun/launcher/rocket/vsd
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
@@ -680,7 +680,7 @@
 	id = /obj/item/card/id/silver
 	ears = /obj/item/radio/headset/distress/vsd
 	w_uniform = /obj/item/clothing/under/vsd/webbing
-	shoes = /obj/item/clothing/shoes/marine/vsd
+	shoes = /obj/item/clothing/shoes/marine/vsd/full
 	gloves = /obj/item/clothing/gloves/marine/veteran/pmc
 	r_store = /obj/item/storage/pouch/medical_injectors/firstaid
 	l_store = /obj/item/storage/pouch/magazine

diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm
@@ -455,7 +455,7 @@
 	corpsemask = /obj/item/clothing/mask/gas
 	corpsehelmet = /obj/item/clothing/head/helmet/marine/veteran/pmc
 	corpsegloves = /obj/item/clothing/gloves/marine/veteran/pmc
-	corpseshoes = /obj/item/clothing/shoes/veteran/pmc
+	corpseshoes = /obj/item/clothing/shoes/marine/pmc
 	corpsepocket1 = /obj/item/tool/lighter/zippo
 	corpseid = 1
 	corpseidjob = "Private Security Officer"

diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm
@@ -75,9 +75,7 @@
 	name = "spatial agent's shoes"
 	desc = "Shoes worn by a spatial agent."
 
-/obj/item/clothing/shoes/veteran
-
-/obj/item/clothing/shoes/veteran/pmc
+/obj/item/clothing/shoes/marine/pmc
 	name = "polished shoes"
 	desc = "The height of fashion, but these look to be woven with protective fiber."
 	icon_state = "jackboots"
@@ -91,6 +89,9 @@
 	inventory_flags = NOSLIPPING
 	siemens_coefficient = 0.6
 
+/obj/item/clothing/shoes/marine/pmc/full
+	starting_attachments = list(/obj/item/armor_module/storage/boot/full)
+
 /obj/item/clothing/shoes/marine/deathsquad
 	name = "\improper PMC commando boots"
 	desc = "A pair of heavily armored, acid-resistant boots."
@@ -156,6 +157,9 @@
 	icon_state = "boots"
 	worn_icon_state = "boots"
 
+/obj/item/clothing/shoes/marine/vsd/full
+	starting_attachments = list(/obj/item/armor_module/storage/boot/full)
+
 /obj/item/clothing/shoes/marine/clf/full
 	starting_attachments = list(/obj/item/armor_module/storage/boot/full)
 
@@ -180,3 +184,21 @@
 
 /obj/item/clothing/shoes/marine/tdf/full
 	starting_attachments = list(/obj/item/armor_module/storage/boot/full)
+
+/obj/item/clothing/shoes/marine/srf //Basically SWAT shoes combined with galoshes.
+	name = "combat boots"
+	desc = "When you REALLY want to turn up the heat"
+	icon_state = "swat"
+	worn_icon_state = "swat"
+	item_flags = SYNTH_RESTRICTED
+	soft_armor = list(MELEE = 80, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 50, BIO = 10, FIRE = 25, ACID = 25)
+	inventory_flags = NOSLIPPING
+	siemens_coefficient = 0.6
+
+	cold_protection_flags = FEET
+	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection_flags = FEET
+	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
+
+/obj/item/clothing/shoes/marine/srf/full
+	starting_attachments = list(/obj/item/armor_module/storage/boot/full)
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
@@ -34,20 +34,6 @@
 	item_flags = SYNTH_RESTRICTED
 	siemens_coefficient = 0.6
 
-/obj/item/clothing/shoes/combat //Basically SWAT shoes combined with galoshes.
-	name = "combat boots"
-	desc = "When you REALLY want to turn up the heat"
-	icon_state = "swat"
-	item_flags = SYNTH_RESTRICTED
-	soft_armor = list(MELEE = 80, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 50, BIO = 10, FIRE = 25, ACID = 25)
-	inventory_flags = NOSLIPPING
-	siemens_coefficient = 0.6
-
-	cold_protection_flags = FEET
-	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
-	heat_protection_flags = FEET
-	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
-
 /obj/item/clothing/shoes/space_ninja
 	name = "ninja shoes"
 	desc = "A pair of running shoes. Excellent for running and even better for smashing skulls."

diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi