diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index a5f3b8d4a03..a71093f6b1f 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -37,6 +37,11 @@ desc = "A flag proudly boasting the logo of the Wizard Federation, sworn enemies of NT." icon_state = "wizflag" +/obj/item/flag/pony + name = "Equestria flag" + desc = "The flag of the independant, sovereign nation of Equestria, whatever the fuck that is." + icon_state = "ponyflag" + //Nations/Department flags /obj/item/flag/cargo name = "Cargonia flag" @@ -73,4 +78,9 @@ /obj/item/flag/skrell name = "Skrell flag" desc = "A flag proudly proclaiming the superior heritage of Skrell." - icon_state = "skrellflag" \ No newline at end of file + icon_state = "skrellflag" + +/obj/item/flag/vox + name = "Vox flag" + desc = "A flag proudly proclaiming the superior heritage of Vox." + icon_state = "voxflag" \ No newline at end of file diff --git a/icons/mob/in-hand/in-hand_sync_report.txt b/icons/mob/in-hand/in-hand_sync_report.txt index a96d69c1c42..3d53a633abf 100644 --- a/icons/mob/in-hand/in-hand_sync_report.txt +++ b/icons/mob/in-hand/in-hand_sync_report.txt @@ -16,12 +16,14 @@ + mimeflag + ninjaflag + ntflag + + ponyflag + rndflag + secflag + secflag_old + skrellflag + slimeflag + syndiflag + + voxflag + wizflag --- 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 diff --git a/icons/mob/in-hand/left/flags_left.dmi b/icons/mob/in-hand/left/flags_left.dmi index dc11106676b..d638a08d16a 100644 Binary files a/icons/mob/in-hand/left/flags_left.dmi and b/icons/mob/in-hand/left/flags_left.dmi differ diff --git a/icons/mob/in-hand/right/flags_right.dmi b/icons/mob/in-hand/right/flags_right.dmi index e511fff8e9a..70333ef63e8 100644 Binary files a/icons/mob/in-hand/right/flags_right.dmi 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 d12cbc03d24..9a43825bad2 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 4d895c69327..981b70dbba0 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 187969af426..2f54ee35f61 100644 Binary files a/icons/obj/flag.dmi and b/icons/obj/flag.dmi differ