Skip to content

Commit

Permalink
Adds Mardinat-Yunan specific items (#5010)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bamhalazam authored Feb 4, 2024
1 parent 314813d commit 27a5cae
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 2 deletions.
19 changes: 18 additions & 1 deletion code/game/objects/items/weapons/storage/deferred.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion code/modules/clothing/accessories/accessory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file modified icons/inventory/accessory/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/accessory/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/head/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/head/mob.dmi
Binary file not shown.
Binary file modified icons/obj/storage/deferred.dmi
Binary file not shown.

0 comments on commit 27a5cae

Please sign in to comment.