diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 8c0f754ce7b..186d15816ea 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -51,8 +51,30 @@ //used by chem masters and pill presses //update this if you add more patch icons -#define PATCH_STYLE_LIST list("bandaid", "bandaid_brute", "bandaid_burn", "bandaid_both") //icon_state list -#define DEFAULT_PATCH_STYLE "bandaid" +#define PATCH_STYLE_LIST list(\ + "bandaid_1", \ + "bandaid_2", \ + "bandaid_3", \ + "bandaid_4", \ + "bandaid_blank", \ + "bandaid_both", \ + "bandaid_brute", \ + "bandaid_brute_2", \ + "bandaid_burn", \ + "bandaid_burn_2", \ + "bandaid_clown", \ + "bandaid_colonthree", \ + "bandaid_exclaimationpoint", \ + "bandaid_mix", \ + "bandaid_monke", \ + "bandaid_msic", \ + "bandaid_questionmark", \ + "bandaid_suffocation", \ + "bandaid_suffocation_2", \ + "bandaid_toxin", \ + "bandaid_toxin_2", \ +) //icon_state list +#define DEFAULT_PATCH_STYLE "bandaid_blank" //used by chem master #define CONDIMASTER_STYLE_AUTO "auto" diff --git a/code/modules/asset_cache/assets/patches.dm b/code/modules/asset_cache/assets/patches.dm index 2c5bf7e252a..0976bca7218 100644 --- a/code/modules/asset_cache/assets/patches.dm +++ b/code/modules/asset_cache/assets/patches.dm @@ -1,8 +1,25 @@ /datum/asset/spritesheet/simple/patches name = "patches" assets = list( - "bandaid" = 'icons/ui_icons/patches/bandaid.png', + "bandaid_1" = 'icons/ui_icons/patches/bandaid_1.png', + "bandaid_2" = 'icons/ui_icons/patches/bandaid_2.png', + "bandaid_3" = 'icons/ui_icons/patches/bandaid_3.png', + "bandaid_4" = 'icons/ui_icons/patches/bandaid_4.png', + "bandaid_blank" = 'icons/ui_icons/patches/bandaid_blank.png', + "bandaid_both" = 'icons/ui_icons/patches/bandaid_both.png', "bandaid_brute" = 'icons/ui_icons/patches/bandaid_brute.png', + "bandaid_brute_2" = 'icons/ui_icons/patches/bandaid_brute_2.png', "bandaid_burn" = 'icons/ui_icons/patches/bandaid_burn.png', - "bandaid_both" = 'icons/ui_icons/patches/bandaid_both.png' + "bandaid_burn_2" = 'icons/ui_icons/patches/bandaid_burn_2.png', + "bandaid_clown" = 'icons/ui_icons/patches/bandaid_clown.png', + "bandaid_colonthree" = 'icons/ui_icons/patches/bandaid_colonthree.png', + "bandaid_exclaimationpoint" = 'icons/ui_icons/patches/bandaid_exclaimationpoint.png', + "bandaid_mix" = 'icons/ui_icons/patches/bandaid_mix.png', + "bandaid_monke" = 'icons/ui_icons/patches/bandaid_monke.png', + "bandaid_msic" = 'icons/ui_icons/patches/bandaid_msic.png', + "bandaid_questionmark" = 'icons/ui_icons/patches/bandaid_questionmark.png', + "bandaid_suffocation" = 'icons/ui_icons/patches/bandaid_suffocation.png', + "bandaid_suffocation_2" = 'icons/ui_icons/patches/bandaid_suffocation_2.png', + "bandaid_toxin" = 'icons/ui_icons/patches/bandaid_toxin.png', + "bandaid_toxin_2" = 'icons/ui_icons/patches/bandaid_toxin_2.png', ) diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index c6f9061316b..5e166b36ce6 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -2,7 +2,7 @@ name = "chemical patch" desc = "A chemical patch for touch based applications." icon = 'icons/obj/medical/chemical.dmi' - icon_state = "bandaid" + icon_state = "bandaid_blank" inhand_icon_state = null possible_transfer_amounts = list() volume = 40 diff --git a/icons/obj/medical/chemical.dmi b/icons/obj/medical/chemical.dmi index d8aed182b64..9c97904b7c9 100644 Binary files a/icons/obj/medical/chemical.dmi and b/icons/obj/medical/chemical.dmi differ diff --git a/icons/ui_icons/patches/bandaid.png b/icons/ui_icons/patches/bandaid.png deleted file mode 100644 index 66d2a0217da..00000000000 Binary files a/icons/ui_icons/patches/bandaid.png and /dev/null differ diff --git a/icons/ui_icons/patches/bandaid_1.png b/icons/ui_icons/patches/bandaid_1.png new file mode 100644 index 00000000000..f752da706a9 Binary files /dev/null and b/icons/ui_icons/patches/bandaid_1.png differ diff --git a/icons/ui_icons/patches/bandaid_2.png b/icons/ui_icons/patches/bandaid_2.png new file mode 100644 index 00000000000..50ad473ba5d Binary files /dev/null and b/icons/ui_icons/patches/bandaid_2.png differ diff --git a/icons/ui_icons/patches/bandaid_3.png b/icons/ui_icons/patches/bandaid_3.png new file mode 100644 index 00000000000..cee1dd19b83 Binary files /dev/null and b/icons/ui_icons/patches/bandaid_3.png differ diff --git a/icons/ui_icons/patches/bandaid_4.png b/icons/ui_icons/patches/bandaid_4.png new file mode 100644 index 00000000000..3061235434c Binary files /dev/null and b/icons/ui_icons/patches/bandaid_4.png differ diff --git a/icons/ui_icons/patches/bandaid_blank.png b/icons/ui_icons/patches/bandaid_blank.png new file mode 100644 index 00000000000..ddd3882922e Binary files /dev/null and b/icons/ui_icons/patches/bandaid_blank.png differ diff --git a/icons/ui_icons/patches/bandaid_both.png b/icons/ui_icons/patches/bandaid_both.png index b7639b505b8..94245e560fe 100644 Binary files a/icons/ui_icons/patches/bandaid_both.png and b/icons/ui_icons/patches/bandaid_both.png differ diff --git a/icons/ui_icons/patches/bandaid_brute.png b/icons/ui_icons/patches/bandaid_brute.png index 7156ea7ca80..bf6350f6ced 100644 Binary files a/icons/ui_icons/patches/bandaid_brute.png and b/icons/ui_icons/patches/bandaid_brute.png differ diff --git a/icons/ui_icons/patches/bandaid_brute_2.png b/icons/ui_icons/patches/bandaid_brute_2.png new file mode 100644 index 00000000000..66c2d8494d5 Binary files /dev/null and b/icons/ui_icons/patches/bandaid_brute_2.png differ diff --git a/icons/ui_icons/patches/bandaid_burn.png b/icons/ui_icons/patches/bandaid_burn.png index 689b5e89cc6..67c6fb0dcbb 100644 Binary files a/icons/ui_icons/patches/bandaid_burn.png and b/icons/ui_icons/patches/bandaid_burn.png differ diff --git a/icons/ui_icons/patches/bandaid_burn_2.png b/icons/ui_icons/patches/bandaid_burn_2.png new file mode 100644 index 00000000000..db5df4f1e60 Binary files /dev/null and b/icons/ui_icons/patches/bandaid_burn_2.png differ diff --git a/icons/ui_icons/patches/bandaid_clown.png b/icons/ui_icons/patches/bandaid_clown.png new file mode 100644 index 00000000000..0912ee04eac Binary files /dev/null and b/icons/ui_icons/patches/bandaid_clown.png differ diff --git a/icons/ui_icons/patches/bandaid_colonthree.png b/icons/ui_icons/patches/bandaid_colonthree.png new file mode 100644 index 00000000000..ffc7146cca4 Binary files /dev/null and b/icons/ui_icons/patches/bandaid_colonthree.png differ diff --git a/icons/ui_icons/patches/bandaid_exclaimationpoint.png b/icons/ui_icons/patches/bandaid_exclaimationpoint.png new file mode 100644 index 00000000000..a6a423aa20b Binary files /dev/null and b/icons/ui_icons/patches/bandaid_exclaimationpoint.png differ diff --git a/icons/ui_icons/patches/bandaid_mix.png b/icons/ui_icons/patches/bandaid_mix.png new file mode 100644 index 00000000000..1d5c03bfef6 Binary files /dev/null and b/icons/ui_icons/patches/bandaid_mix.png differ diff --git a/icons/ui_icons/patches/bandaid_monke.png b/icons/ui_icons/patches/bandaid_monke.png new file mode 100644 index 00000000000..d1083aa932f Binary files /dev/null and b/icons/ui_icons/patches/bandaid_monke.png differ diff --git a/icons/ui_icons/patches/bandaid_msic.png b/icons/ui_icons/patches/bandaid_msic.png new file mode 100644 index 00000000000..ab7860c080c Binary files /dev/null and b/icons/ui_icons/patches/bandaid_msic.png differ diff --git a/icons/ui_icons/patches/bandaid_questionmark.png b/icons/ui_icons/patches/bandaid_questionmark.png new file mode 100644 index 00000000000..99382b208ae Binary files /dev/null and b/icons/ui_icons/patches/bandaid_questionmark.png differ diff --git a/icons/ui_icons/patches/bandaid_suffocation.png b/icons/ui_icons/patches/bandaid_suffocation.png new file mode 100644 index 00000000000..802baa07a8d Binary files /dev/null and b/icons/ui_icons/patches/bandaid_suffocation.png differ diff --git a/icons/ui_icons/patches/bandaid_suffocation_2.png b/icons/ui_icons/patches/bandaid_suffocation_2.png new file mode 100644 index 00000000000..20d4223ecd7 Binary files /dev/null and b/icons/ui_icons/patches/bandaid_suffocation_2.png differ diff --git a/icons/ui_icons/patches/bandaid_toxin.png b/icons/ui_icons/patches/bandaid_toxin.png new file mode 100644 index 00000000000..3a2fce33f0f Binary files /dev/null and b/icons/ui_icons/patches/bandaid_toxin.png differ diff --git a/icons/ui_icons/patches/bandaid_toxin_2.png b/icons/ui_icons/patches/bandaid_toxin_2.png new file mode 100644 index 00000000000..c40331e789d Binary files /dev/null and b/icons/ui_icons/patches/bandaid_toxin_2.png differ