diff --git a/code/modules/client/preference_setup/loadout/items/shoes.dm b/code/modules/client/preference_setup/loadout/items/shoes.dm index 5bb5d705ce3..7bad25a9cc7 100644 --- a/code/modules/client/preference_setup/loadout/items/shoes.dm +++ b/code/modules/client/preference_setup/loadout/items/shoes.dm @@ -79,7 +79,6 @@ var/list/sandals = list() sandals["sandals"] = /obj/item/clothing/shoes/sandals sandals["rubber clogs"] = /obj/item/clothing/shoes/sandals/clogs - sandals["flip flops"] = /obj/item/clothing/shoes/sandals/flipflop sandals["geta"] = /obj/item/clothing/shoes/sandals/geta gear_tweaks += new /datum/gear_tweak/path(sandals) diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm index e2c0bb6762d..19303703b48 100644 --- a/code/modules/clothing/shoes/sandals.dm +++ b/code/modules/clothing/shoes/sandals.dm @@ -16,12 +16,6 @@ icon_state = "geta" item_state = "geta" -/obj/item/clothing/shoes/sandals/flipflop - name = "flip flops" - desc = "A pair of foam flip flops. For those not afraid to show a little ankle." - icon_state = "thongsandal" - item_state = "thongsandal" - /obj/item/clothing/shoes/sandals/clogs name = "rubber clogs" desc = "A favorite of barbecue loving fathers, beachgoers, and people with no fashion sense. Don't wear these with socks." diff --git a/html/changelogs/ElorgRHG-sandals-sprite-stuff.yml b/html/changelogs/ElorgRHG-sandals-sprite-stuff.yml new file mode 100644 index 00000000000..e9e177f4243 --- /dev/null +++ b/html/changelogs/ElorgRHG-sandals-sprite-stuff.yml @@ -0,0 +1,15 @@ +# Your name. +author: ElorgRHG + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Made sandal sprites use a standardised colorable palette." + - rscdel: "Removed flip flops due to the sprite being identical to geta sandals." + - bugfix: "Fixes caligae (sock) sprite for Unathi." diff --git a/icons/obj/item/clothing/shoes/sandals.dmi b/icons/obj/item/clothing/shoes/sandals.dmi index bf6c6bbddc8..70b21e710ff 100644 Binary files a/icons/obj/item/clothing/shoes/sandals.dmi and b/icons/obj/item/clothing/shoes/sandals.dmi differ