diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 70b3b09ae74..1ff78da0ea2 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -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" }, diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 576e96f53a7..ddc73926e49 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -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 diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 71323d47d91..330d9dca9e4 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -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, diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm index a897dba5de2..4043b927049 100644 --- a/code/__DEFINES/access_defines.dm +++ b/code/__DEFINES/access_defines.dm @@ -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 diff --git a/code/__DEFINES/job_defines.dm b/code/__DEFINES/job_defines.dm index 4196d1843ab..54e041e11a3 100644 --- a/code/__DEFINES/job_defines.dm +++ b/code/__DEFINES/job_defines.dm @@ -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) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index c56c4a1e275..d879566e467 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -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") diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm index b57ea0a531e..14996e6a5bd 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -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) diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index db21f29f566..455c7048986 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -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 diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index c76b1211158..77d58911fed 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -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" diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 48c6eacb159..85e5c7df96f 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -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 ) diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 5c2e1f4a658..48e12618c38 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -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 diff --git a/code/game/objects/items/devices/radio/radio_objects.dm b/code/game/objects/items/devices/radio/radio_objects.dm index 259dca4e9ca..f960d25e090 100644 --- a/code/game/objects/items/devices/radio/radio_objects.dm +++ b/code/game/objects/items/devices/radio/radio_objects.dm @@ -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( diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index d7d0ea0e536..6de7872a42b 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -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 diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index a6585f225d0..c6c84d2f11a 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -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) diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm index 6a437f9a735..6726c7ff2f6 100644 --- a/code/game/objects/mail.dm +++ b/code/game/objects/mail.dm @@ -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") diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 161dab3e204..fedd1979d41 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -1,8 +1,9 @@ /* Closets for specific jobs * Contains: * Bartender +* Chef * Janitor - * Lawyer + * Paramedic */ /* diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm index 9c5d4817a46..e5e5eb02a2a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm @@ -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) diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index f5392bd3ae2..4b1932990b3 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -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) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 3b7effb8727..c8bb0f64800 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -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("[user] invades [H]'s personal space, thrusting [src] into [H.p_their()] face insistently.", - "You invade [H]'s personal space, thrusting [src] into [H.p_their()] face insistently. You are the law.") + "You invade [H]'s personal space, thrusting [src] into [H.p_their()] face insistently. You are THE LAW!") + 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("[user] shows [user.p_their()] attorney's badge.", "You show your attorney's badge.") + user.visible_message("[user] shows [user.p_their()] [name].", "You show your [name].") -/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("[user] invades [H]'s personal space, thrusting [src] into [H.p_their()] face insistently.", + "You invade [H]'s personal space, thrusting [src] into [H.p_their()] face insistently. You are [what_you_are]!") + 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// /////////// diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index b1be1bbd757..ad986528c74 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -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" diff --git a/code/modules/clothing/under/jobs/procedure.dm b/code/modules/clothing/under/jobs/procedure.dm index 3cbd3852f33..33a997dc218 100644 --- a/code/modules/clothing/under/jobs/procedure.dm +++ b/code/modules/clothing/under/jobs/procedure.dm @@ -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) + . = ..() + . += "Now all you need is a law degree and a job that actually deals with the law..." // 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" diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 060f4a65261..66661ae3c65 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -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 diff --git a/code/modules/mapping/windoor_access_helpers.dm b/code/modules/mapping/windoor_access_helpers.dm index b9db5e37100..8d3195cf9ca 100644 --- a/code/modules/mapping/windoor_access_helpers.dm +++ b/code/modules/mapping/windoor_access_helpers.dm @@ -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 diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 51a6c0a13a5..98d0832d2f1 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -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 diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index 75deb8f685d..b345a8dfdeb 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -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" diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm index 5bce65c3339..3b848311b7e 100644 --- a/code/modules/pda/pdas.dm +++ b/code/modules/pda/pdas.dm @@ -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 diff --git a/icons/mob/clothing/species/drask/under/procedure.dmi b/icons/mob/clothing/species/drask/under/procedure.dmi index d589df04cd4..c37680565ab 100644 Binary files a/icons/mob/clothing/species/drask/under/procedure.dmi and b/icons/mob/clothing/species/drask/under/procedure.dmi differ diff --git a/icons/mob/clothing/species/grey/under/procedure.dmi b/icons/mob/clothing/species/grey/under/procedure.dmi index 65b3d0ca39e..de23d9fd563 100644 Binary files a/icons/mob/clothing/species/grey/under/procedure.dmi and b/icons/mob/clothing/species/grey/under/procedure.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/procedure.dmi b/icons/mob/clothing/species/kidan/under/procedure.dmi index ec1a77971c6..a49b96fd8c7 100644 Binary files a/icons/mob/clothing/species/kidan/under/procedure.dmi and b/icons/mob/clothing/species/kidan/under/procedure.dmi differ diff --git a/icons/mob/clothing/species/vox/under/procedure.dmi b/icons/mob/clothing/species/vox/under/procedure.dmi index 8edfb44e536..63c34639e8c 100644 Binary files a/icons/mob/clothing/species/vox/under/procedure.dmi and b/icons/mob/clothing/species/vox/under/procedure.dmi differ diff --git a/icons/mob/clothing/under/procedure.dmi b/icons/mob/clothing/under/procedure.dmi index 3b2b9d6b97c..3ce7dbbe414 100644 Binary files a/icons/mob/clothing/under/procedure.dmi and b/icons/mob/clothing/under/procedure.dmi differ diff --git a/icons/mob/talk.dmi b/icons/mob/talk.dmi index 08c2c06f7c5..2f61b241fa1 100644 Binary files a/icons/mob/talk.dmi and b/icons/mob/talk.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 9e75a84b8c2..091dbe3d138 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 67df0290cfe..bfa8ecb6cf8 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/under/procedure.dmi b/icons/obj/clothing/under/procedure.dmi index a78e716bf8b..b76f878f5a4 100644 Binary files a/icons/obj/clothing/under/procedure.dmi and b/icons/obj/clothing/under/procedure.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 612cf6c127d..4a94ae54f57 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 0d4cb70893a..8f07241ef18 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/strings/ion_laws.json b/strings/ion_laws.json index d0db5f5d6b4..f9bddbf47ad 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -659,7 +659,7 @@ "SECURITY OFFICERS", "WARDENS", "DETECTIVES", - "LAWYERS", + "INTERNAL AFFAIRS AGENTS", "CHIEF ENGINEERS", "STATION ENGINEERS", "ATMOSPHERIC TECHNICIANS",