Skip to content

Commit

Permalink
Fixes sprites of veteran uniform and shoes, also fixes separatist sho…
Browse files Browse the repository at this point in the history
…es. (#117)

* Update marine_uniform.dm

* Update shoes.dmi
  • Loading branch information
Helg2 authored Aug 25, 2024
1 parent c43c45b commit a11a369
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/machinery/vending/marine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@
/obj/item/clothing/under/marine/striped = -1,
/obj/item/clothing/under/marine/slav = -1,
/obj/item/clothing/under/marine/camo = -1,
/obj/item/clothing/under/marine/veteran = -1,
/obj/item/clothing/under/marine/veteran/marine = -1,
/obj/item/clothing/under/marine/separatist = -1,
/obj/item/clothing/under/marine/jaeger = -1,
/obj/item/clothing/under/marine/squad/neck/delta = -1,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/machinery/vending/new_marine_vendors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@
desc = "TerraGov Marine Corps Veteran Uniform Set. Modified mostly by hand, but still quite stylish."
gear_to_spawn = list(
/obj/item/clothing/mask/gas/veteran,
/obj/item/clothing/under/marine/veteran,
/obj/item/clothing/under/marine/veteran/marine,
/obj/item/clothing/gloves/marine/veteran/marine,
/obj/item/clothing/shoes/marine/headskin,
)
Expand Down
14 changes: 7 additions & 7 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -529,11 +529,8 @@
/obj/item/clothing/under/marine/squad/neck/foreign
name = "\improper TGMC Foreign Legion turtleneck"
desc = "Tacticool looking, squad issued uniform. This one belongs to the Foreign Legion, smells like fast food."
icon = 'icons/obj/clothing/uniforms/marine_uniforms.dmi'
icon_state = "foreign_merc"
item_state = "foreign_merc"
item_icons = list(
slot_w_uniform_str = 'icons/mob/clothing/uniforms/marine_uniforms.dmi')

/obj/item/clothing/under/marine/slav
name = "\improper Old slavic uniform"
Expand Down Expand Up @@ -568,15 +565,18 @@
/obj/item/clothing/under/marine/whites/blacks
name = "\improper TGMC black dress uniform"
desc = "A standard-issue TerraGov Marine Corps black dress uniform. The starch in the fabric chafes a small amount but it pales in comparison to the pride you feel when you first put it on during graduation from boot camp. Doesn't seem to fit perfectly around the waist though."
icon = 'icons/obj/clothing/uniforms/marine_uniforms.dmi'
icon_state = "marine_blacks"
item_icons = list(
slot_w_uniform_str = 'icons/mob/clothing/uniforms/marine_uniforms.dmi')

/obj/item/clothing/under/marine/veteran
/obj/item/clothing/under/marine/veteran/marine
name = "\improper Veteran uniform"
desc = "A custom-made protective uniform for the Marine Corps with a long service life. It is reinforced with additional protective plates, Kevlar inserts, sewn metal mesh and impregnated with a refractory mixture. Anyway, that's what the tag on the leg says. Believe it or not, after all, if you've really served in the corps long enough, you know the answer."
icon = 'icons/obj/clothing/uniforms/marine_uniforms.dmi'
icon_state = "veteran"
item_icons = list(
slot_w_uniform_str = 'icons/mob/clothing/uniforms/marine_uniforms.dmi',
slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi',
slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',
)
adjustment_variants = list()

/obj/item/clothing/under/marine/separatist
Expand Down
Binary file modified icons/obj/clothing/shoes.dmi
Binary file not shown.

0 comments on commit a11a369

Please sign in to comment.