diff --git a/code/game/objects/items/weapons/storage/deferred.dm b/code/game/objects/items/weapons/storage/deferred.dm index 9c7e1098dc8..66a15a1961b 100644 --- a/code/game/objects/items/weapons/storage/deferred.dm +++ b/code/game/objects/items/weapons/storage/deferred.dm @@ -229,6 +229,23 @@ /obj/random/booze/low_chance = 10, /obj/item/reagent_containers/food/drinks/bottle/vodka = 3) +//SERBIAN-YUNANI UNIFORM CRATES + +/obj/item/storage/deferred/crate/uniform_mardinat + name = "worn uniform kit" + desc = "A moderately sized crate full of clothes. Hastily painted green stripes adorn the box." + icon_state = "mardcrate_deferred" + initial_contents = list( + /obj/item/clothing/under/serbiansuit/brown = 1, + /obj/item/clothing/head/soft/tan2soft = 1, + /obj/item/clothing/suit/armor/platecarrier = 1, + /obj/item/clothing/head/helmet/faceshield/altyn/mardinat_yunan = 1, + /obj/item/clothing/mask/balaclava/tactical = 1, + /obj/item/clothing/shoes/jackboots = 1, + /obj/item/clothing/gloves/fingerless = 1, + /obj/item/clothing/accessory/passcard/mardinat_yunan = 1, + /obj/item/clothing/accessory/flag/mardinat_yunan = 1) + /obj/item/storage/deferred/crate/uniform_green name = "green uniform kit" desc = "A moderately sized crate full of clothes." @@ -341,7 +358,7 @@ desc = "A small collection of autolathe disks" initial_contents = list(/obj/random/lathe_disk = 7) -obj/item/storage/deferred/gun_parts +/obj/item/storage/deferred/gun_parts name = "gun part box" desc = "Uppers, lowers, and everything in between" initial_contents = list(/obj/random/gun_parts = 7) diff --git a/code/modules/clothing/accessories/accessory.dm b/code/modules/clothing/accessories/accessory.dm index dc03ee8b7a2..834c67f5093 100644 --- a/code/modules/clothing/accessories/accessory.dm +++ b/code/modules/clothing/accessories/accessory.dm @@ -1089,6 +1089,12 @@ icon_state = "militarypilot" item_state = "militarypilot" +/obj/item/clothing/accessory/flag/mardinat_yunan + name = "Mardinat-Yunan flag" + desc = "A flag that can be draped over the shoulders of it's wearer. Yunan bleeds for it's children." + icon_state = "mardinat_yunan_flag" + item_state = "mardinat_yunan_flag" + /* Kneepads */ /obj/item/clothing/accessory/kneepads @@ -1523,7 +1529,7 @@ Anyone wearing it can open public church doors. You should do your best to keep /obj/item/clothing/accessory/passcard/mardinat_yunan name = "Mardinat Yanun passcard" desc = "A passcard issued to citizens of Mardinat Yunan, initially selected for habitation for its rich gasses and potential for being located on an upcoming trade lane. This gas giant had many of its economic dreams dashed, with the gaseous mixture of the atmosphere being poor for fuel production and the trade lane never materializing." - icon_state = "passcard_madinat_yunan" + icon_state = "passcard_mardinat_yunan" item_state = "badge" /obj/item/clothing/accessory/passcard/thalatta diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index d229ef044e4..bc49b0e0103 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -1612,6 +1612,10 @@ icon_state = "maska" armor_list = list(melee = 55, bullet = 55, energy = 0, bomb = 45, bio = 0, rad = 0) // best what you can get, unless you face lasers +/obj/item/clothing/head/helmet/faceshield/altyn/mardinat_yunan + desc = "\"Human rights are not only violated by terrorism, repression or assassination, but also by unfair economic structures that create huge inequalities.\" An Altyn-pattern helmet commonly found throughout the frontier. This example has been painted up in the national colours of Mardinat-Yunan and comes with a copy of the tenets of a galaxy's economic manifesto held against the helmet by a strap." + icon_state = "altyn_mardinat-yunan" + item_state = "altyn_mardinat-yunan" /obj/item/clothing/head/helmet/faceshield/altyn/maska/toggle_style() set name = "Adjust Style" diff --git a/icons/inventory/accessory/icon.dmi b/icons/inventory/accessory/icon.dmi index 9416a3aecfb..85662dfdd9a 100644 Binary files a/icons/inventory/accessory/icon.dmi and b/icons/inventory/accessory/icon.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index acfad7197a0..7ebbf3c3f19 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/head/icon.dmi b/icons/inventory/head/icon.dmi index 8ddcc03807b..fe5e1475f8d 100644 Binary files a/icons/inventory/head/icon.dmi and b/icons/inventory/head/icon.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 919f02c3a42..4b6d7d0392c 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/obj/storage/deferred.dmi b/icons/obj/storage/deferred.dmi index db6ad54dfe5..a011b1e1d11 100644 Binary files a/icons/obj/storage/deferred.dmi and b/icons/obj/storage/deferred.dmi differ