diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 6c68ff89b6e..a7e564d8a55 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -281,6 +281,7 @@ new /obj/item/clothing/under/lawyer/oldman(src) new /obj/item/clothing/under/lawyer/black(src) new /obj/item/clothing/under/lawyer/female(src) + new /obj/item/clothing/under/rank/centcom/representative(src) new /obj/item/clothing/head/ntrep(src) new /obj/item/clothing/shoes/sandal/fancy(src) new /obj/item/storage/box/tapes(src) @@ -434,3 +435,29 @@ icon_state = icon_closed else icon_state = icon_opened + +/obj/structure/closet/secure_closet/magistrate + name = "\improper Magistrate's locker" + req_access = list(access_magistrate) + icon_state = "magistratesecure1" + icon_closed = "magistratesecure" + icon_locked = "magistratesecure1" + icon_opened = "magistratesecureopen" + icon_broken = "magistratesecurebroken" + icon_off = "magistratesecureoff" + +/obj/structure/closet/secure_closet/magistrate/New() + ..() + new /obj/item/book/manual/faxes(src) + new /obj/item/storage/secure/briefcase(src) + new /obj/item/flash(src) + new /obj/item/clothing/glasses/sunglasses(src) + new /obj/item/clothing/gloves/color/white(src) + new /obj/item/clothing/shoes/centcom(src) + new /obj/item/clothing/under/suit_jacket/really_black(src) + new /obj/item/clothing/under/rank/centcom/magistrate(src) + new /obj/item/clothing/suit/judgerobe(src) + new /obj/item/clothing/head/powdered_wig(src) + new /obj/item/gavelblock(src) + new /obj/item/gavelhammer(src) + new /obj/item/clothing/head/justice_wig(src) \ No newline at end of file diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index b875301083d..80eb0a701d7 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -17,8 +17,8 @@ You can set verify to TRUE if you want send() to sleep until the client has the //When sending mutiple assets, how many before we give the client a quaint little sending resources message #define ASSET_CACHE_TELL_CLIENT_AMOUNT 8 -//When passively preloading assets, how many to send at once? Too high creates noticable lag where as too low can flood the client's cache with "verify" files -#define ASSET_CACHE_PRELOAD_CONCURRENT 3 +//When passively preloading assets, how many to send at once? Too high creates noticable lag where as too low can flood the client's cache with "verify" files +#define ASSET_CACHE_PRELOAD_CONCURRENT 3 /client var/list/cache = list() // List of all assets sent to this client by the asset cache. @@ -191,6 +191,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the "large_stamp-cent.png" = 'icons/paper_icons/large_stamp-cent.png', "large_stamp-syndicate.png" = 'icons/paper_icons/large_stamp-syndicate.png', "large_stamp-rep.png" = 'icons/paper_icons/large_stamp-rep.png', + "large_stamp-magistrate.png"= 'icons/paper_icons/large_stamp-magistrate.png', "talisman.png" = 'icons/paper_icons/talisman.png', "ntlogo.png" = 'icons/paper_icons/ntlogo.png' ) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e5c81eb8d18..5bc13912a04 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -20,6 +20,12 @@ icon_state = "pwig" item_state = "pwig" +/obj/item/clothing/head/justice_wig + name = "Justice wig" + desc = "A fancy powdered wig given to arbitrators of the law. It looks itchy." + icon_state = "jwig" + item_state = "jwig" + /obj/item/clothing/head/beret/blue icon_state = "beret_blue" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 5aa8159cc3e..7768d0032b7 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -145,6 +145,19 @@ ..() desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears [station_name()] on the left shoulder." +/obj/item/clothing/under/rank/centcom/magistrate + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder." + name = "\improper Nanotrasen Navy Uniform" + icon_state = "officer" + item_state = "g_suit" + item_color = "officer" + displays_id = 0 + flags_size = ONESIZEFITSALL + +/obj/item/clothing/under/rank/centcom/magistrate/New() + ..() + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears [station_name()] on the left shoulder." + /obj/item/clothing/under/rank/centcom/diplomatic desc = "A very gaudy and official looking uniform of the Nanotrasen Diplomatic Corps." name = "\improper Nanotrasen Diplomatic Uniform" diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 3aa21c5a5d0..9bb3a09ebb0 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -76,7 +76,12 @@ name = "Nanotrasen Representative's rubber stamp" icon_state = "stamp-rep" item_color = "rep" - + +/obj/item/stamp/magistrate + name = "Magistrate's rubber stamp" + icon_state = "stamp-magistrate" + item_color = "rep" + /obj/item/stamp/centcom name = "Central Command rubber stamp" icon_state = "stamp-cent" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 99441b44f64..eb4251448f9 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index d4d3fc5b187..56620c267b1 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index de22e917ddc..e07e47a3311 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4cab586583a..dd660cd893e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/paper_icons/large_stamp-magistrate.png b/icons/paper_icons/large_stamp-magistrate.png new file mode 100644 index 00000000000..21c283026e8 Binary files /dev/null and b/icons/paper_icons/large_stamp-magistrate.png differ