mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 22:19:30 +01:00
[MIRROR] Fixes AI shells being instantly converted with the Twisted Construction spell [MDB IGNORE] (#9976)
* Fixes AI shells being instantly converted with the Twisted Construction spell (#63231) * fixes that shit * should work Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com> * Fixes AI shells being instantly converted with the Twisted Construction spell Co-authored-by: Seth Scherer <supernovaa41@gmx.com> Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>
This commit is contained in:
co-authored by
SuperNovaa41
Seth Scherer
parent
51d5521046
commit
0ada097dc4
@@ -597,13 +597,14 @@
|
||||
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
|
||||
else if(istype(target,/mob/living/silicon/robot))
|
||||
var/mob/living/silicon/robot/candidate = target
|
||||
if(candidate.mmi)
|
||||
if(candidate.mmi || candidate.shell)
|
||||
channeling = TRUE
|
||||
user.visible_message(span_danger("A dark cloud emanates from [user]'s hand and swirls around [candidate]!"))
|
||||
playsound(T, 'sound/machines/airlock_alien_prying.ogg', 80, TRUE)
|
||||
var/prev_color = candidate.color
|
||||
candidate.color = "black"
|
||||
if(do_after(user, 90, target = candidate))
|
||||
candidate.undeploy()
|
||||
candidate.emp_act(EMP_HEAVY)
|
||||
var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
|
||||
if(!check_menu(user))
|
||||
@@ -624,7 +625,6 @@
|
||||
return
|
||||
else
|
||||
uses--
|
||||
candidate.undeploy()
|
||||
to_chat(user, span_warning("A dark cloud emanates from you hand and swirls around [candidate] - twisting it into a construct shell!"))
|
||||
new /obj/structure/constructshell(T)
|
||||
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
|
||||
|
||||
Reference in New Issue
Block a user