diff --git a/code/game/objects/items/stacks/flags.dm b/code/game/objects/items/stacks/flags.dm index 14833812b06c..4dc2e6dbebf3 100644 --- a/code/game/objects/items/stacks/flags.dm +++ b/code/game/objects/items/stacks/flags.dm @@ -281,3 +281,23 @@ desc = "The flag of the United Americas. Semper fi." icon_state = "flag_ua_planted" flag_type = /obj/item/flag/plantable/ua + +// UNION OF PROGRESSIVE PEOPLES FLAG // +////////////////////////// + +/obj/item/flag/plantable/upp + name = "\improper Union of Progressive Peoples flag" + desc = "The flag of the Union of Progressive Peoples. This one looks ready to be planted into the ground." + icon = 'icons/obj/structures/plantable_flag.dmi' + icon_state = "flag_upp" + flag_type = /obj/structure/flag/plantable/upp + faction = FACTION_UPP + play_warcry = TRUE + warcry_sound = 'sound/effects/flag_upp_warcry.ogg' + warcry_extra_sound = 'sound/effects/flag_upp_warcry_extra.ogg' + +/obj/structure/flag/plantable/upp + name = "\improper Union of Progressive Peoples flag" + desc = "The flag of the Union of Progressive Peoples. Unity through Strength, Freedom through Unity." + icon_state = "flag_upp_planted" + flag_type = /obj/item/flag/plantable/upp diff --git a/icons/mob/humans/onmob/items_lefthand_64.dmi b/icons/mob/humans/onmob/items_lefthand_64.dmi index d005d8c5f049..e086e4a7ffe0 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_64.dmi and b/icons/mob/humans/onmob/items_lefthand_64.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_64.dmi b/icons/mob/humans/onmob/items_righthand_64.dmi index 72335e39bfff..00d1fae7531d 100644 Binary files a/icons/mob/humans/onmob/items_righthand_64.dmi and b/icons/mob/humans/onmob/items_righthand_64.dmi differ diff --git a/icons/obj/structures/plantable_flag.dmi b/icons/obj/structures/plantable_flag.dmi index c92311529be3..2485f29c3b1f 100644 Binary files a/icons/obj/structures/plantable_flag.dmi and b/icons/obj/structures/plantable_flag.dmi differ diff --git a/sound/effects/flag_upp_warcry.ogg b/sound/effects/flag_upp_warcry.ogg new file mode 100644 index 000000000000..589274ffb8e8 Binary files /dev/null and b/sound/effects/flag_upp_warcry.ogg differ diff --git a/sound/effects/flag_upp_warcry_extra.ogg b/sound/effects/flag_upp_warcry_extra.ogg new file mode 100644 index 000000000000..5ac6ff51e039 Binary files /dev/null and b/sound/effects/flag_upp_warcry_extra.ogg differ