Merge pull request #7089 from sabiram/dev

Moves my (sabirm)'s custom item to common loadout pool
This commit is contained in:
PsiOmegaDelta
2014-11-23 18:08:16 +01:00
6 changed files with 15 additions and 11 deletions

View File

@@ -3,4 +3,4 @@
MAP_ICON_TYPE: 0
AUTO_FILE_DIR: OFF
*/
// END_INTERNALS
// END_INTERNALS

View File

@@ -318,6 +318,12 @@ var/global/list/gear_datums = list()
slot = slot_w_uniform
cost = 3
/datum/gear/sundress_white
display_name = "sundress, white"
path = /obj/item/clothing/under/sundress_white
slot = slot_w_uniform
cost = 3
/datum/gear/cheongsam
display_name = "cheongsam, white"
path = /obj/item/clothing/under/cheongsam

View File

@@ -392,6 +392,14 @@
item_color = "sundress"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/sundress_white
name = "white sundress"
desc = "A white sundress decorated with purple lilies."
icon_state = "whitesundress"
item_state = "whitesundress"
item_color = "whitesundress"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/captainformal
name = "captain's formal uniform"
desc = "A captain's formal-wear, for special occasions."

View File

@@ -1010,16 +1010,6 @@
item_color = "harper_uniform"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
//////////////////// Layla's Dress - Layla Davies-Halabi - sabirm ///////////////
/obj/item/clothing/under/fluff/layla_davieshalabi
name = "White floral sundress"
desc = "A loose, white sundress decorated with purple lilies. It looks well looked-after."
icon = 'icons/obj/custom_items.dmi'
icon_state = "layladress"
item_state = "layladress"
item_color = "layladress"
//////////////////// Corporate Cap - Robert Mason - Masterrbc ////////////////////
/obj/item/clothing/head/soft/sec/corp/fluff/robert_mason

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 KiB

After

Width:  |  Height:  |  Size: 250 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB