mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 19:13:30 +01:00
Completely Purges Any Suggestion That The IAA is a Lawyer. (#25371)
* 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
@@ -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)
|
||||
|
||||
@@ -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//
|
||||
///////////
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user