Skip to content

Commit

Permalink
Правки
Browse files Browse the repository at this point in the history
  • Loading branch information
dj-34 committed Apr 13, 2024
1 parent ab24d71 commit 9a2060e
Show file tree
Hide file tree
Showing 17 changed files with 70 additions and 28 deletions.
5 changes: 3 additions & 2 deletions modular_ss220/agent_id_tgui/code/agent_id_tgui.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,9 @@
return

/obj/item/card/id/proc/flash_card(mob/user)
user.visible_message("[user] shows you: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]",\
"You flash your ID card: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]")
user.visible_message(
span_notice("[user] shows you: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]."),
span_notice("You flash your ID card: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]."))
if(mining_points)
to_chat(user, "There's <b>[mining_points] Mining Points</b> loaded onto this card. This card has earned <b>[total_mining_points] Mining Points</b> this Shift!")
src.add_fingerprint(user)
Expand Down
4 changes: 3 additions & 1 deletion modular_ss220/awaymission_gun/code/items/awaymission_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@
return FALSE

if(user.nutrition <= NUTRITION_LEVEL_STARVING)
user.visible_message(span_warning("[user.name] слабо давит на [src], но бесполезно: слишком мало сил!"), span_notice("Вы пытаетесь надавить на рычаг зарядки [src], но не можете из-за голода и усталости!"))
user.visible_message(
span_warning("[user.name] слабо давит на [src], но бесполезно: слишком мало сил!"),
span_notice("Вы пытаетесь надавить на рычаг зарядки [src], но не можете из-за голода и усталости!"))
return FALSE

user.visible_message(msg_recharge_all, msg_recharge_user)
Expand Down
6 changes: 4 additions & 2 deletions modular_ss220/balance/code/mobs/aliens/larva.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
if(locked || welded) //Can't pass through airlocks that have been bolted down or welded
to_chat(user, span_warning("[src] герметично закрыт. Вы не можете протиснуться!"))
return
user.visible_message(span_warning("[user] протискивается через [src]!"), \
span_warning("Вы протискиваетесь через [src]."), null)
user.visible_message(
span_warning("[user] протискивается через [src]!"),
span_warning("Вы протискиваетесь через [src]."),
null)
user.forceMove(get_turf(src))
2 changes: 1 addition & 1 deletion modular_ss220/detective_rework/code/sample_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
if(!do_after(user, 2 SECONDS, target = user))
return FALSE

user.visible_message("[user] делает копию отмечатков [H].")
user.visible_message(span_notice("[user] делает копию отмечатков [H]."))
var/fullprint = H.get_full_print()
evidence[fullprint] = fullprint
copy_evidence(src)
Expand Down
8 changes: 5 additions & 3 deletions modular_ss220/detective_rework/code/swabs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
to_chat(user, span_warning("У него нет рта."))
inuse = FALSE
return
user.visible_message("[user] берёт мазок изо рта [H] для анализа.")
user.visible_message(span_notice("[user] берёт мазок изо рта [H] для анализа."))
target_dna = list(H.dna.unique_enzymes)
sample_type = "DNA"

Expand All @@ -75,7 +75,7 @@
to_chat(user, span_warning("Он безрукий."))
inuse = FALSE
return
user.visible_message("[user] берёт мазок с ладони [H] для анализа.")
user.visible_message(span_notice("[user] берёт мазок с ладони [H] для анализа."))
sample_type = "GSR"
target_gsr = H.gunshot_residue
else
Expand Down Expand Up @@ -153,7 +153,9 @@
sample_type = "порох"

if(sample_type)
user.visible_message("[user] берёт мазок с [A] для анализа.", "Вы берёте мазок с [A] для анализа.")
user.visible_message(
span_notice("[user] берёт мазок с [A] для анализа."),
span_notice("Вы берёте мазок с [A] для анализа."))
if(!dispenser)
dna = target_dna
gsr = target_gsr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,9 @@
var/datum/effect_system/spark_spread/s = new
s.set_up(5, 1, unlucky_mob.loc)
s.start()
unlucky_mob.visible_message(span_danger("[unlucky_mob.name] is shocked by [src]!"), \
span_userdanger("You feel a powerful shock course through your body!"))
unlucky_mob.visible_message(
span_danger("[unlucky_mob.name] is shocked by [src]!"),
span_userdanger("You feel a powerful shock course through your body!"))
playsound(unlucky_mob, 'sound/effects/sparks4.ogg', 100, TRUE)

/turf/simulated/floor/beach/away/blackmesa/remove_plating(mob/user)
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/maps220/code/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@

else
undead.set_species(/datum/species/skeleton) // OP skellybones
undead.visible_message(span_warning ("[undead] отторгает бренную оболочку и предстает в виде скелета!"))
undead.visible_message(span_warning("[undead] отторгает бренную оболочку и предстает в виде скелета!"))
undead.grab_ghost() // yoinks the ghost if its not in the body
undead.revive()
equip_undead(undead)
Expand Down
4 changes: 3 additions & 1 deletion modular_ss220/mecha_skins/code/paintkit_install.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
to_chat(user, span_warning("Этот комплект не предназначен для использования на экзокостюме данного класса."))
return

user.visible_message(span_notice("[user] открывает [P] и проводит некоторое время за кастомизацией [src]."), span_notice("Вы открываете [P] и начинаете кастомизировать [src]."))
user.visible_message(
span_notice("[user] открывает [P] и проводит некоторое время за кастомизацией [src]."),
span_notice("Вы открываете [P] и начинаете кастомизировать [src]."))
if(!do_after_once(user, 3 SECONDS, target = src))
to_chat(user, span_warning("Вы должны стоять смирно при настройке экзокостюма!"))
return
Expand Down
6 changes: 4 additions & 2 deletions modular_ss220/mobs/code/mob_holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

if(user.a_intent != INTENT_HARM)
return ..()

if(!is_type_in_list(animal, devourer.dna.species.allowed_consumed_mobs))
if(user != devourer)
to_chat(user, span_notice("Вряд ли это понравится [devourer]..."))
Expand Down Expand Up @@ -48,7 +48,9 @@
devourer.reagents.add_reagent(bee.beegent.id, rand(1, 5))
else
devourer.reagents.add_reagent("spidertoxin", 5)
devourer.visible_message(span_warning("Рот [devourer] опух."), span_danger("Ваш рот ужален, он теперь опухает!"))
devourer.visible_message(
span_warning("Рот [devourer] опух."),
span_danger("Ваш рот ужален, он теперь опухает!"))

animal.forceMove(devourer)
LAZYADD(devourer.stomach_contents, animal)
Expand Down
4 changes: 3 additions & 1 deletion modular_ss220/mobs/code/pet_carrier.dm
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,9 @@
return // Something happened while the player was thinking

usr.face_atom(over_object)
usr.visible_message(span_notice("[usr] вытащил питомца из [src.name] на [over_object.name]."), span_notice("Вы вытащили питомца из [src.name] на [over_object.name]."))
usr.visible_message(
span_notice("[usr] вытащил питомца из [src.name] на [over_object.name]."),
span_notice("Вы вытащили питомца из [src.name] на [over_object.name]."))

try_free_content(T, usr)
return TRUE
Expand Down
9 changes: 7 additions & 2 deletions modular_ss220/mobs/code/simple_animal/pets/rouge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@
to_chat(user, span_warning("You can't put more than one hat on [src]!"))
return
if(!item_to_add)
user.visible_message(span_notice("[user] pets [src]."), span_notice("You rest your hand on [src]'s head for a moment."))
user.visible_message(
span_notice("[user] pets [src]."),
span_notice("You rest your hand on [src]'s head for a moment."))
if(flags_2 & HOLOGRAM_2)
return
return
Expand All @@ -148,7 +150,10 @@
if(health <= 0)
to_chat(user, span_notice("Безжизненный взгляд в глазах [real_name] никак не меняется, когда вы надеваете [item_to_add] на неё."))
else if(user)
user.visible_message(span_notice("[user] надевает [item_to_add] на центральную голову [real_name]. [src] смотрит на [user] и довольно шипит."), span_notice("Вы надеваете [item_to_add] на голову [real_name]. [src] озадачено смотрит на вас, пока другие головы смотрят на центральную с завистью."), span_italics("Вы слышите дружелюбное шипение."))
user.visible_message(
span_notice("[user] надевает [item_to_add] на центральную голову [real_name]. [src] смотрит на [user] и довольно шипит."),
span_notice("Вы надеваете [item_to_add] на голову [real_name]. [src] озадачено смотрит на вас, пока другие головы смотрят на центральную с завистью."),
span_italics("Вы слышите дружелюбное шипение."))
item_to_add.forceMove(src)
inventory_head = item_to_add
update_snek_fluff()
Expand Down
9 changes: 7 additions & 2 deletions modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
to_chat(user, span_warning("You can't put more than one hat on [src]!"))
return
if(!item_to_add)
user.visible_message(span_notice("[user] pets [src]."), span_notice("You rest your hand on [src]'s head for a moment."))
user.visible_message(
span_notice("[user] pets [src]."),
span_notice("You rest your hand on [src]'s head for a moment."))
if(flags_2 & HOLOGRAM_2)
return
return
Expand All @@ -119,7 +121,10 @@
if(health <= 0)
to_chat(user, span_notice("There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on [p_them()]."))
else if(user)
user.visible_message(span_notice("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once."), span_notice("You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks."), span_italics("You hear a friendly-sounding bark."))
user.visible_message(
span_notice("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once."),
span_notice("You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks."),
span_italics("You hear a friendly-sounding bark."))
item_to_add.forceMove(src)
inventory_head = item_to_add
update_muhtar_fluff()
Expand Down
18 changes: 14 additions & 4 deletions modular_ss220/mobs/code/simple_animal/pets/slugcat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@

/mob/living/simple_animal/pet/slugcat/proc/place_on_head(obj/item/item_to_add, mob/user)
if(!item_to_add)
user.visible_message(span_notice("[user] похлопывает по голове [src.name]."), span_notice("Вы положили руку на голову [src.name]."))
user.visible_message(
span_notice("[user] похлопывает по голове [src.name]."),
span_notice("Вы положили руку на голову [src.name]."))
if(flags_2 & HOLOGRAM_2)
return 0
return 0
Expand All @@ -189,7 +191,10 @@
to_chat(user, span_warning("[item_to_add.name] застрял в ваших руках, вы не можете его надеть на голову [src.name]!"))
return 0

user.visible_message(span_notice("[user] надевает [item_to_add].name на голову [real_name]."), span_notice("Вы надеваете [item_to_add.name] на голову [real_name]."), span_italics("Вы слышите как что-то нацепили."))
user.visible_message(
span_notice("[user] надевает [item_to_add].name на голову [real_name]."),
span_notice("Вы надеваете [item_to_add.name] на голову [real_name]."),
span_italics("Вы слышите как что-то нацепили."))
inventory_head = item_to_add
regenerate_icons()

Expand Down Expand Up @@ -228,7 +233,9 @@

/mob/living/simple_animal/pet/slugcat/proc/place_to_hand(obj/item/item_to_add, mob/user)
if(!item_to_add)
user.visible_message(span_notice("[user] пощупал лапки [src]."), span_notice("Вы пощупали лапки [src]."))
user.visible_message(
span_notice("[user] пощупал лапки [src]."),
span_notice("Вы пощупали лапки [src]."))
if(flags_2 & HOLOGRAM_2)
return 0
return 0
Expand All @@ -254,7 +261,10 @@
to_chat(user, span_warning("[src.name] пацифист и не пользуется [item_to_add.name]!"))
return 0

user.visible_message(span_notice("[real_name] выхватывает [item_to_add] с рук [user]."), span_notice("[real_name] выхватывает [item_to_add] с ваших рук."), span_italics("Вы видите довольные глаза."))
user.visible_message(
span_notice("[real_name] выхватывает [item_to_add] с рук [user]."),
span_notice("[real_name] выхватывает [item_to_add] с ваших рук."),
span_italics("Вы видите довольные глаза."))
move_item_to_hand(item_to_add)

return 1
Expand Down
4 changes: 3 additions & 1 deletion modular_ss220/objects/code/hampters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@
// Прописываю это здесь ибо иначе хомяки будут отмечаться кровавыми в игре
blood_DNA = "Plush hampter's paint"

user.visible_message(span_warning("[user] раздавил хамптера в своей руке!"), span_warning("Вы раздавили хамптера в своей руке!"))
user.visible_message(
span_warning("[user] раздавил хамптера в своей руке!"),
span_warning("Вы раздавили хамптера в своей руке!"))
playsound(get_turf(src), "bonebreak", 50, TRUE, -10)

user.hand_blood_color = blood_color
Expand Down
4 changes: 3 additions & 1 deletion modular_ss220/objects/code/papershredder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@
return
if(shredp.get_heat())
add_fingerprint(user)
user.visible_message(span_danger("\The [user] burns right through [src], turning it to ash. It flutters through the air before settling on the floor in a heap."), span_danger("You burn right through [src], turning it to ash. It flutters through the air before settling on the floor in a heap."))
user.visible_message(
span_danger("\The [user] burns right through [src], turning it to ash. It flutters through the air before settling on the floor in a heap."),
span_danger("You burn right through [src], turning it to ash. It flutters through the air before settling on the floor in a heap."))
fire_act()
else
..()
Expand Down
4 changes: 3 additions & 1 deletion modular_ss220/windows_airbag/code/windows_airbag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@
INVOKE_ASYNC(src, PROC_REF(disarm_airbag), clicked_atom, clicker)

/datum/element/airbag/proc/disarm_airbag(atom/movable/clicked_atom, mob/living/clicker)
clicker.visible_message(span_notice("[clicker] starts disarming the airbag..."), span_notice("You start disarming the airbag..."))
clicker.visible_message(
span_notice("[clicker] starts disarming the airbag..."),
span_notice("You start disarming the airbag..."))
clicked_atom.add_fingerprint(clicker)
if(do_after_once(clicker, DISARM_TIME, target = clicked_atom, progress = TRUE))
new disarmed_type(get_turf(clicked_atom))
Expand Down
4 changes: 3 additions & 1 deletion modular_ss220/wire_splicing/code/wiresplicing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@
return
if(shock(user, 50))
return
user.visible_message(span_notice("[user] cuts the splicing."), span_notice("You cut the splicing."))
user.visible_message(
span_notice("[user] cuts the splicing."),
span_notice("You cut the splicing."))
investigate_log("was cut by [key_name(usr)] in [AREACOORD(src)]", "wires")
qdel(src)

Expand Down

0 comments on commit 9a2060e

Please sign in to comment.