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

Фикс доступов для обделённых (НТР и БЩ эдишен) (битраннер пеид длц) (атмосы не должны страдать (или должны?)) #5302

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+35 −3
Open

Фикс доступов для обделённых (НТР и БЩ эдишен) (битраннер пеид длц) (атмосы не должны страдать (или должны?)) #5302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29199d8
evil commit
Iajret Jan 17, 2025
510e2c6
Merge branch 'master' into dostoopeee
Iajret Jan 17, 2025
085fe13
Update jobs.dm
Iajret Jan 23, 2025
8a8c4ea
Update NSSJourney.dmm
Iajret Feb 5, 2025
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 _maps/map_files/NSSJourney/NSSJourney.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14882,6 +14882,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"bxB" = (
Expand Down Expand Up @@ -54347,6 +54348,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/security/detective,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
"sWB" = (
Expand Down
6 changes: 4 additions & 2 deletions code/datums/id_trim/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,13 +998,15 @@
ACCESS_ROBOTICS,
ACCESS_SCIENCE,
ACCESS_TECH_STORAGE,
ACCESS_ORDNANCE,
ACCESS_ORDNANCE_STORAGE,
// ACCESS_ORDNANCE, //FLUFFY FRONTIER EDIT. REMOVAL
// ACCESS_ORDNANCE_STORAGE, //FLUFFY FRONTIER EDIT. REMOVAL
)
extra_access = list(
ACCESS_GENETICS,
ACCESS_XENOBIOLOGY,
ACCESS_MORGUE_SECURE,
ACCESS_ORDNANCE, //FLUFFY FRONTIER EDIT. ADDITION
ACCESS_ORDNANCE_STORAGE, //FLUFFY FRONTIER EDIT. ADDITION
)
template_access = list(
ACCESS_CAPTAIN,
Expand Down
2 changes: 1 addition & 1 deletion modular_nova/modules/cargo/code/packs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
/datum/supply_pack/engineering/modsuit_atmospherics
name = "Atmospherics MODsuit Crate"
desc = "Contains a single MODsuit, built to standard atmospherics specifications."
access = ACCESS_ENGINE_EQUIP
access = ACCESS_ATMOSPHERICS // FLUFFY FRONTIER EDIT. ORIGINAL - access = ACCESS_ENGINE_EQUIP
contains = list(/obj/item/mod/control/pre_equipped/atmospheric)
cost = CARGO_CRATE_VALUE * 16
crate_name = "atmospherics MODsuit crate"
Expand Down
27 changes: 27 additions & 0 deletions tff_modular/master_files/code/datum/id_trim/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/datum/id_trim/job/blueshield/New()
. = ..()

var/musthave_access = list(
ACCESS_BRIG,
ACCESS_CARGO,
ACCESS_COURT,
ACCESS_GATEWAY,
ACCESS_SECURITY,
ACCESS_CHANGE_IDS,
)

minimal_access |= musthave_access

/datum/id_trim/job/nanotrasen_consultant/New()
. = ..()

var/musthave_access = list(
ACCESS_BRIG,
ACCESS_CARGO,
ACCESS_COURT,
ACCESS_GATEWAY,
ACCESS_SECURITY,
ACCESS_CHANGE_IDS,
)

minimal_access |= musthave_access
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 @@ -8855,6 +8855,7 @@
#include "modular_nova\modules\xenoarchartifacts\obj\particle_battery.dm"
#include "modular_nova\modules\xenoarchartifacts\obj\wave_scanner.dm"
#include "tff_modular\master_files\code\_HELPERS\global_lists.dm"
#include "tff_modular\master_files\code\datum\id_trim\jobs.dm"
#include "tff_modular\master_files\code\datum\quirks\neutral_quirks\burr.dm"
#include "tff_modular\master_files\code\game\objects\items\tools\weldingtool.dm"
#include "tff_modular\master_files\code\modules\client\preferences\clothing.dm"
Expand Down
Loading