mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Custom item deleted and added to loadout pool
This commit is contained in:
@@ -310,6 +310,12 @@ var/global/list/gear_datums = list()
|
|||||||
slot = slot_w_uniform
|
slot = slot_w_uniform
|
||||||
cost = 3
|
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
|
/datum/gear/cheongsam
|
||||||
display_name = "cheongsam, white"
|
display_name = "cheongsam, white"
|
||||||
path = /obj/item/clothing/under/cheongsam
|
path = /obj/item/clothing/under/cheongsam
|
||||||
|
|||||||
@@ -392,6 +392,15 @@
|
|||||||
item_color = "sundress"
|
item_color = "sundress"
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
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
|
/obj/item/clothing/under/captainformal
|
||||||
name = "captain's formal uniform"
|
name = "captain's formal uniform"
|
||||||
desc = "A captain's formal-wear, for special occasions."
|
desc = "A captain's formal-wear, for special occasions."
|
||||||
|
|||||||
@@ -1005,16 +1005,6 @@
|
|||||||
item_color = "harper_uniform"
|
item_color = "harper_uniform"
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
|
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 ////////////////////
|
//////////////////// Corporate Cap - Robert Mason - Masterrbc ////////////////////
|
||||||
|
|
||||||
/obj/item/clothing/head/soft/sec/corp/fluff/robert_mason
|
/obj/item/clothing/head/soft/sec/corp/fluff/robert_mason
|
||||||
@@ -1458,7 +1448,7 @@
|
|||||||
follow_dist = 2
|
follow_dist = 2
|
||||||
var/near_dist = max(follow_dist - 3, 1)
|
var/near_dist = max(follow_dist - 3, 1)
|
||||||
var/current_dist = get_dist(src, bff)
|
var/current_dist = get_dist(src, bff)
|
||||||
|
|
||||||
if (movement_target != bff)
|
if (movement_target != bff)
|
||||||
if (current_dist > follow_dist && !istype(movement_target, /mob/living/simple_animal/mouse) && (bff in oview(src)))
|
if (current_dist > follow_dist && !istype(movement_target, /mob/living/simple_animal/mouse) && (bff in oview(src)))
|
||||||
//stop existing movement
|
//stop existing movement
|
||||||
@@ -1469,7 +1459,7 @@
|
|||||||
stop_automated_movement = 1
|
stop_automated_movement = 1
|
||||||
movement_target = bff
|
movement_target = bff
|
||||||
walk_to(src, movement_target, near_dist, 4)
|
walk_to(src, movement_target, near_dist, 4)
|
||||||
|
|
||||||
//already following and close enough, stop
|
//already following and close enough, stop
|
||||||
else if (current_dist <= near_dist)
|
else if (current_dist <= near_dist)
|
||||||
walk_to(src,0)
|
walk_to(src,0)
|
||||||
@@ -1481,15 +1471,15 @@
|
|||||||
|
|
||||||
/mob/living/simple_animal/cat/fluff/Life()
|
/mob/living/simple_animal/cat/fluff/Life()
|
||||||
..()
|
..()
|
||||||
if (stat || !bff)
|
if (stat || !bff)
|
||||||
return
|
return
|
||||||
if (get_dist(src, bff) <= 1)
|
if (get_dist(src, bff) <= 1)
|
||||||
if (bff.stat >= DEAD || bff.health <= config.health_threshold_softcrit)
|
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."))
|
audible_emote(pick("meows in distress.", "meows anxiously."))
|
||||||
else
|
else
|
||||||
if (prob(5))
|
if (prob(5))
|
||||||
visible_emote(pick("nuzzles [bff].",
|
visible_emote(pick("nuzzles [bff].",
|
||||||
"brushes against [bff].",
|
"brushes against [bff].",
|
||||||
"rubs against [bff].",
|
"rubs against [bff].",
|
||||||
"purrs."))
|
"purrs."))
|
||||||
|
|||||||
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 |
Reference in New Issue
Block a user