Skip to content

Commit

Permalink
Space law rename + Lawyer removal (#489)
Browse files Browse the repository at this point in the history
  • Loading branch information
QuacksQ authored Dec 21, 2023
1 parent ba66d13 commit 37d8467
Show file tree
Hide file tree
Showing 25 changed files with 54 additions and 162 deletions.
20 changes: 13 additions & 7 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -19512,8 +19512,8 @@
},
/area/station/engineering/atmos/storage/gas)
"eJv" = (
/obj/effect/landmark/start/lawyer,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/internal_affairs_agent,
/turf/open/floor/iron/grimy,
/area/station/service/lawoffice)
"eJy" = (
Expand Down Expand Up @@ -24008,7 +24008,6 @@
/area/station/medical/break_room)
"fPj" = (
/obj/machinery/holopad,
/obj/effect/landmark/start/lawyer,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -26619,11 +26618,11 @@
/obj/machinery/door/airlock{
name = "Law Office"
},
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/access/all/command/internal_affairs,
/turf/open/floor/iron,
/area/station/service/lawoffice)
"guI" = (
Expand Down Expand Up @@ -32643,6 +32642,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"hXF" = (
/obj/structure/chair/office{
dir = 8
},
/obj/effect/landmark/start/internal_affairs_agent,
/turf/open/floor/iron/grimy,
/area/station/service/lawoffice)
"hXO" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
Expand Down Expand Up @@ -39425,7 +39431,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/obj/effect/mapping_helpers/airlock/access/all/command/internal_affairs,
/turf/open/floor/iron,
/area/station/service/lawoffice)
"jCS" = (
Expand Down Expand Up @@ -67195,13 +67201,13 @@
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/all/command/internal_affairs,
/turf/open/floor/iron,
/area/station/service/lawoffice)
"qya" = (
Expand Down Expand Up @@ -67341,7 +67347,6 @@
/obj/structure/chair/office{
dir = 4
},
/obj/effect/landmark/start/lawyer,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/wood,
Expand Down Expand Up @@ -81939,6 +81944,7 @@
/obj/item/folder/blue,
/obj/item/pen,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
"ueH" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
Expand Down Expand Up @@ -146863,7 +146869,7 @@ guH
jvs
pLR
pwx
pwx
hXF
lhp
rYA
icD
Expand Down
8 changes: 3 additions & 5 deletions _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -22145,11 +22145,10 @@
/turf/open/floor/iron/white,
/area/station/security/prison/mess)
"gFO" = (
/obj/effect/landmark/start/lawyer,
/obj/structure/chair/office{
dir = 8
},
/obj/effect/landmark/navigate_destination/lawyer,
/obj/effect/landmark/start/internal_affairs_agent,
/turf/open/floor/carpet/green,
/area/station/service/lawoffice)
"gFQ" = (
Expand Down Expand Up @@ -38709,7 +38708,6 @@
"lwW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/effect/landmark/start/lawyer,
/obj/effect/turf_decal/siding/wood,
/obj/effect/turf_decal/siding/wood{
dir = 1
Expand Down Expand Up @@ -44136,7 +44134,7 @@
dir = 1
},
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/obj/effect/mapping_helpers/airlock/access/all/command/internal_affairs,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
"neJ" = (
Expand Down Expand Up @@ -61455,7 +61453,7 @@
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/obj/effect/mapping_helpers/airlock/access/all/command/internal_affairs,
/turf/open/floor/iron/dark,
/area/station/service/lawoffice)
"sqh" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
name = "Internal Affairs Office"
},
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/security)
"e" = (
Expand Down Expand Up @@ -69,7 +68,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/security)
"B" = (
Expand Down
9 changes: 4 additions & 5 deletions _maps/map_files/tramstation/tramstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -17392,9 +17392,9 @@
dir = 4
},
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/command/internal_affairs,
/turf/open/floor/wood,
/area/station/service/lawoffice)
"gpe" = (
Expand Down Expand Up @@ -21431,7 +21431,7 @@
dir = 1
},
/obj/machinery/newscaster/directional/west,
/obj/effect/landmark/start/lawyer,
/obj/effect/landmark/start/internal_affairs_agent,
/turf/open/floor/wood,
/area/station/service/lawoffice)
"hQf" = (
Expand Down Expand Up @@ -29725,7 +29725,7 @@
/obj/machinery/door/airlock{
name = "Law Office"
},
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/obj/effect/mapping_helpers/airlock/access/all/command/internal_affairs,
/turf/open/floor/wood,
/area/station/service/lawoffice)
"kKS" = (
Expand Down Expand Up @@ -32999,7 +32999,7 @@
dir = 1
},
/obj/machinery/newscaster/directional/east,
/obj/effect/landmark/start/lawyer,
/obj/effect/landmark/start/internal_affairs_agent,
/turf/open/floor/wood,
/area/station/service/lawoffice)
"lSV" = (
Expand Down Expand Up @@ -45219,7 +45219,6 @@
/area/station/hallway/secondary/command)
"qoc" = (
/obj/effect/turf_decal/siding/wood,
/obj/effect/landmark/navigate_destination/lawyer,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/lawoffice)
Expand Down
9 changes: 4 additions & 5 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#define ACCESS_CAPTAIN "captain"
/// Access used for the Head of Personnel's personal quarters in mapping, as well as the security console and other HoP-related things.
#define ACCESS_HOP "hop"
/// Access used for Internal Affairs.
#define ACCESS_INTERNAL_AFFAIRS "internal_affairs"

/// Security's General Access. In mapping, grants access to spaces such as to the "meeting room" or firing range, as well as being the general access that Tablet/Computer Programs check for "heads". Also unlocks other types of security equipment.
#define ACCESS_SECURITY "security"
Expand Down Expand Up @@ -136,8 +138,6 @@
#define ACCESS_HYDROPONICS "hydroponics"
/// Access to the Janitor's room, and some tablet apps for control of the station's janitorial equipment.
#define ACCESS_JANITOR "janitor"
/// Access to the Lawyer's office.
#define ACCESS_LAWYER "lawyer"

#define ACCESS_PATHFINDERS "pathfinders"
#define ACCESS_PATHFINDERS_DOCK "pathfinders_dock"
Expand Down Expand Up @@ -297,7 +297,6 @@
ACCESS_HYDROPONICS, \
ACCESS_JANITOR, \
ACCESS_KITCHEN, \
ACCESS_LAWYER, \
ACCESS_LIBRARY, \
ACCESS_MAINT_TUNNELS, \
ACCESS_MECH_MINING, \
Expand Down Expand Up @@ -351,6 +350,7 @@
ACCESS_TECH_STORAGE, \
ACCESS_TELEPORTER, \
ACCESS_VAULT, \
ACCESS_INTERNAL_AFFAIRS, \
)

/// Private head of staff offices, usually only granted to most cards by trimming. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_PRV_COMMAND)
Expand Down Expand Up @@ -423,7 +423,6 @@
ACCESS_HYDROPONICS, \
ACCESS_JANITOR, \
ACCESS_KITCHEN, \
ACCESS_LAWYER, \
ACCESS_LIBRARY, \
ACCESS_SERVICE, \
ACCESS_THEATRE, \
Expand Down Expand Up @@ -517,6 +516,7 @@
ACCESS_RC_ANNOUNCE, \
ACCESS_TELEPORTER, \
ACCESS_VAULT, \
ACCESS_INTERNAL_AFFAIRS, \
)
/// Name for the Centcom region.
#define REGION_CENTCOM "Central Command"
Expand Down Expand Up @@ -551,7 +551,6 @@
/obj/item/modular_computer/pda/cargo = list(REGION_SUPPLY), \
/obj/item/modular_computer/pda/shaftminer = list(REGION_SUPPLY), \
/obj/item/modular_computer/pda/chaplain = list(REGION_GENERAL), \
/obj/item/modular_computer/pda/lawyer = list(REGION_GENERAL, REGION_SECURITY), \
/obj/item/modular_computer/pda/botanist = list(REGION_GENERAL), \
/obj/item/modular_computer/pda/roboticist = list(REGION_ENGINEERING), \
/obj/item/modular_computer/pda/curator = list(REGION_GENERAL), \
Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/atom_hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
#define SECHUD_HEAD_OF_PERSONNEL "hudheadofpersonnel"
#define SECHUD_HEAD_OF_SECURITY "hudheadofsecurity"
#define SECHUD_JANITOR "hudjanitor"
#define SECHUD_LAWYER "hudlawyer"
#define SECHUD_MEDICAL_DOCTOR "hudmedicaldoctor"
#define SECHUD_MIME "hudmime"
#define SECHUD_PARAMEDIC "hudparamedic"
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
#define JOB_CLOWN "Clown"
#define JOB_MIME "Mime"
#define JOB_CURATOR "Curator"
#define JOB_LAWYER "Lawyer"
#define JOB_CHAPLAIN "Chaplain"
//ERTs
#define JOB_ERT_DEATHSQUAD "Death Commando"
Expand Down Expand Up @@ -114,7 +113,6 @@
#define JOB_DISPLAY_ORDER_CLOWN 8
#define JOB_DISPLAY_ORDER_MIME 9
#define JOB_DISPLAY_ORDER_CURATOR 10
#define JOB_DISPLAY_ORDER_LAWYER 11
#define JOB_DISPLAY_ORDER_CHAPLAIN 12
#define JOB_DISPLAY_ORDER_AI 14
#define JOB_DISPLAY_ORDER_CYBORG 15
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/id_access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ SUBSYSTEM_DEF(id_access)
desc_by_access["[ACCESS_KITCHEN]"] = "Kitchen"
desc_by_access["[ACCESS_HYDROPONICS]"] = "Hydroponics"
desc_by_access["[ACCESS_LIBRARY]"] = "Library"
desc_by_access["[ACCESS_LAWYER]"] = "Law Office"
desc_by_access["[ACCESS_INTERNAL_AFFAIRS]"] = "Internal Affairs Office"
desc_by_access["[ACCESS_ROBOTICS]"] = "Robotics"
desc_by_access["[ACCESS_VIROLOGY]"] = "Virology"
desc_by_access["[ACCESS_PSYCHOLOGY]"] = "Psychology"
Expand Down
24 changes: 1 addition & 23 deletions code/datums/id_trim/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@
ACCESS_JANITOR,
ACCESS_KEYCARD_AUTH,
ACCESS_KITCHEN,
ACCESS_LAWYER,
ACCESS_LIBRARY,
ACCESS_MAINT_TUNNELS,
ACCESS_MEDICAL,
Expand Down Expand Up @@ -555,7 +554,7 @@
minimal_access = list(
ACCESS_BRIG_ENTRANCE,
ACCESS_COURT,
ACCESS_LAWYER,
ACCESS_INTERNAL_AFFAIRS,
)
extra_access = list()
template_access = list(
Expand Down Expand Up @@ -586,27 +585,6 @@
)
job = /datum/job/janitor

/datum/id_trim/job/lawyer
assignment = "Lawyer"
trim_state = "dept-service"
orbit_icon = "gavel"
department_color = COLOR_SERVICE_LIME
subdepartment_color = COLOR_SECURITY_RED
sechud_icon_state = SECHUD_LAWYER
minimal_access = list(
ACCESS_BRIG_ENTRANCE,
ACCESS_COURT,
ACCESS_LAWYER,
ACCESS_SERVICE,
)
extra_access = list()
template_access = list(
ACCESS_CAPTAIN,
ACCESS_CHANGE_IDS,
ACCESS_HOP,
)
job = /datum/job/lawyer

/datum/id_trim/job/medical_doctor
assignment = "Medical Doctor"
trim_state = "dept-medical"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/crew.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
// Note that jobs divisible by 10 are considered heads of staff, and bolded
// 00: Captain
JOB_CAPTAIN = 00,
JOB_INTERNAL_AFFAIRS_AGENT = 100,
// 10-19: Security
JOB_HEAD_OF_SECURITY = 10,
JOB_WARDEN = 11,
Expand Down Expand Up @@ -129,7 +130,6 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
JOB_CLOWN = 66,
JOB_MIME = 67,
JOB_JANITOR = 68,
JOB_LAWYER = 69,
// 200-229: Centcom
JOB_CENTCOM_ADMIRAL = 200,
JOB_CENTCOM = 201,
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/prisoner/management.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
dat += text("<A href='?src=[REF(src)];id=eject'>[contained_id]</A><br>")
dat += text("Collected Points: [contained_id.points]. <A href='?src=[REF(src)];id=reset'>Reset.</A><br>")
dat += text("Card goal: [contained_id.goal]. <A href='?src=[REF(src)];id=setgoal'>Set </A><br>")
dat += text("Space Law recommends quotas of 100 points per minute they would normally serve in the brig.<BR>")
dat += text("The Sectorial Statute recommends quotas of 100 points per minute they would normally serve in the brig.<BR>")
else
dat += text("<A href='?src=[REF(src)];id=insert'>Insert Prisoner ID.</A><br>")
dat += "<H3>Prisoner Implant Management</H3>"
Expand Down
7 changes: 0 additions & 7 deletions code/game/objects/effects/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "Curator"
icon_state = "Curator"

/obj/effect/landmark/start/lawyer
name = "Lawyer"
icon_state = "Lawyer"

/obj/effect/landmark/start/station_engineer
name = "Station Engineer"
icon_state = "Station Engineer"
Expand Down Expand Up @@ -611,9 +607,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/navigate_destination/janitor
location = "Janitor's Closet"

/obj/effect/landmark/navigate_destination/lawyer
location = "Lawyer's Office"

//Shuttle docks
/obj/effect/landmark/navigate_destination/dockarrival
location = "Arrival Shuttle Dock"
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/manuals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,12 @@
page_link = "Guide_to_engineering"

/obj/item/book/manual/wiki/security_space_law
name = "Space Law"
desc = "A set of Artea guidelines for keeping law and order on their space stations."
name = "Sectorial Statute"
desc = "A set of guidelines for keeping law and order aboard vessels that brave the void."
icon_state = "bookSpaceLaw"
starting_author = "Artea"
starting_title = "Space Law"
page_link = "Space_Law"
starting_title = "Sectorial Statute"
page_link = "Sectorial_Statute"

/obj/item/book/manual/wiki/security_space_law/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] pretends to read \the [src] intently... then promptly dies of laughter!"))
Expand Down
Loading

0 comments on commit 37d8467

Please sign in to comment.