-
-
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
Фикс блюспейс рюкзака и пересмотренное возвращение механики неисправности интерфейса #13724
base: master
Are you sure you want to change the base?
Changes from 10 commits
6e7a810
afda9a8
ad941bc
7b044b5
52d1fd9
f0e0b0f
c8c09d5
851a1e6
b3a5bca
e573fb6
31ad7ec
66493c6
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 |
---|---|---|
|
@@ -54,13 +54,32 @@ | |
to_chat(user, "<span class='red'>The Bluespace generator isn't working.</span>") | ||
return | ||
|
||
if(istype(I, /obj/item/weapon/storage/backpack/holding) && !I.crit_fail) | ||
if(istype(I, /obj/item/weapon/storage/backpack/holding) && !I.crit_fail && !(I == src)) | ||
to_chat(user, "<span class='red'>The Bluespace interfaces of the two devices conflict and malfunction.</span>") | ||
qdel(I) | ||
return | ||
Make_Anomaly(150 SECONDS, /obj/effect/anomaly/bhole) | ||
|
||
return ..() | ||
|
||
/obj/item/weapon/storage/backpack/holding/handle_item_insertion(obj/item/W, prevent_warning = FALSE, NoUpdate = FALSE) | ||
. = ..() | ||
if(W == src) | ||
Destroy(W) // in my opinion, it is most effective to remove an object with a total cut of its action menu, because in addition to this action, qdel occurs | ||
to_chat(usr, "<span class='red'>Рюкзак засасывается сам в себя и исчезает.</span>") | ||
return FALSE | ||
if(istype(W, /obj/item/weapon/storage/backpack/holding)) | ||
to_chat(usr, "<span class='red'>The Bluespace interfaces of the two devices conflict and malfunction.</span>") | ||
Make_Anomaly(150 SECONDS, /obj/effect/anomaly/bhole) | ||
return FALSE | ||
return TRUE | ||
|
||
/obj/item/weapon/storage/backpack/holding/proc/Make_Anomaly(delay_time, current_anomaly) | ||
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. Функцию бы вызывать асинхронно, так как есть слип. А я не очень хочу, чтобы attackby и handle_item_insertion останавливались 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. лучше сам слип заменить на 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. А еще, грав аномалия как-то скучно, надо бы че-то пожосче |
||
var/turf/targloc = get_turf(src) | ||
var/obj/effect/anomaly/anomaly = new current_anomaly(targloc) | ||
anomaly.anomalyEffect() | ||
sleep(delay_time) | ||
qdel(current_anomaly) | ||
|
||
/obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user) | ||
if (prob(src.reliability)) | ||
return 1 //No failure | ||
|
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.
у тебя довольно странный нейминг функций (да и переменных, но бог с ними). Пиши лучше так, как написано в коде рядом, а рядом снейк кейс, соблюдай похожесть кода.