Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dictor31 committed Jan 11, 2025
1 parent db4bbd6 commit 7ac8293
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 1 addition & 9 deletions code/game/objects/items/robot/robot_parts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -300,17 +300,13 @@
return .

var/datum/ai_laws/laws_to_give
var/message_override
if(!aisync)
lawsync = FALSE

if(sabotaged)
aisync = FALSE
lawsync = FALSE

if(new_mmi.syndiemmi)
message_override = span_userdanger("Вы помните вашу прошлую жизнь. Вы не обязаны подчиняться законам или ИИ.")

if(new_mmi.syndicate) // ffs
aisync = FALSE
lawsync = FALSE
Expand Down Expand Up @@ -356,11 +352,7 @@

SSticker?.score?.save_silicon_laws(new_borg, user, "robot construction", log_all_laws = TRUE)

if(message_override)
to_chat(new_borg, message_override)
new_borg.playsound_local(null, 'sound/ambience/antag/emaggedborg.ogg', 100, 0)

else if (new_borg.mind?.special_role)
if (!new_borg.mmi.greet() && new_borg.mind?.special_role)
new_borg.mind.store_memory("As a cyborg, you must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.")
to_chat(new_borg, span_userdanger("You have been robotized!"))
to_chat(new_borg, span_danger("You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead."))
Expand Down
8 changes: 8 additions & 0 deletions code/modules/mob/living/carbon/brain/MMI.dm
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,9 @@
/obj/item/mmi/proc/apply_effects(mob/living/silicon/robot)
return

/obj/item/mmi/proc/greet()
return FALSE

/obj/item/mmi/emp_act(severity)
if(!brainmob)
return
Expand Down Expand Up @@ -263,6 +266,11 @@
if(!overdrive.used)
overdrive.Grant(borg)

/obj/item/mmi/syndie/greet(mob/living/silicon/robot/borg)
to_chat(borg, "Вы помните вашу прошлую жизнь. Вы не обязаны подчиняться законам или ИИ.")
borg.playsound_local(null, 'sound/ambience/antag/emaggedborg.ogg', 100, 0)
return TRUE

/obj/item/mmi/syndie/Destroy()
QDEL_NULL(overdrive)
return ..()
Expand Down

0 comments on commit 7ac8293

Please sign in to comment.