cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-11-22 07:31:44 +10:30
parent ffc37dc151 843aa3c126
commit c8e8e663f9
68 changed files with 1641 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+9 -10
View File
@@ -1145,7 +1145,6 @@
item_color = "radi_pendant"
flags = FPRINT|TABLEPASS
w_class = 2.0
slot_flags = 0
//////////// Masks ////////////
@@ -1191,7 +1190,7 @@
slot_flags = 0
flags = FPRINT|TABLEPASS
w_class = 2
slot_flags = SLOT_MASK
slot_flags = SLOT_MASK | SLOT_TIE
////// Silver locket - Konaa Hirano - Konaa_Hirano
@@ -1205,7 +1204,7 @@
slot_flags = 0
flags = FPRINT|TABLEPASS
w_class = 2
slot_flags = SLOT_MASK
slot_flags = SLOT_MASK | SLOT_TIE
var/obj/item/held //Item inside locket.
/obj/item/clothing/tie/fluff/konaa_hirano/attack_self(mob/user as mob)
@@ -1235,7 +1234,7 @@
icon_state = "nasir_khayyam_1"
flags = FPRINT|TABLEPASS
w_class = 2
slot_flags = SLOT_MASK
slot_flags = SLOT_MASK | SLOT_TIE
////// Emerald necklace - Ty Foster - Nega
@@ -1463,7 +1462,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
@@ -1474,7 +1473,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)
@@ -1486,15 +1485,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."))