From 614875c02e34609e41c1848e8762c3bc0ab683e2 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Mon, 14 Oct 2024 14:56:02 +0200 Subject: [PATCH 1/3] initial --- code/modules/mob/living/simple_animal/bot/secbot.dm | 2 +- .../simple_animal/bot/secbot_permit_overwrite.dm | 10 ++++++++++ tgstation.dme | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 269f08629e175..526be37a4f8fa 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -53,7 +53,7 @@ var/last_found ///Flags SecBOTs use on what to check on targets when arresting, and whether they should announce it to security/handcuff their target - var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET + var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET | SECBOT_CHECK_WEAPONS // DOPPLER EDIT, old code: var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET // Selections: SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_IDS | SECBOT_CHECK_WEAPONS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET ///On arrest, charges the violator this much. If they don't have that much in their account, they will get beaten instead diff --git a/modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm b/modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm new file mode 100644 index 0000000000000..41d212cc669af --- /dev/null +++ b/modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm @@ -0,0 +1,10 @@ +/// Here exist item_flags overwrites to remove these items from the 'CHECK_PERMIT' pool. +// Please remove these overwrites if upstream removes the 'NEEDS_PERMIT' flag themselves. +/obj/item/melee/skateboard + item_flags = NONE + +/obj/item/melee/baseball_bat + item_flags = NONE + +/obj/item/gun/energy/floragun + item_flags = NONE diff --git a/tgstation.dme b/tgstation.dme index ac7a1a6650da6..26a28290f2ac9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6861,6 +6861,7 @@ #include "modular_doppler\modular_medical\wounds\synth\blunt\robotic_blunt_T3.dm" #include "modular_doppler\modular_medical\wounds\synth\blunt\secures_internals.dm" #include "modular_doppler\modular_mob_spawn\code\mob_spawn.dm" +#include "modular_doppler\modular_mobs\simple_animal\bot\secbot_permit_overwrite.dm" #include "modular_doppler\modular_mood\code\mood_events\brushed.dm" #include "modular_doppler\modular_mood\code\mood_events\dog_wag.dm" #include "modular_doppler\modular_mood\code\mood_events\hotspring.dm" From ca686c12fc227f71d45f8df21a803b751f963e95 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Mon, 14 Oct 2024 15:07:33 +0200 Subject: [PATCH 2/3] give rd and qm wep access --- code/datums/id_trim/jobs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 0bb7dabe262cc..f63b772a83e09 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -914,6 +914,7 @@ ACCESS_COMMAND, ACCESS_EVA, ACCESS_BRIG_ENTRANCE, + ACCESS_WEAPONS, // DOPPLER EDIT ADDITION ) extra_access = list( ACCESS_TELEPORTER, @@ -965,6 +966,7 @@ ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_XENOBIOLOGY, + ACCESS_WEAPONS, // DOPPLER EDIT ADDITION ) minimal_wildcard_access = list( ACCESS_RD, From ad99d9ffc781cad804705f8e9f4caf44e888cfc0 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Mon, 14 Oct 2024 16:30:44 +0200 Subject: [PATCH 3/3] syringe gun doesnt need permit --- .../modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm b/modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm index 41d212cc669af..d98b9f7be38e7 100644 --- a/modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm +++ b/modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm @@ -8,3 +8,6 @@ /obj/item/gun/energy/floragun item_flags = NONE + +/obj/item/gun/syringe + item_flags = NONE