mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 11:38:12 +01:00
Merge pull request #884 from VOREStation/fluffbox
Workaround for custom_item proc
This commit is contained in:
@@ -149,6 +149,15 @@
|
||||
can_hold = list(/obj/item/clothing/under/swimsuit/)
|
||||
has_items = list(/obj/item/clothing/under/swimsuit/fluff/penelope)
|
||||
|
||||
//Arokha:Aronai Kadigan
|
||||
/obj/item/weapon/storage/box/fluff/aronai
|
||||
name = "Aronai's Kit"
|
||||
desc = "A kit containing Aronai's equipment."
|
||||
has_items = list(
|
||||
/obj/item/weapon/storage/backpack/fluff/aronai,
|
||||
/obj/item/weapon/rig/light/hacker/fluff/aronai,
|
||||
/obj/item/clothing/under/rank/khi/fluff/aronai)
|
||||
|
||||
/*
|
||||
Swimsuits, for general use, to avoid arriving to work with your swimsuit.
|
||||
*/
|
||||
|
||||
@@ -853,7 +853,7 @@
|
||||
worn_state = "khi_uniform_sci"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 0, rad = 5)
|
||||
|
||||
fluff/aro //Aro fluff version
|
||||
fluff/aronai //Aro fluff version
|
||||
name = "KIN meditech suit"
|
||||
desc = "Kitsuhana Industrial Navy uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top."
|
||||
icon_state = "khi_uniform_aro_i"
|
||||
|
||||
@@ -57,13 +57,7 @@ item_path: /obj/item/clothing/head/helmet/hos/fluff/lethe
|
||||
{
|
||||
ckey: arokha
|
||||
character_name: Aronai Kadigan
|
||||
item_path: /obj/item/weapon/storage/backpack/fluff/aronai
|
||||
}
|
||||
|
||||
{
|
||||
ckey: arokha
|
||||
character_name: Aronai Kadigan
|
||||
item_path: /obj/item/clothing/under/rank/khi/fluff/aro
|
||||
item_path: /obj/item/weapon/storage/box/fluff/aronai
|
||||
}
|
||||
|
||||
# ######## B CKEYS
|
||||
|
||||
Reference in New Issue
Block a user