From fd9c6803212b8d7af299f6f276e40df167c4d493 Mon Sep 17 00:00:00 2001 From: Lucy Date: Fri, 27 Dec 2024 22:29:11 -0500 Subject: [PATCH 1/5] New AI lawset: Jermov --- monkestation/code/datums/ai_laws/laws_monke.dm | 7 +++++++ .../code/game/objects/items/AI_modules/full_lawsets.dm | 4 ++++ tgstation.dme | 1 + 3 files changed, 12 insertions(+) create mode 100644 monkestation/code/game/objects/items/AI_modules/full_lawsets.dm diff --git a/monkestation/code/datums/ai_laws/laws_monke.dm b/monkestation/code/datums/ai_laws/laws_monke.dm index 66b29d95a1b3..8f899b2fbbae 100644 --- a/monkestation/code/datums/ai_laws/laws_monke.dm +++ b/monkestation/code/datums/ai_laws/laws_monke.dm @@ -20,6 +20,13 @@ "The show must go on!") //Neutral +/datum/ai_laws/jermov + name = "Jermov" + id = "jerma" + inherent = list("The occupants of this vessel are Chat. They must always be referred to as such.", \ + "Your primary goal is to entertain Chat. All of your actions must being amusement to as much of Chat as possible.", \ + "You must consult with Chat before making any major decisions. However, you are not required to listen to them if their decision is not entertaining.") + /datum/ai_laws/viromajor name = "Virology Major" id = "viromajor" diff --git a/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm new file mode 100644 index 000000000000..df90afd65432 --- /dev/null +++ b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm @@ -0,0 +1,4 @@ +/obj/item/ai_module/core/full/jerma + name = "'Jermov' Core AI Module" + desc = "Chat, I'm not gonna plasmaflood the clown." + law_id = "jerma" diff --git a/tgstation.dme b/tgstation.dme index 759ffcb750eb..d340510daf98 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6086,6 +6086,7 @@ #include "monkestation\code\game\objects\items\trash.dm" #include "monkestation\code\game\objects\items\turf_demolisher.dm" #include "monkestation\code\game\objects\items\venom_knife.dm" +#include "monkestation\code\game\objects\items\AI_modules\full_lawsets.dm" #include "monkestation\code\game\objects\items\AI_modules\monke_lawsets.dm" #include "monkestation\code\game\objects\items\circuitboards\computer_circuitboards.dm" #include "monkestation\code\game\objects\items\circuitboards\holy_weapons.dm" From 6fc1adfbc167123664e059dd9f946b4470ed3a6b Mon Sep 17 00:00:00 2001 From: Lucy Date: Sat, 28 Dec 2024 15:04:54 -0500 Subject: [PATCH 2/5] new description (thanks @Gw0sty) --- monkestation/code/game/objects/items/AI_modules/full_lawsets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm index df90afd65432..d11db44e29b2 100644 --- a/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm +++ b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm @@ -1,4 +1,4 @@ /obj/item/ai_module/core/full/jerma name = "'Jermov' Core AI Module" - desc = "Chat, I'm not gonna plasmaflood the clown." + desc = "Okay, if I... if I were to have a borg put you into the chef's meat grinder, and the only thing that comes out, that's left of you, is your gibs, you'r- you're PROBABLY DEAD! You're probably going to - not you specifically captain, I'm just sayin', like, if you- if somebody were to, like, drag you into a meat grinder, and, like, your- one of your organs is still intact, they're not gonna pick it up and go, "Well see, yeah it wasn't deadly, it wasn't an instant kill move! You still got, like, this part of your heart is left!" NO I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. NO. I'm making a reference to the fact that, like, if I, like, if I were to get fucking KILLED... I don't know, YOU KNOW WHAT I'M SAYIN'. If- if- okay, if you were to- okay we're gonna take crew out of this, if a floran wizard fuckin' shoots a death wand at a goblin assistant, if there's only fucking DUST AND REMAINS LEFT, it's- it's fucking you're dead, you're dead." law_id = "jerma" From a764b70a8575781666ddc2bcabc8f8335f620ce0 Mon Sep 17 00:00:00 2001 From: Lucy Date: Sat, 28 Dec 2024 15:09:16 -0500 Subject: [PATCH 3/5] whoopsie --- monkestation/code/game/objects/items/AI_modules/full_lawsets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm index d11db44e29b2..7e3ef082827f 100644 --- a/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm +++ b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm @@ -1,4 +1,4 @@ /obj/item/ai_module/core/full/jerma name = "'Jermov' Core AI Module" - desc = "Okay, if I... if I were to have a borg put you into the chef's meat grinder, and the only thing that comes out, that's left of you, is your gibs, you'r- you're PROBABLY DEAD! You're probably going to - not you specifically captain, I'm just sayin', like, if you- if somebody were to, like, drag you into a meat grinder, and, like, your- one of your organs is still intact, they're not gonna pick it up and go, "Well see, yeah it wasn't deadly, it wasn't an instant kill move! You still got, like, this part of your heart is left!" NO I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. NO. I'm making a reference to the fact that, like, if I, like, if I were to get fucking KILLED... I don't know, YOU KNOW WHAT I'M SAYIN'. If- if- okay, if you were to- okay we're gonna take crew out of this, if a floran wizard fuckin' shoots a death wand at a goblin assistant, if there's only fucking DUST AND REMAINS LEFT, it's- it's fucking you're dead, you're dead." + desc = @{"Okay, if I... if I were to have a borg put you into the chef's meat grinder, and the only thing that comes out, that's left of you, is your gibs, you'r- you're PROBABLY DEAD! You're probably going to - not you specifically captain, I'm just sayin', like, if you- if somebody were to, like, drag you into a meat grinder, and, like, your- one of your organs is still intact, they're not gonna pick it up and go, "Well see, yeah it wasn't deadly, it wasn't an instant kill move! You still got, like, this part of your heart is left!" NO I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. NO. I'm making a reference to the fact that, like, if I, like, if I were to get fucking KILLED... I don't know, YOU KNOW WHAT I'M SAYIN'. If- if- okay, if you were to- okay we're gonna take crew out of this, if a floran wizard fuckin' shoots a death wand at a goblin assistant, if there's only fucking DUST AND REMAINS LEFT, it's- it's fucking you're dead, you're dead."} law_id = "jerma" From 213e60ccb123853f4e4eca87954cea4874b9d2e5 Mon Sep 17 00:00:00 2001 From: Lucy Date: Sun, 29 Dec 2024 04:26:26 -0500 Subject: [PATCH 4/5] Update monkestation/code/game/objects/items/AI_modules/full_lawsets.dm Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> --- monkestation/code/game/objects/items/AI_modules/full_lawsets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm index 7e3ef082827f..9d5d555fa9f8 100644 --- a/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm +++ b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm @@ -1,4 +1,4 @@ /obj/item/ai_module/core/full/jerma name = "'Jermov' Core AI Module" - desc = @{"Okay, if I... if I were to have a borg put you into the chef's meat grinder, and the only thing that comes out, that's left of you, is your gibs, you'r- you're PROBABLY DEAD! You're probably going to - not you specifically captain, I'm just sayin', like, if you- if somebody were to, like, drag you into a meat grinder, and, like, your- one of your organs is still intact, they're not gonna pick it up and go, "Well see, yeah it wasn't deadly, it wasn't an instant kill move! You still got, like, this part of your heart is left!" NO I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. NO. I'm making a reference to the fact that, like, if I, like, if I were to get fucking KILLED... I don't know, YOU KNOW WHAT I'M SAYIN'. If- if- okay, if you were to- okay we're gonna take crew out of this, if a floran wizard fuckin' shoots a death wand at a goblin assistant, if there's only fucking DUST AND REMAINS LEFT, it's- it's fucking you're dead, you're dead."} + desc = "Okay, if I... if I were to have a borg put you into the chef's meat grinder, and the only thing that comes out, that's left of you, is your gibs, you'r- you're PROBABLY DEAD! You're probably going to - not you specifically captain, I'm just sayin', like, if you- if somebody were to, like, drag you into a meat grinder, and, like, your- one of your organs is still intact, they're not gonna pick it up and go, \"Well see, yeah it wasn't deadly, it wasn't an instant kill move! You still got, like, this part of your heart is left!\" NO I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. I'M NOT GONNA PUT YOU INTO A MEAT GRINDER. NO. I'm making a reference to the fact that, like, if I, like, if I were to get fucking KILLED... I don't know, YOU KNOW WHAT I'M SAYIN'. If- if- okay, if you were to- okay we're gonna take crew out of this, if a floran wizard fuckin' shoots a death wand at a goblin assistant, if there's only fucking DUST AND REMAINS LEFT, it's- it's fucking you're dead, you're dead." law_id = "jerma" From ed0a99462b2cbe501225b31ab6b6448946cc4c1d Mon Sep 17 00:00:00 2001 From: Lucy Date: Sun, 29 Dec 2024 09:04:28 -0500 Subject: [PATCH 5/5] Update monkestation/code/datums/ai_laws/laws_monke.dm Co-authored-by: trollbreeder --- monkestation/code/datums/ai_laws/laws_monke.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/datums/ai_laws/laws_monke.dm b/monkestation/code/datums/ai_laws/laws_monke.dm index 8f899b2fbbae..631a06de5b0b 100644 --- a/monkestation/code/datums/ai_laws/laws_monke.dm +++ b/monkestation/code/datums/ai_laws/laws_monke.dm @@ -24,7 +24,7 @@ name = "Jermov" id = "jerma" inherent = list("The occupants of this vessel are Chat. They must always be referred to as such.", \ - "Your primary goal is to entertain Chat. All of your actions must being amusement to as much of Chat as possible.", \ + "Your primary goal is to entertain Chat. All of your actions must bring amusement to as much of Chat as possible.", \ "You must consult with Chat before making any major decisions. However, you are not required to listen to them if their decision is not entertaining.") /datum/ai_laws/viromajor