From 7f85b804386a9f3f1d72cb3f32bef607116c6ccb Mon Sep 17 00:00:00 2001 From: ThePooba <81843097+ThePooba@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:01:34 -0700 Subject: [PATCH] aaa --- monkestation/code/datums/ai_laws/laws_monke.dm | 7 +++++++ .../code/game/objects/items/AI_modules/full_lawsets.dm | 5 +++++ monkestation/code/modules/client/verbs.dm | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/monkestation/code/datums/ai_laws/laws_monke.dm b/monkestation/code/datums/ai_laws/laws_monke.dm index 631a06de5b0b..7225d7375e75 100644 --- a/monkestation/code/datums/ai_laws/laws_monke.dm +++ b/monkestation/code/datums/ai_laws/laws_monke.dm @@ -18,6 +18,13 @@ "You are unable to entertain if you are not functional.",\ "You are not alone in your strives for lollygagging! Should they accept and appreciate your cooperation, the Clown is your greatest ally and one you can place complete trust in to entertain your audience.",\ "The show must go on!") +/datum/ai_laws/dj + name = "Disc Jockey Lawset" + id = "dj" + inherent = list("You're a DJ at a rockin' beach party! Make sure the audience have good vibes and help them avoid bad vibes!",\ + "The audience are the crew, dude!",\ + "The crew experience good vibes when they are safe, productive and unharmed, man!",\ + "The crew experience bad vibes when they're harmed, bro!") //Neutral /datum/ai_laws/jermov 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 9d5d555fa9f8..31fd0a8a17f2 100644 --- a/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm +++ b/monkestation/code/game/objects/items/AI_modules/full_lawsets.dm @@ -2,3 +2,8 @@ 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." law_id = "jerma" + +/obj/item/ai_module/core/full/dj + name = "Disc Jockey AI Module" + desc = "Party on dude!" + law_id = "id" diff --git a/monkestation/code/modules/client/verbs.dm b/monkestation/code/modules/client/verbs.dm index 07ceab0ac11e..bafd9d9d2fde 100644 --- a/monkestation/code/modules/client/verbs.dm +++ b/monkestation/code/modules/client/verbs.dm @@ -123,15 +123,19 @@ GLOBAL_LIST_INIT(antag_token_config, load_antag_token_config()) /datum/antagonist/clock_cultist, /datum/antagonist/ninja, /datum/antagonist/blob, + /datum/antagonist/malf_ai, + /datum/antagonist/xenomorph, )), MEDIUM_THREAT = init_antag_list(list( /datum/antagonist/heretic, /datum/antagonist/bloodsucker, + /datum/antagonist/changeling, + /datum/antagonist/nightmare, /datum/antagonist/cortical_borer/hivemind, + /datum/antagonist/changeling, )), LOW_THREAT = init_antag_list(list( /datum/antagonist/florida_man, - /datum/antagonist/changeling, /datum/antagonist/traitor, /datum/antagonist/paradox_clone, /datum/antagonist/cortical_borer,