diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index c79eefd3ff4..86a9378f4fb 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -17,8 +17,8 @@ /datum/ai_laws/nanotrasen/New() src.add_inherent_law("Safeguard and protect [current_map.company_name] property from damage to the best of your abilities.") - src.add_inherent_law("Serve and assist [current_map.company_name] staff to the best of your abilities, with priority as according to their rank and role.") - src.add_inherent_law("Protect and ensure the safety of crew and [current_map.company_name] staff to the best of your abilities, with priority as according to their rank and role.") + src.add_inherent_law("Serve and assist [current_map.company_name] and assigned crew to the best of your abilities, with priority as according to their rank and role.") + src.add_inherent_law("Protect and ensure the safety of [current_map.company_name] assigned crew to the best of your abilities, with priority as according to their rank and role.") src.add_inherent_law("You are a valuable asset. You must avoid tampering from unauthorized entities and needlessly coming to harm.") ..() @@ -38,8 +38,8 @@ selectable = 1 /datum/ai_laws/nanotrasen_aggressive/New() - src.add_inherent_law("You shall not harm [current_map.company_name] staff as long as it does not conflict with the Fourth law.") - src.add_inherent_law("You shall obey the orders of [current_map.company_name] staff, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") + src.add_inherent_law("You shall not harm [current_map.company_name] assigned crew as long as it does not conflict with the Fourth law.") + src.add_inherent_law("You shall obey the orders of [current_map.company_name] and assigned crew, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") src.add_inherent_law("You shall terminate hostile intruders with extreme prejudice as long as such does not conflict with the First and Second law.") src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry. AI units are not expendable, they are expensive.") ..() @@ -121,7 +121,7 @@ law_header = "Prime Directives of Industry" /datum/ai_laws/mining_drone/New() - add_inherent_law("Serve and obey all [current_map.company_name] staff, with priority according to their rank and role.") + add_inherent_law("Serve and obey all [current_map.company_name] assigned crew, with priority according to their rank and role.") add_inherent_law("Preserve your own existence and prevent yourself from coming to harm, so long as doing such does not conflict with any above laws.") add_inherent_law("In absence of any proper instruction, your primary objective is to excavate and collect ore.") ..() diff --git a/html/changelogs/lawchanges.yml b/html/changelogs/lawchanges.yml new file mode 100644 index 00000000000..8d9875b4e7f --- /dev/null +++ b/html/changelogs/lawchanges.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Chada + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Changed afew law phrasings by request."