From 5d461f4976f1778431182f106926cf4adc631bc5 Mon Sep 17 00:00:00 2001 From: sabiram Date: Thu, 20 Nov 2014 16:18:35 -0500 Subject: [PATCH] Custom item deleted and added to loadout pool --- code/modules/client/preferences_gear.dm | 6 +++++ code/modules/clothing/under/miscellaneous.dm | 9 ++++++++ code/modules/customitems/item_defines.dm | 22 +++++-------------- icons/mob/uniform.dmi | Bin 255670 -> 255670 bytes icons/obj/clothing/uniforms.dmi | Bin 57965 -> 58326 bytes 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 0cd4a4dd2d..0725afdc6f 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -310,6 +310,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 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index f28104b9be..3fb7a52d4d 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -392,6 +392,15 @@ 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" + /obj/item/clothing/under/captainformal name = "captain's formal uniform" desc = "A captain's formal-wear, for special occasions." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index caf4151b2b..3b779b1389 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1005,16 +1005,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 @@ -1458,7 +1448,7 @@ follow_dist = 2 var/near_dist = max(follow_dist - 3, 1) var/current_dist = get_dist(src, bff) - + if (movement_target != bff) if (current_dist > follow_dist && !istype(movement_target, /mob/living/simple_animal/mouse) && (bff in oview(src))) //stop existing movement @@ -1469,7 +1459,7 @@ stop_automated_movement = 1 movement_target = bff walk_to(src, movement_target, near_dist, 4) - + //already following and close enough, stop else if (current_dist <= near_dist) walk_to(src,0) @@ -1481,15 +1471,15 @@ /mob/living/simple_animal/cat/fluff/Life() ..() - if (stat || !bff) + if (stat || !bff) return if (get_dist(src, bff) <= 1) if (bff.stat >= DEAD || bff.health <= config.health_threshold_softcrit) - if (prob((bff.stat < DEAD)? 50 : 15)) + if (prob((bff.stat < DEAD)? 50 : 15)) audible_emote(pick("meows in distress.", "meows anxiously.")) else - if (prob(5)) - visible_emote(pick("nuzzles [bff].", + if (prob(5)) + visible_emote(pick("nuzzles [bff].", "brushes against [bff].", "rubs against [bff].", "purrs.")) diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index de2055aeaa1df62823a34e938691229ce0f9cb4a..ffc7169614d59f5ec77aa86c316954534e76aac0 100644 GIT binary patch delta 1362 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 kg%CoNBndzvgb*d^AIln>33