cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Completely Purges Any Suggestion That The IAA is a Lawyer. (#25371)

Browse Source 
* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* The IAA is not a lawyer. They were never a lawyer. Glory to INGSO- uhh, NANOTRASEN!

* There was lawyer stuff on the maps.

* crush

* Update code/modules/pda/pdas.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update pda.dmi

* Update code/modules/clothing/under/accessories/accessory.dm

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Fordoxia <fordoxia@googlemail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-06-12 17:55:45 +00:00
committed by GitHub
co-authored by Contrabang Fordoxia Luc
parent f879418cf1
commit 90c7d9bb93
38 changed files with 152 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/centcomm.dmm
+1 -1
View File
@@ -5485,7 +5485,7 @@
/area/tdome/arena_source)
"st" = (
/obj/structure/table/wood,
/obj/item/clothing/accessory/lawyers_badge{
/obj/item/clothing/accessory/legal_badge{
desc = "A badge of upmost glory.";
name = "thunderdome badge"
},
_maps/map_files/stations/deltastation.dmm
+14 -14
View File
@@ -37049,7 +37049,7 @@
pixel_x = -30
},
/obj/item/clipboard,
/obj/item/toy/figure/crew/lawyer,
/obj/item/toy/figure/crew/iaa,
/turf/simulated/floor/wood,
/area/station/legal/lawoffice)
"caH" = (
@@ -46438,6 +46438,18 @@
icon_state = "neutralfull"
},
/area/station/supply/expedition)
"czW" = (
/obj/effect/spawner/random_spawners/dirt_often,
/obj/machinery/requests_console{
department = "Expedition";
pixel_x = -30;
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "browncorner"
},
/area/station/supply/expedition)
"czY" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -89449,18 +89461,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/science/robotics/showroom)
"sjl" = (
/obj/effect/spawner/random_spawners/dirt_often,
/obj/machinery/requests_console{
department = "Expedition";
pixel_x = -30;
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "browncorner"
},
/area/station/supply/expedition)
"sjA" = (
/obj/structure/disposalpipe/sortjunction/reversed{
dir = 8;
@@ -141324,7 +141324,7 @@ cxe
cvK
cyw
cyr
sjl
czW
cBw
cCV
cyv
_maps/map_files/stations/metastation.dmm
+1 -1
View File
@@ -9535,7 +9535,7 @@
/obj/item/book/manual/wiki/security_space_law{
pixel_y = 5
},
/obj/item/cartridge/lawyer{
/obj/item/cartridge/iaa{
pixel_y = 5
},
/obj/structure/table/reinforced,
code/__DEFINES/access_defines.dm
+1 -1
View File
@@ -35,7 +35,7 @@
#define ACCESS_HYDROPONICS 35
#define ACCESS_MANUFACTURING 36
#define ACCESS_LIBRARY 37
#define ACCESS_LAWYER 38
#define ACCESS_INTERNAL_AFFAIRS 38
#define ACCESS_VIROLOGY 39
#define ACCESS_CMO 40
#define ACCESS_QM 41
code/__DEFINES/job_defines.dm
+1 -1
View File
@@ -49,7 +49,7 @@
#define JOB_QUARTERMASTER (1<<6)
#define JOB_CARGOTECH (1<<7)
#define JOB_MINER (1<<8)
#define JOB_LAWYER (1<<9)
#define JOB_INTERNAL_AFFAIRS (1<<9)
#define JOB_CHAPLAIN (1<<10)
#define JOB_CLOWN (1<<11)
#define JOB_MIME (1<<12)
code/datums/datacore.dm
+1 -1
View File
@@ -417,7 +417,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
if("Shaft Miner")
clothes_s = new /icon('icons/mob/clothing/under/cargo.dmi', "explorer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY)
if("Lawyer")
if("Internal Affairs Agent")
clothes_s = new /icon('icons/mob/clothing/under/civilian.dmi', "internalaffairs_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if("Chaplain")
code/datums/spells/cluwne.dm
+2 -2
View File
@@ -54,7 +54,7 @@
SetConfused(0)
SetJitter(0)
if(mind)
mind.assigned_role = "Lawyer"
mind.assigned_role = "Internal Affairs Agent"
var/obj/item/organ/internal/honktumor/cursed/tumor = get_int_organ(/obj/item/organ/internal/honktumor/cursed)
if(tumor)
@@ -85,5 +85,5 @@
unEquip(gloves, 1)
qdel(G)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/lawyer/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/iaa/formal/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE)
code/datums/station_traits/positive_traits.dm
+1 -1
View File
@@ -184,7 +184,7 @@
/datum/job/hop = /obj/item/organ/internal/eyes/cybernetic/shield,
/datum/job/hos = /obj/item/organ/internal/cyberimp/brain/anti_stam, //not giving them thermals
/datum/job/janitor = /obj/item/organ/internal/cyberimp/eyes/hud/jani,
/datum/job/lawyer = /obj/item/organ/internal/heart/cybernetic/upgraded,
/datum/job/iaa = /obj/item/organ/internal/heart/cybernetic/upgraded,
/datum/job/mime = /obj/item/organ/internal/cyberimp/brain/anti_stam, //...
/datum/job/paramedic = /obj/item/organ/internal/cyberimp/mouth/breathing_tube,
/datum/job/psychiatrist = /obj/item/organ/internal/heart/cybernetic/upgraded, //heart of gold. Or at least part gold
code/game/jobs/access.dm
+3 -3
View File
@@ -126,7 +126,7 @@
ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_MAILSORTING, ACCESS_CHAPEL_OFFICE, ACCESS_CE, ACCESS_CHEMISTRY, ACCESS_CLOWN, ACCESS_CMO,
ACCESS_COURT, ACCESS_CONSTRUCTION, ACCESS_CREMATORIUM, ACCESS_JANITOR, ACCESS_ENGINE, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FORENSICS_LOCKERS,
ACCESS_GENETICS, ACCESS_EXPEDITION, ACCESS_BRIG, ACCESS_HOP, ACCESS_HOS, ACCESS_HYDROPONICS, ACCESS_CHANGE_IDS, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN,
ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME,
ACCESS_INTERNAL_AFFAIRS, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME,
ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_NETWORK, ACCESS_NTREP, ACCESS_PARAMEDIC, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_ENGINE_EQUIP, ACCESS_PSYCHIATRIST, ACCESS_QM, ACCESS_RD, ACCESS_RC_ANNOUNCE, ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_RESEARCH, ACCESS_SECURITY,
ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY,
@@ -149,7 +149,7 @@
if(REGION_ALL)
return get_all_accesses()
if(REGION_GENERAL) //station general
return list(ACCESS_KITCHEN, ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MAGISTRATE, ACCESS_CLOWN, ACCESS_MIME)
return list(ACCESS_KITCHEN, ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_INTERNAL_AFFAIRS, ACCESS_MAGISTRATE, ACCESS_CLOWN, ACCESS_MIME)
if(REGION_SECURITY) //security
return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS)
if(REGION_MEDBAY) //medbay
@@ -265,7 +265,7 @@
return "Hydroponics"
if(ACCESS_LIBRARY)
return "Library"
if(ACCESS_LAWYER)
if(ACCESS_INTERNAL_AFFAIRS)
return "Law Office"
if(ACCESS_ROBOTICS)
return "Robotics"
code/game/jobs/job/supervisor.dm
+13 -13
View File
@@ -91,7 +91,7 @@
ACCESS_JANITOR,
ACCESS_KEYCARD_AUTH,
ACCESS_KITCHEN,
ACCESS_LAWYER,
ACCESS_INTERNAL_AFFAIRS,
ACCESS_LIBRARY,
ACCESS_MAINT_TUNNELS,
ACCESS_MEDICAL,
@@ -163,7 +163,7 @@
ACCESS_JANITOR,
ACCESS_KEYCARD_AUTH,
ACCESS_KITCHEN,
ACCESS_LAWYER,
ACCESS_INTERNAL_AFFAIRS,
ACCESS_LIBRARY,
ACCESS_MAILSORTING,
ACCESS_MAINT_TUNNELS,
@@ -277,7 +277,7 @@
ACCESS_BRIG,
ACCESS_COURT,
ACCESS_HEADS,
ACCESS_LAWYER,
ACCESS_INTERNAL_AFFAIRS,
ACCESS_MAGISTRATE,
ACCESS_MAINT_TUNNELS,
ACCESS_RC_ANNOUNCE,
@@ -300,7 +300,7 @@
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
id = /obj/item/card/id/magistrate
l_pocket = /obj/item/flash
r_pocket = /obj/item/clothing/accessory/lawyers_badge
r_pocket = /obj/item/clothing/accessory/legal_badge
pda = /obj/item/pda/heads/magistrate
backpack_contents = list(
/obj/item/melee/classic_baton/telescopic = 1
@@ -310,9 +310,9 @@
dufflebag = /obj/item/storage/backpack/duffel/security
/datum/job/lawyer
/datum/job/iaa
title = "Internal Affairs Agent"
flag = JOB_LAWYER
flag = JOB_INTERNAL_AFFAIRS
department_flag = JOBCAT_SUPPORT
total_positions = 2
spawn_positions = 2
@@ -324,7 +324,7 @@
ACCESS_CARGO,
ACCESS_CONSTRUCTION,
ACCESS_COURT,
ACCESS_LAWYER,
ACCESS_INTERNAL_AFFAIRS,
ACCESS_MAILSORTING,
ACCESS_MAINT_TUNNELS,
ACCESS_MEDICAL,
@@ -335,12 +335,12 @@
minimal_player_age = 30
exp_map = list(EXP_TYPE_CREW = 600)
blacklisted_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
outfit = /datum/outfit/job/lawyer
important_information = "Your job is to deal with affairs regarding Standard Operating Procedure. You are NOT in charge of Space Law affairs, nor can you override it. You are not a prisoner defence lawyer."
outfit = /datum/outfit/job/iaa
important_information = "Your job is to deal with affairs regarding Standard Operating Procedure. You are NOT in charge of Space Law affairs, nor can you override it. You are NOT a prisoner defence lawyer."
/datum/outfit/job/lawyer
/datum/outfit/job/iaa
name = "Internal Affairs Agent"
jobtype = /datum/job/lawyer
jobtype = /datum/job/iaa
uniform = /obj/item/clothing/under/rank/procedure/iaa
suit = /obj/item/clothing/suit/storage/iaa/blackjacket
shoes = /obj/item/clothing/shoes/brown
@@ -348,9 +348,9 @@
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
id = /obj/item/card/id/internalaffairsagent
l_pocket = /obj/item/laser_pointer
r_pocket = /obj/item/clothing/accessory/lawyers_badge
r_pocket = /obj/item/clothing/accessory/legal_badge/iaa
l_hand = /obj/item/storage/briefcase
pda = /obj/item/pda/lawyer
pda = /obj/item/pda/iaa
backpack_contents = list(
/obj/item/flash = 1
)
code/game/machinery/vendors/wardrobe_vendors.dm
Vendored
+17 -19
View File
@@ -809,14 +809,14 @@
products = list(/obj/item/clothing/under/rank/procedure/iaa = 2,
/obj/item/clothing/under/rank/procedure/iaa/blue = 2,
/obj/item/clothing/under/rank/procedure/iaa/purple = 2,
/obj/item/clothing/under/rank/procedure/lawyer/black = 2,
/obj/item/clothing/under/rank/procedure/lawyer/black/skirt = 2,
/obj/item/clothing/under/rank/procedure/lawyer/red = 2,
/obj/item/clothing/under/rank/procedure/lawyer/red/skirt = 2,
/obj/item/clothing/under/rank/procedure/lawyer/blue = 2,
/obj/item/clothing/under/rank/procedure/lawyer/blue/skirt = 2,
/obj/item/clothing/under/rank/procedure/lawyer/goodman = 2,
/obj/item/clothing/under/rank/procedure/lawyer/goodman/skirt = 2,
/obj/item/clothing/under/rank/procedure/iaa/formal/black = 2,
/obj/item/clothing/under/rank/procedure/iaa/formal/black/skirt = 2,
/obj/item/clothing/under/rank/procedure/iaa/formal/red = 2,
/obj/item/clothing/under/rank/procedure/iaa/formal/red/skirt = 2,
/obj/item/clothing/under/rank/procedure/iaa/formal/blue = 2,
/obj/item/clothing/under/rank/procedure/iaa/formal/blue/skirt = 2,
/obj/item/clothing/under/rank/procedure/iaa/formal/goodman = 2,
/obj/item/clothing/under/rank/procedure/iaa/formal/goodman/skirt = 2,
/obj/item/clothing/under/suit/female = 2,
/obj/item/clothing/suit/storage/iaa/blackjacket = 2,
/obj/item/clothing/suit/storage/iaa/bluejacket = 2,
@@ -825,22 +825,21 @@
/obj/item/clothing/shoes/black = 2,
/obj/item/clothing/shoes/brown = 2,
/obj/item/clothing/glasses/sunglasses/big = 2,
/obj/item/clothing/accessory/lawyers_badge = 2,
/obj/item/clothing/accessory/armband/procedure = 2)
contraband = list(/obj/item/toy/figure/crew/lawyer = 1)
contraband = list(/obj/item/toy/figure/crew/iaa = 1)
prices = list(/obj/item/clothing/under/rank/procedure/iaa = 50,
/obj/item/clothing/under/rank/procedure/iaa/blue = 50,
/obj/item/clothing/under/rank/procedure/iaa/purple = 50,
/obj/item/clothing/under/rank/procedure/lawyer/black = 50,
/obj/item/clothing/under/rank/procedure/lawyer/black/skirt = 50,
/obj/item/clothing/under/rank/procedure/lawyer/red = 50,
/obj/item/clothing/under/rank/procedure/lawyer/red/skirt = 50,
/obj/item/clothing/under/rank/procedure/lawyer/blue = 50,
/obj/item/clothing/under/rank/procedure/lawyer/blue/skirt = 50,
/obj/item/clothing/under/rank/procedure/lawyer/goodman = 50,
/obj/item/clothing/under/rank/procedure/lawyer/goodman/skirt = 50,
/obj/item/clothing/under/rank/procedure/iaa/formal/black = 50,
/obj/item/clothing/under/rank/procedure/iaa/formal/black/skirt = 50,
/obj/item/clothing/under/rank/procedure/iaa/formal/red = 50,
/obj/item/clothing/under/rank/procedure/iaa/formal/red/skirt = 50,
/obj/item/clothing/under/rank/procedure/iaa/formal/blue = 50,
/obj/item/clothing/under/rank/procedure/iaa/formal/blue/skirt = 50,
/obj/item/clothing/under/rank/procedure/iaa/formal/goodman = 50,
/obj/item/clothing/under/rank/procedure/iaa/formal/goodman/skirt = 50,
/obj/item/clothing/under/suit/female = 50,
/obj/item/clothing/suit/storage/iaa/blackjacket = 75,
/obj/item/clothing/suit/storage/iaa/bluejacket = 75,
@@ -849,7 +848,6 @@
/obj/item/clothing/shoes/black = 20,
/obj/item/clothing/shoes/brown = 20,
/obj/item/clothing/glasses/sunglasses/big = 30,
/obj/item/clothing/accessory/lawyers_badge = 50,
/obj/item/clothing/accessory/armband/procedure = 20)
refill_canister = /obj/item/vending_refill/lawdrobe
code/game/objects/items/devices/radio/radio_objects.dm
+1 -1
View File
@@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(default_internal_channels, list(
num2text(SCI_FREQ) = list(ACCESS_RESEARCH),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_HOP, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLOWN, ACCESS_MIME),
num2text(PROC_FREQ)= list(ACCESS_MAGISTRATE, ACCESS_NTREP, ACCESS_LAWYER)
num2text(PROC_FREQ)= list(ACCESS_MAGISTRATE, ACCESS_NTREP, ACCESS_INTERNAL_AFFAIRS)
))
GLOBAL_LIST_INIT(default_medbay_channels, list(
code/game/objects/items/toys.dm
+2 -2
View File
@@ -1457,10 +1457,10 @@
icon_state = "janitor"
toysay = "Look at the signs, you idiot."
/obj/item/toy/figure/crew/lawyer
/obj/item/toy/figure/crew/iaa
name = "\improper Internal Affairs Agent action figure"
desc = "The unappreciated Internal Affairs Agent, from Space Life's SS12 figurine collection."
icon_state = "lawyer"
icon_state = "internal_affairs"
toysay = "Standard Operating Procedure says they're guilty! Hacking is proof they're an Enemy of the Corporation!"
/obj/item/toy/figure/crew/librarian
code/game/objects/items/weapons/cards_ids.dm
+5 -5
View File
@@ -811,7 +811,7 @@
name = "Internal Affairs Agent ID"
registered_name = "Internal Affairs Agent"
icon_state = "internalaffairsagent"
access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING)
access = list(ACCESS_INTERNAL_AFFAIRS, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING)
/obj/item/card/id/geneticist
name = "Geneticist ID"
@@ -873,7 +873,7 @@
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_INTERNAL_AFFAIRS,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
@@ -919,7 +919,7 @@
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_INTERNAL_AFFAIRS,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_NTREP)
@@ -930,7 +930,7 @@
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_INTERNAL_AFFAIRS,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_BLUESHIELD)
@@ -941,7 +941,7 @@
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_INTERNAL_AFFAIRS,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_MAGISTRATE)
code/game/objects/mail.dm
+1 -1
View File
@@ -194,7 +194,7 @@
/obj/item/food/snacks/spesslaw,
/obj/item/clothing/head/collectable/petehat,
/obj/item/toy/figure/crew/captain,
/obj/item/toy/figure/crew/lawyer,
/obj/item/toy/figure/crew/iaa,
/obj/item/toy/figure/crew/dsquad,
/obj/item/storage/box/scratch_cards)
job_list = list("Captain", "Magistrate", "Nanotrasen Representative", "Blueshield", "Internal Affairs Agent")
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+2 -1
View File
@@ -1,8 +1,9 @@
/* Closets for specific jobs
* Contains:
* Bartender
* Chef
* Janitor
* Lawyer
* Paramedic
*/
/*
code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
+3 -2
View File
@@ -315,12 +315,12 @@
new /obj/item/gavelblock(src)
new /obj/item/gavelhammer(src)
new /obj/item/clothing/accessory/medal/legal(src)
new /obj/item/clothing/accessory/lawyers_badge(src)
new /obj/item/clothing/accessory/legal_badge(src)
new /obj/item/storage/bag/garment/magistrate(src)
/obj/structure/closet/secure_closet/iaa
name = "internal affairs locker"
req_access = list(ACCESS_LAWYER)
req_access = list(ACCESS_INTERNAL_AFFAIRS)
icon_opened = "magi_open"
icon_state = "iaa"
open_door_sprite = "chaplain_door"
@@ -334,3 +334,4 @@
new /obj/item/storage/briefcase(src)
new /obj/item/radio/headset/headset_iaa(src)
new /obj/item/radio/headset/headset_iaa(src)
new /obj/item/clothing/accessory/legal_badge/iaa(src)
code/modules/client/preference/character.dm
+1 -1
View File
@@ -1142,7 +1142,7 @@
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-explorer"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_LAWYER)
if(JOB_INTERNAL_AFFAIRS)
clothes_s = new /icon('icons/mob/clothing/under/procedure.dmi', "iaa_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
code/modules/clothing/under/accessories/accessory.dm
+28 -13
View File
@@ -459,40 +459,55 @@
return TRUE
/obj/item/clothing/accessory/holobadge/attack(mob/living/carbon/human/H, mob/living/user)
if(isliving(user))
if(H != user)
user.visible_message("<span class='warning'>[user] invades [H]'s personal space, thrusting [src] into [H.p_their()] face insistently.</span>",
"<span class='warning'>You invade [H]'s personal space, thrusting [src] into [H.p_their()] face insistently. You are the law.</span>")
"<span class='warning'>You invade [H]'s personal space, thrusting [src] into [H.p_their()] face insistently. You are THE LAW!</span>")
return
..()
//////////////
//OBJECTION!//
//////////////
/obj/item/clothing/accessory/lawyers_badge
name = "attorney's badge"
desc = "Fills you with the conviction of JUSTICE. Lawyers tend to want to show it to everyone they meet."
icon_state = "lawyerbadge"
item_state = "lawyerbadge"
item_color = "lawyerbadge"
/obj/item/clothing/accessory/legal_badge
name = "magistrate's badge"
desc = "Fills you with the conviction of JUSTICE. Display your mastery of Space Law to the world."
icon_state = "legal_badge"
item_state = "legal_badge"
item_color = "legal_badge"
var/cached_bubble_icon = null
var/what_you_are = "THE LAW"
/obj/item/clothing/accessory/lawyers_badge/attack_self(mob/user)
/obj/item/clothing/accessory/legal_badge/attack_self(mob/user)
if(prob(1))
user.say("The testimony contradicts the evidence!")
user.visible_message("<span class='notice'>[user] shows [user.p_their()] attorney's badge.</span>", "<span class='notice'>You show your attorney's badge.</span>")
user.visible_message("<span class='notice'>[user] shows [user.p_their()] [name].</span>", "<span class='notice'>You show your [name].</span>")
/obj/item/clothing/accessory/lawyers_badge/on_attached(obj/item/clothing/under/S, mob/user)
/obj/item/clothing/accessory/legal_badge/attack(mob/living/carbon/human/H, mob/living/user)
if(H != user)
user.visible_message("<span class='warning'>[user] invades [H]'s personal space, thrusting [src] into [H.p_their()] face insistently.</span>",
"<span class='warning'>You invade [H]'s personal space, thrusting [src] into [H.p_their()] face insistently. You are [what_you_are]!</span>")
return
..()
/obj/item/clothing/accessory/legal_badge/on_attached(obj/item/clothing/under/S, mob/user)
..()
if(has_suit && ismob(has_suit.loc))
var/mob/M = has_suit.loc
cached_bubble_icon = M.bubble_icon
M.bubble_icon = "lawyer"
M.bubble_icon = "legal"
/obj/item/clothing/accessory/lawyers_badge/on_removed(mob/user)
/obj/item/clothing/accessory/legal_badge/on_removed(mob/user)
if(has_suit && ismob(has_suit.loc))
var/mob/M = has_suit.loc
M.bubble_icon = cached_bubble_icon
..()
/obj/item/clothing/accessory/legal_badge/iaa
name = "internal affairs badge"
desc = "Marks you as an expert of Standard Operating Procedure, and as a soul-crushing paper pusher."
what_you_are = "HUMAN RESOURCES"
///////////
//SCARVES//
///////////
code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
+1 -1
View File
@@ -29,7 +29,7 @@
/obj/item/clothing/under/plasmaman/enviroslacks
name = "enviroslacks"
desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nanotrasen for its detectives, lawyers, and bartenders alike."
desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nanotrasen for its detectives, internal affairs agents, and bartenders alike."
icon_state = "enviroslacks"
item_state = "enviroslacks"
item_color = "enviroslacks"
code/modules/clothing/under/jobs/procedure.dm
+43 -40
View File
@@ -105,54 +105,57 @@
item_state = "iaa_blue"
item_color = "iaa_blue"
/obj/item/clothing/under/rank/procedure/lawyer
name = "lawyer suit"
desc = "Slick threads."
/obj/item/clothing/under/rank/procedure/iaa/formal
name = "Internal Affairs formal uniform"
desc = "Slick threads, for the Internal Affairs Agent with ambitions of grandeur."
/obj/item/clothing/under/rank/procedure/lawyer/black
icon_state = "lawyer_black"
item_state = "lawyer_black"
item_color = "lawyer_black"
/obj/item/clothing/under/rank/procedure/iaa/formal/black
icon_state = "iaa_formal_black"
item_state = "iaa_formal_black"
item_color = "iaa_formal_black"
/obj/item/clothing/under/rank/procedure/lawyer/black/skirt
name = "lawyer skirt"
icon_state = "lawyer_black_skirt"
item_state = "lawyer_black_skirt"
item_color = "lawyer_black_skirt"
/obj/item/clothing/under/rank/procedure/iaa/formal/black/skirt
name = "Internal Affairs formal skirt"
icon_state = "iaa_formal_black_skirt"
item_state = "iaa_formal_black_skirt"
item_color = "iaa_formal_black_skirt"
/obj/item/clothing/under/rank/procedure/lawyer/red
name = "lawyer red suit"
icon_state = "lawyer_red"
item_state = "lawyer_red"
item_color = "lawyer_red"
/obj/item/clothing/under/rank/procedure/iaa/formal/red
name = "Internal Affairs formal red suit"
icon_state = "iaa_formal_red"
item_state = "iaa_formal_red"
item_color = "iaa_formal_red"
/obj/item/clothing/under/rank/procedure/lawyer/red/skirt
name = "lawyer red skirt"
icon_state = "lawyer_red_skirt"
item_state = "lawyer_red_skirt"
item_color = "lawyer_red_skirt"
/obj/item/clothing/under/rank/procedure/iaa/formal/red/skirt
name = "Internal Affairs formal red skirt"
icon_state = "iaa_formal_red_skirt"
item_state = "iaa_formal_red_skirt"
item_color = "iaa_formal_red_skirt"
/obj/item/clothing/under/rank/procedure/lawyer/blue
name = "lawyer blue suit"
icon_state = "lawyer_blue"
item_state = "lawyer_blue"
item_color = "lawyer_blue"
/obj/item/clothing/under/rank/procedure/iaa/formal/blue
name = "Internal Affairs formal blue suit"
icon_state = "iaa_formal_blue"
item_color = "iaa_formal_blue"
/obj/item/clothing/under/rank/procedure/lawyer/blue/skirt
name = "lawyer blue skirt"
icon_state = "lawyer_blue_skirt"
item_state = "lawyer_blue_skirt"
item_color = "lawyer_blue_skirt"
/obj/item/clothing/under/rank/procedure/iaa/formal/blue/skirt
name = "Internal Affairs formal blue skirt"
icon_state = "iaa_formal_blue_skirt"
item_state = "iaa_formal_blue_skirt"
item_color = "iaa_formal_blue_skirt"
/obj/item/clothing/under/rank/procedure/lawyer/goodman
/obj/item/clothing/under/rank/procedure/iaa/formal/goodman // You get ONE lawyer reference, IAA...
name = "criminal lawyer suit"
desc = "It's all good, man!"
icon_state = "lawyer_goodman"
item_state = "lawyer_goodman"
item_color = "lawyer_goodman"
icon_state = "iaa_formal_goodman"
item_state = "iaa_formal_goodman"
item_color = "iaa_formal_goodman"
/obj/item/clothing/under/rank/procedure/lawyer/goodman/skirt
/obj/item/clothing/under/rank/procedure/iaa/formal/goodman/examine(mob/user)
. = ..()
. += "<span class='notice'>Now all you need is a law degree and a job that actually deals with the law...</span>" // But don't get any ideas about it meaning anything.
/obj/item/clothing/under/rank/procedure/iaa/formal/goodman/skirt
name = "criminal lawyer skirt"
icon_state = "lawyer_goodman_skirt"
item_state = "lawyer_goodman_skirt"
item_color = "lawyer_goodman_skirt"
icon_state = "iaa_formal_goodman_skirt"
item_state = "iaa_formal_goodman_skirt"
item_color = "iaa_formal_goodman_skirt"
code/modules/mapping/access_helpers.dm
+2 -2
View File
@@ -171,7 +171,7 @@
access = ACCESS_HOS
/obj/effect/mapping_helpers/airlock/access/any/security/iaa
access = ACCESS_LAWYER
access = ACCESS_INTERNAL_AFFAIRS
// -------------------- Service access helpers
/obj/effect/mapping_helpers/airlock/access/any/service
@@ -390,7 +390,7 @@
access = ACCESS_HOS
/obj/effect/mapping_helpers/airlock/access/all/security/iaa
access = ACCESS_LAWYER
access = ACCESS_INTERNAL_AFFAIRS
// -------------------- Service access helpers
/obj/effect/mapping_helpers/airlock/access/all/service
code/modules/mapping/windoor_access_helpers.dm
+2 -2
View File
@@ -181,7 +181,7 @@
access = ACCESS_HOS
/obj/effect/mapping_helpers/airlock/windoor/access/any/security/iaa
access = ACCESS_LAWYER
access = ACCESS_INTERNAL_AFFAIRS
// -------------------- Service access helpers
/obj/effect/mapping_helpers/airlock/windoor/access/any/service
@@ -390,7 +390,7 @@
access = ACCESS_HOS
/obj/effect/mapping_helpers/airlock/windoor/access/all/security/iaa
access = ACCESS_LAWYER
access = ACCESS_INTERNAL_AFFAIRS
// -------------------- Service access helpers
/obj/effect/mapping_helpers/airlock/windoor/access/all/service
code/modules/paperwork/faxmachine.dm
+1 -1
View File
@@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
/// Can we send messages off-station?
var/long_range_enabled = FALSE
req_one_access = list(ACCESS_LAWYER, ACCESS_HEADS, ACCESS_ARMORY)
req_one_access = list(ACCESS_INTERNAL_AFFAIRS, ACCESS_HEADS, ACCESS_ARMORY)
idle_power_consumption = 30
active_power_consumption = 200
code/modules/pda/cart.dm
+1 -1
View File
@@ -91,7 +91,7 @@
new /datum/data/pda/app/janitor
)
/obj/item/cartridge/lawyer
/obj/item/cartridge/iaa
name = "P.R.O.V.E. Cartridge"
desc = "A data cartridge for portable microcomputers. Has security records."
icon_state = "cart-s"
code/modules/pda/pdas.dm
+3 -3
View File
@@ -153,9 +153,9 @@
icon_state = "pda-chaplain"
ttone = "holy"
/obj/item/pda/lawyer
default_cartridge = /obj/item/cartridge/lawyer
icon_state = "pda-lawyer"
/obj/item/pda/iaa
default_cartridge = /obj/item/cartridge/iaa
icon_state = "pda-iaa"
ttone = "..."
default_pen = /obj/item/pen/multi
icons/mob/clothing/species/drask/under/procedure.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 18 KiB

icons/mob/clothing/species/grey/under/procedure.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 17 KiB

icons/mob/clothing/species/kidan/under/procedure.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 18 KiB

icons/mob/clothing/species/vox/under/procedure.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 18 KiB

icons/mob/clothing/under/procedure.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 17 KiB

icons/mob/talk.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 34 KiB

icons/mob/ties.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 23 KiB

icons/obj/clothing/ties.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 22 KiB

icons/obj/clothing/under/procedure.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

icons/obj/pda.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

icons/obj/toy.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 64 KiB

strings/ion_laws.json
+1 -1
View File
@@ -659,7 +659,7 @@
"SECURITY OFFICERS",
"WARDENS",
"DETECTIVES",
"LAWYERS",
"INTERNAL AFFAIRS AGENTS",
"CHIEF ENGINEERS",
"STATION ENGINEERS",
"ATMOSPHERIC TECHNICIANS",