Skip to content

Commit

Permalink
Stay Tuned
Browse files Browse the repository at this point in the history
  • Loading branch information
Daeberdir committed Dec 17, 2023
1 parent f232d1d commit 7a14e77
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 5 deletions.
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Используйте IntelliSense, чтобы узнать о возможных атрибутах.
// Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.
// Для получения дополнительной информации посетите: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "dm: build - ${command:CurrentDME}",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
}
]
}
2 changes: 1 addition & 1 deletion code/datums/status_effects/neutral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
if(target_gender == NEUTER || owner.gender == NEUTER || !ishuman(owner))
return
var/mob/living/carbon/human/human_owner = owner
if(target_gender != human_owner.gender && target_species == human_owner.dna.species.name)
if(target_gender != human_owner.gender && target_species == human_owner.dna.species.name && prob(5))
owner.emote("blush")
to_chat(owner, span_danger("You feel something burning in your chest..."))

Expand Down
16 changes: 12 additions & 4 deletions code/modules/mob/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,6 @@
DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(run_examinate), A))

/mob/proc/run_examinate(atom/target)
if(!has_vision(information_only = TRUE) && !isobserver(src))
to_chat(src, "<span class='notice'>Здесь что-то есть, но вы не видите — что именно.</span>")
return TRUE
var/examine_time = target.get_examine_time()
face_atom(target)
if(isliving(src) && examine_time)
Expand All @@ -328,12 +325,23 @@
var/mob/living/simple_animal/hostile/morph/target_morph = target
user_staring_effect.target_gender = target_morph.mimic_spell.selected_form.examine_gender
user_staring_effect.target_species = target_morph.mimic_spell.selected_form.examine_species
else
return FALSE

var/list/result = target.examine(src)
if(isobserver(src) || do_mob(src, target, examine_time, FALSE))
if(isobserver(src) || isnewplayer(src) || do_mob(src, target, examine_time, FALSE, list(CALLBACK(src, PROC_REF(can_examine))), TRUE))
to_chat(src, "<div class='examine'>[result.Join("\n")]</div>")


/mob/proc/can_examine()
if(QDELETED(src))
return TRUE
if(!has_vision(information_only = TRUE))
to_chat(src, span_notice("Здесь что-то есть, но вы не видите — что именно."))
return TRUE
return FALSE


/mob/proc/ret_grab(obj/effect/list_container/mobl/L as obj, flag)
if((!( istype(l_hand, /obj/item/grab) ) && !( istype(r_hand, /obj/item/grab) )))
if(!( L ))
Expand Down

0 comments on commit 7a14e77

Please sign in to comment.