diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 4c71c36f26e..cce20b731c2 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -191,7 +191,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H) clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) if("Lawyer") - clothes_s = new /icon('icons/mob/uniform.dmi', "lawyer_blue_s") + clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) if("Chaplain") clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s") diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 7ed4080bf21..a7e24bf1e22 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -326,19 +326,18 @@ -var/global/lawyer = 0//Checks for another lawyer +//var/global/lawyer = 0//Checks for another lawyer //This changed clothes on 2nd lawyer, both IA get the same dreds. /datum/job/lawyer - title = "Lawyer" + title = "Internal Affairs Agent" flag = LAWYER department_flag = CIVILIAN faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the head of personnel" + supervisors = "the captain" selection_color = "#dddddd" access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels) minimal_access = list(access_lawyer, access_court, access_sec_doors) - alt_titles = list("Attorney", "IA Consultant") equip(var/mob/living/carbon/human/H) @@ -347,21 +346,19 @@ var/global/lawyer = 0//Checks for another lawyer if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - if(!lawyer) - lawyer = 1 - H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/bluesuit(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/lawyer/bluejacket(H), slot_wear_suit) - else - H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/purpsuit(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/lawyer/purpjacket(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/internalaffairs(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/device/pda/lawyer(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_l_hand) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) + L.imp_in = H + L.implanted = 1 return 1 diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e0cb6b3e0bd..4da2378e65c 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -144,7 +144,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/lawyer default_cartridge = /obj/item/weapon/cartridge/lawyer icon_state = "pda-lawyer" - ttone = "objection" + ttone = "..." /obj/item/device/pda/botanist //default_cartridge = /obj/item/weapon/cartridge/botanist diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 77af80b677a..a5550e132ad 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -113,6 +113,35 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS +//Internal Affairs +/obj/item/clothing/suit/storage/internalaffairs + name = "Internal Affairs Jacket" + desc = "A smooth black jacket." + icon_state = "ia_jacket_open" + item_state = "ia_jacket" + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO|ARMS + + verb/toggle() + set name = "Toggle Coat Buttons" + set category = "Object" + set src in usr + + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + switch(icon_state) + if("ia_jacket_open") + src.icon_state = "ia_jacket" + usr << "You button up the jacket." + if("ia_jacket") + src.icon_state = "ia_jacket_open" + usr << "You unbutton the jacket." + else + usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are." + return + usr.update_inv_wear_suit() //so our overlays update + //Mime /obj/item/clothing/suit/suspenders name = "suspenders" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 41472e3f35b..b5d68643106 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -80,6 +80,15 @@ flags = FPRINT | TABLEPASS +/obj/item/clothing/under/rank/internalaffairs + desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched." + name = "Internal Affairs uniform" + icon_state = "internalaffairs" + item_state = "internalaffairs" + color = "internalaffairs" + flags = FPRINT | TABLEPASS + + /obj/item/clothing/under/rank/janitor desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." name = "janitor's jumpsuit" diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index b7b8c32393e..5c182589547 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -302,7 +302,7 @@ datum/preferences if(4) clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) if(LAWYER) - clothes_s = new /icon('icons/mob/uniform.dmi', "lawyer_blue_s") + clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "briefcase"), ICON_UNDERLAY) diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 6e9fd6de034..5d80a05bf77 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 4bd0defd1da..c10e4b6ae11 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 8bcbb5b9d02..db6f3dc4619 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 93b2445eff0..37a20545505 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 3a390419335..d50d9c1a623 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ