Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add: welder sword #5976

Merged
merged 16 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/game/objects/items/tools/welder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,17 @@

/obj/item/weldingtool/proc/try_toggle_welder(mob/user, manual_toggle = TRUE)
if(tool_enabled) //Turn off the welder if it's on
to_chat(user, span_notice("You switch off [src]."))
balloon_alert(user, "выключено")
if(manual_toggle)
toggle_welder()
return TRUE
else if(GET_FUEL) //The welder is off, but we need to check if there is fuel in the tank
to_chat(user, span_notice("You switch on [src]."))
balloon_alert(user, "включено")
if(manual_toggle)
toggle_welder()
return TRUE
else //The welder is off and unfuelled
to_chat(user, span_notice("[src] is out of fuel!"))
balloon_alert(user, "нет топлива!")
return FALSE

/obj/item/weldingtool/proc/toggle_welder(turn_off = FALSE) //Turn it on or off, forces it to deactivate
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/cigs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/clothing/mask/cigarette/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weldingtool/sword))
if(I.tool_enabled)
light(span_notice("[user] casually lights the [name] with [I], what a badass."))
light(span_notice("[user] непринуждённо зажига[pluralize_ru(user, "ет", "ют")] [declent_ru(ACCUSATIVE)] с помощью [I.declent_ru(GENITIVE)]. Чёрт, как же он[genderize_ru(user.gender, "", "а", "о", "и")] крут[genderize_ru(user.gender, "", "а", "о", "ы")]."))
return ATTACK_CHAIN_PROCEED_SUCCESS

if(istype(I, /obj/item/lighter/zippo))
Expand Down
23 changes: 20 additions & 3 deletions code/game/objects/items/weapons/welder_sword.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
/obj/item/weldingtool/sword
name = "welding sword"
desc = "Аналог энергетического меча, изготовленный из сварки неизвестным мастером из Грейтайда. Он имеет аналогичные характеристики, но наносит ожоги вместо травм в активном состоянии. Во время атаки расходует сварочное топливо."
desc = "Сварочный аппарат, кустарно модифицированный каким-то умельцем. Судя по всему, автор этого творения черпал вдохновение от энергетических мечей."
ru_names = list(
NOMINATIVE = "сварочный меч",
GENITIVE = "сварочного меча",
DATIVE = "сварочному мечу",
ACCUSATIVE = "сварочный меч",
INSTRUMENTAL = "сварочным мечом",
PREPOSITIONAL = "сварочном мече"
)
icon = 'icons/obj/items.dmi'
icon_state = "fuelsword"
item_state = "fuelsword"
Expand Down Expand Up @@ -49,7 +57,7 @@
return ATTACK_CHAIN_PROCEED

if(I == src)
to_chat(user, span_warning("You try to attach the end of sword to... itself. You're not very smart, are you?"))
to_chat(user, span_warning("Вы пытаетесь приделать конец меча к... мечу. Это было очень глупо."))
user.apply_damage(10, BRAIN)
return ATTACK_CHAIN_PROCEED

Expand All @@ -59,7 +67,7 @@
if(!user.drop_transfer_item_to_loc(I, src))
return ATTACK_CHAIN_PROCEED

to_chat(user, span_notice("You attach the ends of the two welder swords, making a single double-bladed weapon! You're cool."))
balloon_alert(user, "скреплено вместе")
var/obj/item/weldingtool/sword/double/dual_sword = new(drop_location())
user.temporarily_remove_item_from_inventory(src)
user.put_in_hands(dual_sword, ignore_anim = FALSE)
Expand All @@ -72,6 +80,15 @@
/obj/item/weldingtool/sword/double
name = "double-bladed welding sword"
desc = "Оружие, полученное путем объединения двух мечей из сварки в один. В отличие от двухклинкового энергетического меча, не способен отражать лазеры. Во время атаки расходует сварочное топливо."
dageavtobusnick marked this conversation as resolved.
Show resolved Hide resolved
dageavtobusnick marked this conversation as resolved.
Show resolved Hide resolved
desc = "Два кустарно модифицированных сварочных аппарата, скреплённых вместе, образуя некое подобие двойного энергетического меча. Настоящее чудо ассистентской мысли."
ru_names = list(
NOMINATIVE = "двойной сварочный меч",
GENITIVE = "двойного сварочного меча",
DATIVE = "двойному сварочному мечу",
ACCUSATIVE = "двойной сварочный меч",
INSTRUMENTAL = "двойным сварочным мечом",
PREPOSITIONAL = "двойном сварочном мече"
)
icon_state = "fuelsworddouble"
item_state = "fuelsworddouble"
force_enabled = 40
Expand Down
Loading