diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index f0e2f5b0fc8..d38f9841544 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -12,6 +12,13 @@ desc = "The banner of His Majesty, King Squiggles the Eighth." icon_state = "clownflag" +/obj/item/flag/syndi + name = "Syndicate flag" + desc = "A flag proudly boasting the logo of the Syndicate, in defiance of NT." + icon_state = "syndiflag" + + +//Nations/Department flags /obj/item/flag/cargo name = "Cargonia flag" desc = "The flag of the independant, sovereign nation of Cargonia." diff --git a/icons/mob/in-hand/in-hand_sync_report.txt b/icons/mob/in-hand/in-hand_sync_report.txt index 4d6c2c862e6..1214d5de1db 100644 --- a/icons/mob/in-hand/in-hand_sync_report.txt +++ b/icons/mob/in-hand/in-hand_sync_report.txt @@ -5,6 +5,12 @@ + cuff_orange + cuff_pink + cuff_white +--- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\flags_left.dmi ++++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\flags_left.dmi + + cargoflag + + clownflag + + ntflag + + syndiflag --- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\guns.dmi +++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\guns.dmi + scythe0 diff --git a/icons/mob/in-hand/left/flags.dmi b/icons/mob/in-hand/left/flags.dmi deleted file mode 100644 index 227da84987c..00000000000 Binary files a/icons/mob/in-hand/left/flags.dmi and /dev/null differ diff --git a/icons/mob/in-hand/left/flags_left.dmi b/icons/mob/in-hand/left/flags_left.dmi new file mode 100644 index 00000000000..8993ac8bfe0 Binary files /dev/null and b/icons/mob/in-hand/left/flags_left.dmi differ diff --git a/icons/mob/in-hand/right/flags.dmi b/icons/mob/in-hand/right/flags.dmi deleted file mode 100644 index 7f404a92d4b..00000000000 Binary files a/icons/mob/in-hand/right/flags.dmi and /dev/null differ diff --git a/icons/mob/in-hand/right/flags_right.dmi b/icons/mob/in-hand/right/flags_right.dmi new file mode 100644 index 00000000000..bd6fad531d7 Binary files /dev/null and b/icons/mob/in-hand/right/flags_right.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index dbf957b8c2d..ab737f8459a 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 0bad0f69743..fa6ba959682 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/flag.dmi b/icons/obj/flag.dmi index 7959f04bc34..da56113b9f6 100644 Binary files a/icons/obj/flag.dmi and b/icons/obj/flag.dmi differ