From 3a7d424005aa4742c9d0316eed367a4e843bc250 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 2 May 2017 11:21:54 -0400 Subject: [PATCH] Curator Update --- .../map_files/Deltastation/DeltaStation2.dmm | 24 +++++++++++++++---- _maps/map_files/MetaStation/MetaStation.dmm | 20 +++++++++++----- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 6 ++--- .../objects/items/weapons/storage/bags.dm | 10 ++++++++ code/game/objects/structures/displaycase.dm | 3 +++ code/modules/jobs/job_types/civilian.dm | 2 +- 6 files changed, 51 insertions(+), 14 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index c46f6ea8305..a41877e9f26 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -112311,6 +112311,22 @@ }, /turf/open/floor/plasteel/neutral, /area/atmos) +"ehO" = ( +/obj/structure/displaycase/trophy, +/turf/open/floor/wood, +/area/library) +"ehP" = ( +/obj/structure/displaycase/trophy, +/turf/open/floor/wood, +/area/library) +"ehQ" = ( +/obj/structure/displaycase/trophy, +/turf/open/floor/wood, +/area/library) +"ehR" = ( +/obj/structure/displaycase/trophy, +/turf/open/floor/wood, +/area/library) (1,1,1) = {" aaa @@ -143544,7 +143560,7 @@ cbA cdn ceS cgp -chQ +ehO cjl ckP cjl @@ -143801,7 +143817,7 @@ cbB cdo ceS cgq -chQ +ehP cjl ckP cjl @@ -144315,7 +144331,7 @@ bWi cdq ceS cgp -chQ +ehQ cjm ckP cmk @@ -144572,7 +144588,7 @@ cbC cdr ceT cgp -chQ +ehR cjn ckP cmk diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 320823a490e..f6e571f8698 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -45372,12 +45372,12 @@ name = "Port Maintenance" }) "bBr" = ( -/obj/structure/table/wood, /obj/machinery/airalarm{ dir = 4; pixel_x = -23; pixel_y = 0 }, +/obj/structure/displaycase/trophy, /turf/open/floor/wood, /area/library) "bBs" = ( @@ -47035,7 +47035,6 @@ name = "\improper Auxiliary Restrooms" }) "bEw" = ( -/obj/structure/table/wood, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32; pixel_y = 0 @@ -47044,6 +47043,7 @@ dir = 4; network = list("SS13") }, +/obj/structure/displaycase/trophy, /turf/open/floor/wood, /area/library) "bEx" = ( @@ -95333,6 +95333,14 @@ icon_state = "xenomaint"; name = "Xeno Maintenance" }) +"dmD" = ( +/obj/structure/displaycase/trophy, +/turf/open/floor/wood, +/area/library) +"dmE" = ( +/obj/structure/displaycase/trophy, +/turf/open/floor/wood, +/area/library) (1,1,1) = {" aaa @@ -114481,7 +114489,7 @@ bwa bxU bzD bBr -bCT +bSx bEw bzE bHR @@ -114737,9 +114745,9 @@ bue bwb bxV bzE -bBs -bCU -bBs +dmD +bzE +dmE bzE bHR bJz diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index aa5e44a5210..ad0da0ed09e 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -19609,7 +19609,7 @@ /turf/open/floor/wood, /area/library) "aRO" = ( -/obj/structure/bookcase/random/nonfiction, +/obj/structure/displaycase/trophy, /turf/open/floor/wood, /area/library) "aRP" = ( @@ -108807,7 +108807,7 @@ aIt aPd aIt aRO -aIt +aRO aUC aVP aXu @@ -109064,7 +109064,7 @@ aNV aPd aIt aRO -aIt +aRO aIt aVQ aXu diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 266fe875792..345eb034b83 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -291,6 +291,16 @@ can_hold = list(/obj/item/weapon/book, /obj/item/weapon/storage/book, /obj/item/weapon/spellbook) resistance_flags = FLAMMABLE +/obj/item/weapon/storage/bag/books/curator/New() + ..() + new /obj/item/clothing/shoes/workboots/mining(src) + new /obj/item/clothing/head/curator(src) + new /obj/item/clothing/suit/curator(src) + new /obj/item/clothing/under/rank/librarian/curator(src) + new /obj/item/weapon/melee/curator_whip(src) + new /obj/item/weapon/storage/backpack/satchel/explorer(src) + + /* * Trays - Agouri */ diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 3bf87ea9f98..31f7b493b6b 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -278,6 +278,9 @@ if(!user.Adjacent(src)) //no TK museology return + if(!(user.mind && user.mind.assigned_role == "Librarian")) + to_chat(user, "You're not sure how to work this. Maybe you should as the librarian for help.") + if(!added_roundstart) to_chat(user, "You've already put something new in this case.") return diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index 3ff8892d7e4..ad375b3710d 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -136,7 +136,7 @@ Librarian belt = /obj/item/device/pda/librarian uniform = /obj/item/clothing/under/rank/librarian - l_hand = /obj/item/weapon/storage/bag/books + l_hand = /obj/item/weapon/storage/bag/books/curator r_pocket = /obj/item/weapon/barcodescanner l_pocket = /obj/item/device/laser_pointer backpack_contents = list(