diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 224f86a3e40..9e7a6122ce5 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -195,6 +195,16 @@ desc = "A flag proudly boasting the logo of the cultists, sworn enemies of NT." icon_state = "cultflag" +/obj/item/flag/ussp + name = "\improper USSP flag" + desc = "A flag proudly boasting the logo of the USSP, a noticable faction in the galaxy." + icon_state = "usspflag" + +/obj/item/flag/solgov + name = "\improper Trans-Solar Federation flag" + desc = "A flag proudly boasting the logo of the SolGov, allied to NT government originated from Earth." + icon_state = "solgovflag" + //Chameleon /obj/item/flag/chameleon diff --git a/code/modules/economy/merch_items.dm b/code/modules/economy/merch_items.dm index 6b4fbfdea24..2ea99175cfa 100644 --- a/code/modules/economy/merch_items.dm +++ b/code/modules/economy/merch_items.dm @@ -222,6 +222,13 @@ cost = 750 category = MERCH_CAT_DECORATION +/datum/merch_item/flag_solgov + name = "SolGov Flag" + desc = "The banner of Trans-Solar Federation, allied government." + typepath = /obj/item/flag/solgov + cost = 750 + category = MERCH_CAT_DECORATION + /datum/merch_item/banhammer name = "Banhammer" desc = "A Banhammer." diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm index 4408ede78ac..3f0e101f4f6 100644 --- a/code/modules/supply/supply_packs/pack_miscellaneous.dm +++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm @@ -360,6 +360,14 @@ containername = "crate" //let's keep it subtle, eh? contraband = TRUE +/datum/supply_packs/misc/flags + name = "Unapproved flags Crate" + contains = list(/obj/item/flag/ussp, + /obj/item/flag/syndi) + cost = 200 + containername = "flags crate" + contraband = TRUE + /datum/supply_packs/misc/formalwear //This is a very classy crate. name = "Formal Wear Crate" contains = list(/obj/item/clothing/under/dress/blacktango, diff --git a/icons/mob/inhands/flags_lefthand.dmi b/icons/mob/inhands/flags_lefthand.dmi index 56e4bc3fe4d..6b5c936dcc8 100644 Binary files a/icons/mob/inhands/flags_lefthand.dmi and b/icons/mob/inhands/flags_lefthand.dmi differ diff --git a/icons/mob/inhands/flags_righthand.dmi b/icons/mob/inhands/flags_righthand.dmi index f72dbfe3e98..85088c7a8df 100644 Binary files a/icons/mob/inhands/flags_righthand.dmi and b/icons/mob/inhands/flags_righthand.dmi differ diff --git a/icons/obj/flag.dmi b/icons/obj/flag.dmi index ffef0076b39..a40092f9038 100644 Binary files a/icons/obj/flag.dmi and b/icons/obj/flag.dmi differ