Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Secbots care if you're holding a weapon #161

Merged
merged 3 commits into from
Oct 14, 2024
+17 −1
Merged

Secbots care if you're holding a weapon #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
614875c
initial
carpotoxin Oct 14, 2024
ca686c1
give rd and qm wep access
carpotoxin Oct 14, 2024
ad99d9f
syringe gun doesnt need permit
carpotoxin Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/datums/id_trim/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@
ACCESS_COMMAND,
ACCESS_EVA,
ACCESS_BRIG_ENTRANCE,
ACCESS_WEAPONS, // DOPPLER EDIT ADDITION
)
extra_access = list(
ACCESS_TELEPORTER,
Expand Down Expand Up @@ -965,6 +966,7 @@
ACCESS_TECH_STORAGE,
ACCESS_TELEPORTER,
ACCESS_XENOBIOLOGY,
ACCESS_WEAPONS, // DOPPLER EDIT ADDITION
)
minimal_wildcard_access = list(
ACCESS_RD,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/bot/secbot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions modular_doppler/modular_mobs/simple_animal/bot/secbot_permit_overwrite.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/// 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

/obj/item/gun/syringe
item_flags = NONE
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading