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.

Sign up for GitHub

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

tweak: Rework suicide drill #6189

Merged
merged 11 commits into from
Dec 23, 2024
Merged

tweak: Rework suicide drill #6189

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1cb94e4
1 или 0. TRUE или FALSE
Rafnik02 Nov 17, 2024
c8a86af
done
Rafnik02 Nov 17, 2024
473a307
Update tools.dm
Rafnik02 Nov 17, 2024
46b5d7b
перевод
Rafnik02 Nov 19, 2024
9e21855
апдейт
Rafnik02 Dec 9, 2024
bf3492c
апдейт
Rafnik02 Dec 20, 2024
69b09f6
Merge branch 'master220' into hochy_codit
Rafnik02 Dec 20, 2024
ae9484c
wefgsfgdf
Rafnik02 Dec 21, 2024
a69d543
Update tools.dm
Rafnik02 Dec 21, 2024
06a7814
доработка
Antoonij Dec 21, 2024
bbba5ab
Merge branch 'master220' into hochy_codit
Antoonij Dec 21, 2024
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
28 changes: 24 additions & 4 deletions code/modules/surgery/tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@
name = "surgical drill"
desc = "You can drill using this item. You dig?"
Rafnik02 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/surgery.dmi'
ru_names = list(
NOMINATIVE = "хирургическая дрель",
GENITIVE = "хирургической дрели",
DATIVE = "хирургической дрели",
ACCUSATIVE = "хирургическую дрель",
INSTRUMENTAL = "хирургической дрелью",
PREPOSITIONAL = "хирургической дрели",
)
icon_state = "drill"
item_state = "drills"
hitsound = 'sound/weapons/drill.ogg'
Expand All @@ -95,10 +103,22 @@
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)

/obj/item/surgicaldrill/suicide_act(mob/user)
to_chat(viewers(user), pick(span_suicide("[user] is pressing [src] to [user.p_their()] temple and activating it! It looks like [user.p_theyre()] trying to commit suicide."),
span_suicide("[user] is pressing [src] to [user.p_their()] chest and activating it! It looks like [user.p_theyre()] trying to commit suicide.")))
return BRUTELOSS
/obj/item/surgicaldrill/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] наматыва[pluralize_ru(user.gender, "ет", "ют")] себя на [declent_ru(ACCUSATIVE)]! Похоже [genderize_ru(user.gender, "он", "она", "оно", "они")] соверша[pluralize_ru(user.gender, "ет","ют")] суицид!"))
Rafnik02 marked this conversation as resolved.
Show resolved Hide resolved
addtimer(CALLBACK(src, PROC_REF(second_act), user), 2.5 SECONDS)
user.SpinAnimation(3, 10)
user.Immobilize(5 SECONDS)
Rafnik02 marked this conversation as resolved.
Show resolved Hide resolved
playsound(user, 'sound/machines/juicer.ogg', 20, TRUE)
return OBLITERATION

/obj/item/surgicaldrill/proc/second_act(mob/user)
if(!user)
return

for(var/obj/item/W in user)
Rafnik02 marked this conversation as resolved.
Show resolved Hide resolved
user.drop_item_ground(W)

user.gib()

/obj/item/surgicaldrill/laser
name = "Advanced Laser Surgical Drill"
Expand Down
8 changes: 4 additions & 4 deletions paradise.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
#include "code\__DEFINES\blob.dm"
#include "code\__DEFINES\borer.dm"
#include "code\__DEFINES\bots.dm"
#include "code\__DEFINES\rituals.dm"
#include "code\__DEFINES\byond_tracy.dm"
#include "code\__DEFINES\callbacks.dm"
#include "code\__DEFINES\cargo_quests.dm"
Expand Down Expand Up @@ -115,6 +114,7 @@
#include "code\__DEFINES\RCD.dm"
#include "code\__DEFINES\reagents.dm"
#include "code\__DEFINES\request.dm"
#include "code\__DEFINES\rituals.dm"
#include "code\__DEFINES\role_preferences.dm"
#include "code\__DEFINES\rolebans.dm"
#include "code\__DEFINES\rust_g.dm"
Expand Down Expand Up @@ -368,7 +368,6 @@
#include "code\controllers\subsystem\tickets\mentor_tickets.dm"
#include "code\controllers\subsystem\tickets\tickets.dm"
#include "code\datums\action.dm"
#include "code\datums\rituals.dm"
#include "code\datums\ai_law_sets.dm"
#include "code\datums\ai_laws.dm"
#include "code\datums\armor.dm"
Expand Down Expand Up @@ -404,6 +403,7 @@
#include "code\datums\radio.dm"
#include "code\datums\recipe.dm"
#include "code\datums\revision.dm"
#include "code\datums\rituals.dm"
#include "code\datums\ruins.dm"
#include "code\datums\shuttles.dm"
#include "code\datums\snake_fashion.dm"
Expand Down Expand Up @@ -446,7 +446,6 @@
#include "code\datums\components\conveyor_movement.dm"
#include "code\datums\components\cross_shock.dm"
#include "code\datums\components\decal.dm"
#include "code\datums\components\ritual_object.dm"
#include "code\datums\components\defibrillator.dm"
#include "code\datums\components\drift.dm"
#include "code\datums\components\ducttape.dm"
Expand All @@ -465,6 +464,7 @@
#include "code\datums\components\persistent_overlay.dm"
#include "code\datums\components\proximity_monitor.dm"
#include "code\datums\components\radioactivity.dm"
#include "code\datums\components\ritual_object.dm"
#include "code\datums\components\shielded.dm"
#include "code\datums\components\slippery.dm"
#include "code\datums\components\spawner.dm"
Expand Down Expand Up @@ -3140,7 +3140,6 @@
#include "code\modules\tgui\plugins\modal.dm"
#include "code\modules\tgui\states\admin.dm"
#include "code\modules\tgui\states\always.dm"
#include "code\modules\tgui\states\range.dm"
#include "code\modules\tgui\states\conscious.dm"
#include "code\modules\tgui\states\contained.dm"
#include "code\modules\tgui\states\deep_inventory.dm"
Expand All @@ -3152,6 +3151,7 @@
#include "code\modules\tgui\states\notcontained.dm"
#include "code\modules\tgui\states\observer.dm"
#include "code\modules\tgui\states\physical.dm"
#include "code\modules\tgui\states\range.dm"
#include "code\modules\tgui\states\self.dm"
#include "code\modules\tgui\states\strippable_state.dm"
#include "code\modules\tgui\states\zlevel.dm"
Expand Down