-
-
Notifications
You must be signed in to change notification settings - Fork 424
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
Синди мыло стирает фибры и отпечатки с объекта #13711
Changes from all commits
4265ca3
59f3ef5
a3838c1
f1ee209
80ae3b6
1d6188e
98270f2
c0ae3e8
efffba9
5151846
a8f3120
ea43475
c28d750
d49da34
3de8ba3
4c44a5f
3a638fc
072be17
7451840
736e622
51e9532
8fedeae
012e423
8ad704e
39d85cf
60d5093
43695fd
999d0fd
e0b1f7f
b6776dc
ca538fa
56c205f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -92,6 +92,25 @@ | |
target.clean_blood() | ||
return | ||
|
||
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params) | ||
if(!proximity || ishuman(target)) return | ||
// I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. | ||
// So this is a workaround. This also makes more sense from an IC standpoint. ~Carn | ||
if(user.client && (target in user.client.screen)) | ||
to_chat(user, "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>") | ||
else if(istype(target,/obj/effect/decal/cleanable)) | ||
to_chat(user, "<span class='notice'>You scrub \the [target.name] out.</span>") | ||
qdel(target) | ||
Comment on lines
+101
to
+103
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. вообще лучше как-то использовать родительский вызов ..(), а не копипастить код и вообще я вижу этот кусок скопипасченный по коду, можно было бы добавить им всем какой-нибудь QUALITY_CLEANING и убрать копипасты |
||
else | ||
if(target.fingerprints) | ||
target.fingerprints = null | ||
if(target.suit_fibers) | ||
target.suit_fibers = null | ||
to_chat(user, "<span class='notice'>You FULLY clean \the [target.name].</span>") | ||
target.clean_blood() | ||
target.desc += "\nSomeone cleaned it up to a shine..." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. будет возможность настакать описания кликая несколько раз, возможно лучше использовать add_fibers для элементов мыла (оно для одежды изначально, но сойдет) |
||
return | ||
|
||
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone) | ||
if(user.a_intent == INTENT_HARM) | ||
..() | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
мой предыдущий комментарий по поводу screen всё еще актуален
и по поводу раннего return