From 7682bacc63aa882263d3d201178755cb74630b92 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 20 Aug 2019 03:55:16 -0400 Subject: [PATCH 1/7] Adds Pathfinder's Cataloguer Uses the tricorder sprites, the only special thing about it is that it can be closed up when stowed away. Cannot scan anything while it is closed up. --- code/modules/catalogue/cataloguer_vr.dm | 43 ++++++++++++++++++ icons/vore/custom_items_vr.dmi | Bin 55084 -> 55089 bytes .../structures/closets/misc_vr.dm | 2 +- vorestation.dme | 1 + 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 code/modules/catalogue/cataloguer_vr.dm diff --git a/code/modules/catalogue/cataloguer_vr.dm b/code/modules/catalogue/cataloguer_vr.dm new file mode 100644 index 00000000000..1e1c507c76d --- /dev/null +++ b/code/modules/catalogue/cataloguer_vr.dm @@ -0,0 +1,43 @@ +/obj/item/device/cataloguer/pathfinder + name = "pathfinder's cataloguer" + w_class = ITEMSIZE_SMALL + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "tricorder" + action_button_name = "Toggle Cataloguer" + var/deployed = TRUE + +/obj/item/device/cataloguer/pathfinder/ui_action_click() + toggle() + +/obj/item/device/cataloguer/pathfinder/verb/toggle() + set name = "Toggle Cataloguer" + set category = "Object" + + if(busy) + to_chat(user, span("warning", "\The [src] is currently scanning something.")) + return + deployed = !(deployed) + if(deployed) + w_class = ITEMSIZE_NORMAL + icon_state = "tricorder" + to_chat(usr, span("notice", "You flip open \the [src].")) + else + w_class = ITEMSIZE_SMALL + icon_state = "tricorder_closed" + to_chat(usr, span("notice", "You close \the [src].")) + + if (ismob(usr)) + var/mob/M = usr + M.update_action_buttons() + +/obj/item/device/cataloguer/pathfinder/afterattack(atom/target, mob/user, proximity_flag) + if(!deployed) + to_chat(user, span("warning", "\The [src] is closed.")) + return + return ..() + +/obj/item/device/cataloguer/pathfinder/pulse_scan(mob/user) + if(!deployed) + to_chat(user, span("warning", "\The [src] is closed.")) + return + return ..() diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index ce38b5318da433ca7ab3da543152ed4649cd20ee..86ff171e415aa69d2adc39ef5de7b3d594a91c5c 100644 GIT binary patch delta 1037 zcmV+o1oHc=t^={I1CS(t?0QsKbVOxyV{&P5bZKvH004NLotVvT<2Ve*&&g95Ggqg` zS7&z*xh&cl^f0~b0|>N5TWVy{pp>}o)9)c|oTTwkDSSzQA4!R#|D^mq`}gtJ({uLl z`)RsI4wihj$<}xC>7=tdnrxG;meYwrTbp?J6Cy;+Hrcnwrj31n_FsgE-=-67Ib@q` zF`ZNl4IX|U*%t!;X4_Pbd=d$4VGNuYilL>LZL-B8U;Le)*c#x5eBZo~bKdfG7k^DB z8Xff6CR@()#qgZ3p#WXW`)@VOUI^rEwHjvNb$=aPo~-FUzc35Xw#NF=jGV!4SEiyJ zaKYfU2*0OQZEX~P*@koq_R~SFp21UO2q>qoa!{)ZH8Mn-P(=now}w0h5oOSpS}3=& zQ*u-qu(yO)4HW~v9xdg6@*kHK2yCIDLb);ft2B#rX~6nXuP3Fr$ge(^p2i~H;wf|x z*Q;3pwV2xhofVEqTa+t!u=&$@40vfnM=bjVCT04T(&`s~^d7zZZd49x^;%LRl3U|! zh4Vyik;pA&jmnpoMyo{UiuTA3dhrYnctNkCg@C=t< zL5HulW#}7_%b`WD3^}>R?7lbT$d068{i*NW&!-c{&U$?z5YUF5lXDcYX_Kn|{e)89 z?g5=aQ;3y+xXM?bYy)WR@GRKKFIwEE~cGxkg`(wD!}Ih9;#qAEpmERhpqD zR+{7*ifl__jUyw`HByz1LV~mo22e)3AE}zvkiT`l&ezuqZ}8RJ6uCjIMjHJW0;lf0 zfO5NQm2FxFW3qnQ1LtRh9n%Yzk$6T`C2PP3El0_J&)ZXqDjqO3I#&G<8~Nvku6I@C zFsa+Vqq4}pgR;CHKzZK{^uSAJ~z9?Vq&K`Q0*~-z~2gFK!65_(GtF!Kf55 z{{WRNAsxA@w(Nqj=;X$8#Lw@*BXo=2+1f3eWu$&OXfI~`r@nGb*fg80$*?9a!)pPsXa zpHK5w6a@j@WG)oNIP*Zp;HJ$k46{6Z{1+ZyX9BXS12Lz#+p zzy*WXBK#3nwYO1!WE;{c*k2B6^$eaOLqIuvm4jMUsF5Msge)=$x;5l6h$w@$)IzzJ zm6D^A;) z+-?>H)M9K0bWu1WZBfqPLFT{CW57!rI$~KbFe%fwl$O7LpkL9;ccXGptGALGk=z?+ zD_kaWt3+-s*Qk7bDYQvcuILrnK`)-c5ijUXR2;EsF+_8a&#PeSd?bnq2A<*a z6?FJ!TZX;?IUQQ`%8-+D%)a)99NCF5Y`^rq`{jJb*jcYH3Iw#_;N%!ZY}%yk|2UzP z+dZHQXbLfZ6F2$hi);X`9iADRIEG7sbCcTylVwBLAlK;2iPk<&X=qY<^Ktr+L!}vN zVx>vWp~$u*);KW|T_aWLC?u5DL13cQZidip^KHJpo^ykm<|d;J>i^Mjs?!CO`$Ma2 z(>j={=;QXcJe%p5Ua*YB3#uyl`hU{0mHfOjr4+<}Bc>)Nsvlwx|Juv-p{g7vHQEnU zuCE`UTv?Bx>~{k_Fc{Z?d3s3LHP+jFy%~Gi&>^5Im^yhJ9I?tEXweI-YsF;WGk$kD%+qmZ7MwH<>JLwTVJb^NeAtI{~4?aXlXpARvDf>UL6Yh`N=<;rVoiFd!SA;p@_k#lw$q~D!GJo zI3`ViUrgpgZort9AMtatxaY`O-1&mNy2vWK5f^M3)*`dhvF{t5m703ZNKL_t)u HAp{W9kZTe; diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index 384aa93134a..f7177109322 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -118,7 +118,7 @@ /obj/item/clothing/accessory/holster/machete, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, - /obj/item/device/cataloguer) + /obj/item/device/cataloguer/pathfinder) /obj/structure/closet/secure_closet/pathfinder/Initialize() if(prob(50)) diff --git a/vorestation.dme b/vorestation.dme index 055a9dcfcaf..62ae38f0d51 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1532,6 +1532,7 @@ #include "code\modules\catalogue\catalogue_data_vr.dm" #include "code\modules\catalogue\cataloguer.dm" #include "code\modules\catalogue\cataloguer_visuals.dm" +#include "code\modules\catalogue\cataloguer_vr.dm" #include "code\modules\catalogue\rewards\construction.dm" #include "code\modules\catalogue\rewards\equipment_vendor.dm" #include "code\modules\catalogue\rewards\exp_point_items.dm" From a4990aedf3081d62be454a7bc62170175a2a984e Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 20 Aug 2019 03:57:30 -0400 Subject: [PATCH 2/7] Keeps the dmi unchanged --- code/modules/catalogue/cataloguer_vr.dm | 6 ++++++ icons/vore/custom_items_vr.dmi | Bin 55089 -> 55084 bytes 2 files changed, 6 insertions(+) diff --git a/code/modules/catalogue/cataloguer_vr.dm b/code/modules/catalogue/cataloguer_vr.dm index 1e1c507c76d..759f4774db0 100644 --- a/code/modules/catalogue/cataloguer_vr.dm +++ b/code/modules/catalogue/cataloguer_vr.dm @@ -6,6 +6,12 @@ action_button_name = "Toggle Cataloguer" var/deployed = TRUE +/obj/item/device/cataloguer/pathfinder/update_icon() + if(busy) + icon_state = "[initial(icon_state)]_s" + else + icon_state = initial(icon_state) + /obj/item/device/cataloguer/pathfinder/ui_action_click() toggle() diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index 86ff171e415aa69d2adc39ef5de7b3d594a91c5c..ce38b5318da433ca7ab3da543152ed4649cd20ee 100644 GIT binary patch delta 1037 zcmV+o1oHc_t^=&D1CS(t=Xz9FbVOxyV{&P5bZKvH004NLt(eVn<2DR{&-PPjcCT{A zf7!MNUph%UIczR{01hNVB4disfOHh)>3eWu$&OXfI~`r@nGb*fg80$*?9a!)pPsXa zpHK5w6a@j@WG)oNIP*Zp;HJ$k46{6Z{1+ZyX9BXS12Lz#+p zzy*WXBK#3nwYO1!WE;{c*k2B6^$eaOLqIuvm4jMUsF5Msge)=$x;5l6h$w@$)IzzJ zm6D^A;) z+-?>H)M9K0bWu1WZBfqPLFT{CW57!rI$~KbFe%fwl$O7LpkL9;ccXGptGALGk=z?+ zD_kaWt3+-s*Qk7bDYQvcuILrnK`)-c5ijUXR2;EsF+_8a&#PeSd?bnq2A<*a z6?FJ!TZX;?IUQQ`%8-+D%)a)99NCF5Y`^rq`{jJb*jcYH3Iw#_;N%!ZY}%yk|2UzP z+dZHQXbLfZ6F2$hi);X`9iADRIEG7sbCcTylVwBLAlK;2iPk<&X=qY<^Ktr+L!}vN zVx>vWp~$u*);KW|T_aWLC?u5DL13cQZidip^KHJpo^ykm<|d;J>i^Mjs?!CO`$Ma2 z(>j={=;QXcJe%p5Ua*YB3#uyl`hU{0mHfOjr4+<}Bc>)Nsvlwx|Juv-p{g7vHQEnU zuCE`UTv?Bx>~{k_Fc{Z?d3s3LHP+jFy%~Gi&>^5Im^yhJ9I?tEXweI-YsF;WGk$kD%+qmZ7MwH<>JLwTVJb^NeAtI{~4?aXlXpARvDf>UL6Yh`N=<;rVoiFd!SA;p@_k#lw$q~D!GJo zI3`ViUrgpgZort9AMtatxaY`O-1&mNy2vWK5f^M3)*`dhvF{t5m703ZNKL_t)u HAp{W9kZTe; delta 1037 zcmV+o1oHc=t^={I1CS(t?0QsKbVOxyV{&P5bZKvH004NLotVvT<2Ve*&&g95Ggqg` zS7&z*xh&cl^f0~b0|>N5TWVy{pp>}o)9)c|oTTwkDSSzQA4!R#|D^mq`}gtJ({uLl z`)RsI4wihj$<}xC>7=tdnrxG;meYwrTbp?J6Cy;+Hrcnwrj31n_FsgE-=-67Ib@q` zF`ZNl4IX|U*%t!;X4_Pbd=d$4VGNuYilL>LZL-B8U;Le)*c#x5eBZo~bKdfG7k^DB z8Xff6CR@()#qgZ3p#WXW`)@VOUI^rEwHjvNb$=aPo~-FUzc35Xw#NF=jGV!4SEiyJ zaKYfU2*0OQZEX~P*@koq_R~SFp21UO2q>qoa!{)ZH8Mn-P(=now}w0h5oOSpS}3=& zQ*u-qu(yO)4HW~v9xdg6@*kHK2yCIDLb);ft2B#rX~6nXuP3Fr$ge(^p2i~H;wf|x z*Q;3pwV2xhofVEqTa+t!u=&$@40vfnM=bjVCT04T(&`s~^d7zZZd49x^;%LRl3U|! zh4Vyik;pA&jmnpoMyo{UiuTA3dhrYnctNkCg@C=t< zL5HulW#}7_%b`WD3^}>R?7lbT$d068{i*NW&!-c{&U$?z5YUF5lXDcYX_Kn|{e)89 z?g5=aQ;3y+xXM?bYy)WR@GRKKFIwEE~cGxkg`(wD!}Ih9;#qAEpmERhpqD zR+{7*ifl__jUyw`HByz1LV~mo22e)3AE}zvkiT`l&ezuqZ}8RJ6uCjIMjHJW0;lf0 zfO5NQm2FxFW3qnQ1LtRh9n%Yzk$6T`C2PP3El0_J&)ZXqDjqO3I#&G<8~Nvku6I@C zFsa+Vqq4}pgR;CHKzZK{^uSAJ~z9?Vq&K`Q0*~-z~2gFK!65_(GtF!Kf55 z{{WRNAsxA@w(Nqj=;X$8#Lw@*BXo=2+1f Date: Tue, 20 Aug 2019 04:01:14 -0400 Subject: [PATCH 3/7] Lynx made a booboo --- code/modules/catalogue/cataloguer_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/catalogue/cataloguer_vr.dm b/code/modules/catalogue/cataloguer_vr.dm index 759f4774db0..f30a113989c 100644 --- a/code/modules/catalogue/cataloguer_vr.dm +++ b/code/modules/catalogue/cataloguer_vr.dm @@ -20,7 +20,7 @@ set category = "Object" if(busy) - to_chat(user, span("warning", "\The [src] is currently scanning something.")) + to_chat(usr, span("warning", "\The [src] is currently scanning something.")) return deployed = !(deployed) if(deployed) From 3aa2975f61c48ba01a9c02d20543ae1e7c549068 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 20 Aug 2019 04:30:59 -0400 Subject: [PATCH 4/7] Removes WIP code --- code/modules/catalogue/cataloguer_vr.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/catalogue/cataloguer_vr.dm b/code/modules/catalogue/cataloguer_vr.dm index f30a113989c..08db2cce1cd 100644 --- a/code/modules/catalogue/cataloguer_vr.dm +++ b/code/modules/catalogue/cataloguer_vr.dm @@ -1,6 +1,5 @@ /obj/item/device/cataloguer/pathfinder name = "pathfinder's cataloguer" - w_class = ITEMSIZE_SMALL icon = 'icons/vore/custom_items_vr.dmi' icon_state = "tricorder" action_button_name = "Toggle Cataloguer" From affb606207a882755f0568eea793b2c925ccb352 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 20 Aug 2019 04:58:52 -0400 Subject: [PATCH 5/7] Changes sprite, improves code --- code/modules/catalogue/cataloguer_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/catalogue/cataloguer_vr.dm b/code/modules/catalogue/cataloguer_vr.dm index 08db2cce1cd..a55feecd1ad 100644 --- a/code/modules/catalogue/cataloguer_vr.dm +++ b/code/modules/catalogue/cataloguer_vr.dm @@ -1,7 +1,7 @@ /obj/item/device/cataloguer/pathfinder name = "pathfinder's cataloguer" icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "tricorder" + icon_state = "tricorder_med" action_button_name = "Toggle Cataloguer" var/deployed = TRUE @@ -24,11 +24,11 @@ deployed = !(deployed) if(deployed) w_class = ITEMSIZE_NORMAL - icon_state = "tricorder" + icon_state = "[initial(icon_state)]" to_chat(usr, span("notice", "You flip open \the [src].")) else w_class = ITEMSIZE_SMALL - icon_state = "tricorder_closed" + icon_state = "[initial(icon_state)]_closed" to_chat(usr, span("notice", "You close \the [src].")) if (ismob(usr)) From b76b717221a8fa66e954f261ed4d07b0e9eed021 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Aug 2019 17:10:00 -0400 Subject: [PATCH 6/7] Adds compact cataloguer for Field Medics --- code/modules/catalogue/cataloguer_vr.dm | 24 ++++++++++++------- .../structures/closets/misc_vr.dm | 5 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/code/modules/catalogue/cataloguer_vr.dm b/code/modules/catalogue/cataloguer_vr.dm index a55feecd1ad..d1dfac5deac 100644 --- a/code/modules/catalogue/cataloguer_vr.dm +++ b/code/modules/catalogue/cataloguer_vr.dm @@ -1,20 +1,22 @@ -/obj/item/device/cataloguer/pathfinder - name = "pathfinder's cataloguer" +/obj/item/device/cataloguer/compact + name = "compact cataloguer" icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "tricorder_med" + icon_state = "tricorder" action_button_name = "Toggle Cataloguer" var/deployed = TRUE + scan_range = 1 + toolspeed = 1.2 -/obj/item/device/cataloguer/pathfinder/update_icon() +/obj/item/device/cataloguer/compact/update_icon() if(busy) icon_state = "[initial(icon_state)]_s" else icon_state = initial(icon_state) -/obj/item/device/cataloguer/pathfinder/ui_action_click() +/obj/item/device/cataloguer/compact/ui_action_click() toggle() -/obj/item/device/cataloguer/pathfinder/verb/toggle() +/obj/item/device/cataloguer/compact/verb/toggle() set name = "Toggle Cataloguer" set category = "Object" @@ -35,14 +37,20 @@ var/mob/M = usr M.update_action_buttons() -/obj/item/device/cataloguer/pathfinder/afterattack(atom/target, mob/user, proximity_flag) +/obj/item/device/cataloguer/compact/afterattack(atom/target, mob/user, proximity_flag) if(!deployed) to_chat(user, span("warning", "\The [src] is closed.")) return return ..() -/obj/item/device/cataloguer/pathfinder/pulse_scan(mob/user) +/obj/item/device/cataloguer/compact/pulse_scan(mob/user) if(!deployed) to_chat(user, span("warning", "\The [src] is closed.")) return return ..() + +/obj/item/device/cataloguer/compact/pathfinder + name = "pathfinder's cataloguer" + icon_state = "tricorder_med" + scan_range = 3 + toolspeed = 1 diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index f7177109322..44a1b177975 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -61,7 +61,8 @@ /obj/item/taperoll/medical, /obj/item/device/gps/medical, /obj/item/device/geiger, - /obj/item/bodybag/cryobag) + /obj/item/bodybag/cryobag, + /obj/item/device/cataloguer/compact) /obj/structure/closet/secure_closet/pilot starts_with = list( @@ -118,7 +119,7 @@ /obj/item/clothing/accessory/holster/machete, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, - /obj/item/device/cataloguer/pathfinder) + /obj/item/device/cataloguer/compact/pathfinder) /obj/structure/closet/secure_closet/pathfinder/Initialize() if(prob(50)) From 1947502ca4c347a226b94b41fe45d56c40988858 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Aug 2019 17:13:53 -0400 Subject: [PATCH 7/7] One for the pilots too --- maps/southern_cross/structures/closets/misc_vr.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index 44a1b177975..033a5384ef1 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -84,7 +84,8 @@ /obj/item/weapon/storage/box/flare, /obj/item/weapon/cell/device, /obj/item/device/radio, - /obj/item/device/gps/explorer) + /obj/item/device/gps/explorer, + /obj/item/device/cataloguer/compact) /obj/structure/closet/secure_closet/pathfinder name = "pathfinder locker"