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 de2055aeaa..ffc7169614 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 0d01201a64..43f9eb909b 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ