From 6dc8552e8c1ffade891f35e7b88f597e420f81de Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 21 Apr 2019 21:32:39 -0400 Subject: [PATCH] Finishes this PR --- code/defines/obj.dm | 2 +- code/game/jobs/job/offduty_vr.dm | 13 +++++++++++++ code/modules/nano/nanoui.dm | 1 + icons/mob/hud_jobs_vr.dmi | Bin 4058 -> 4051 bytes nano/css/shared_vr.css | 5 +++++ 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 nano/css/shared_vr.css diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 470774cf7b..f57b4cb6c8 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -157,7 +157,7 @@ var/global/list/PDA_Manifest = list() list("cat" = "Medical", "elems" = med), list("cat" = "Science", "elems" = sci), list("cat" = "Cargo", "elems" = car), - // list("cat" = "Planetside", "elems" = pla), // VOREStation Edit - Don't show empty dpt in PDA + list("cat" = "Exploration", "elems" = pla), // VOREStation Edit list("cat" = "Civilian", "elems" = civ), list("cat" = "Silicon", "elems" = bot), list("cat" = "Miscellaneous", "elems" = misc) diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index 420943c562..a82f459b89 100644 --- a/code/game/jobs/job/offduty_vr.dm +++ b/code/game/jobs/job/offduty_vr.dm @@ -79,3 +79,16 @@ access = list(access_maint_tunnels) minimal_access = list(access_maint_tunnels) outfit_type = /decl/hierarchy/outfit/job/assistant + +/datum/job/offduty_exploration + title = "Off-duty Explorer" + latejoin_only = TRUE + timeoff_factor = -1 + total_positions = -1 + faction = "Station" + department = "Exploration" + supervisors = "nobody! Enjoy your time off" + selection_color = "#999440" + access = list(access_maint_tunnels, access_external_airlocks) + minimal_access = list(access_maint_tunnels, access_external_airlocks) + outfit_type = /decl/hierarchy/outfit/job/assistant diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 43f98e3361..9e02ec88b1 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -111,6 +111,7 @@ nanoui is used to open and update nano browser uis add_script("nano_base_callbacks.js") // The NanoBaseCallbacks JS, this is used to set up (before and after update) callbacks which are common to all UIs add_script("nano_base_helpers.js") // The NanoBaseHelpers JS, this is used to set up template helpers which are common to all UIs add_stylesheet("shared.css") // this CSS sheet is common to all UIs + add_stylesheet("shared_vr.css") // VOREStation Add add_stylesheet("icons.css") // this CSS sheet is common to all UIs /** diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi index 88d68a41f1bf1e0147513d9c522233a54afd2f9e..4a0eba7d746af6e6eb69930f49003b725c700488 100644 GIT binary patch delta 680 zcmV;Z0$2UoAJZSOj{*UmlaK-xf5C3sFbq8>UlFv|VOW=4cNtm~J*>Y_FcNLCktL6k zlX_o2+D(CNK)0uxY&=>|qDtj*_Kyf@)G0KcH>2hy|~$KI;DYM*T2I&lSgnboHBwtC`meJe;p9;nNnqF z`%$Ij#EM{DjycT+V^=d4!Ku0oQ8w5>$rpCYm2^g8g5@}Oqt!5{#86pW5bikjk{CO* za$!;znvT6}GO!m%F?XFfY^&GfSOzAQ3MD|S%$g`t*O6hVw|paU#fc%MKw!;>T*ZOt zMb8H@rSxC`)ghNLu!^hfe?qdIC_#s?we@aGG2e3AP!!L`s>+G6zEjT-c}poJFhl+N zRg7*FyC@XQpbIocyH+5=q?MBgZ;HSjf_t_cfISuIJcFCZe1?uR$N*LK$F!VX2Pze0 zK-%XcOE|e?zf+L$fQ}%};P^ z%1>(}NEQ?iSs}g#B|(7IrZ*^bNu5N)gYZjrZxHO04C7PGGeM(rMK_3N#T#*Ve7D+W zt2{@VZMpxj|I>(&<`^;4q8ynDhFw|Nee{kA`3EEAQ;yRzVjAp7b5NPn;u9()VmC!} zY9At{Bcx$ti_Xtge>*6Ftk_3+U^V07X0uvjMn}wFQN_kIK}K`2Ghj7i4NwhFq78<} zSTpXYE;iC<)O=ba(HaDS%WP(qs)B5mMgpOoaP%;dlN9`dTud*dk(V)|DjaR{bb_jH zl$fC`nA7xAotq5zC8ovLUP2mt?IptgD3476tG8*u!wPsi74?5=cD=iMyj}m@e*q#T O&MuW+0+q8o1)d7X-$2d) delta 687 zcmV;g0#NKkF$_VbLBPbULuGM6xaHJIV(ie$ zg-Ko5bnJPPp1nAVxoyQ^TV0Q185mV6lmM|ZYobVPONOP+@{Pn5Cx(;)fi)j<6$hec zJs-uC(t!a~`&@>=Dz35%f5~>D1RcWG*1KDZ`8&58isIQ=RXH=(cj_4;Zz-h&W~f`f ziqVZ?7lncubb*Fw*9t_Kv~u#`O%b?7aIcmFu%{wjCUEnZFVK;C>7lCr80WKVPo;tk zNV~jI%z@h43s_|;#k50MvybVNz>FkGuLKc@g6Z5OmO74-I&f&#e^4yn(Co@~^Ap^f z^3&P~k_E+MR*0`bNf2PQ=?w~9QY+E$AbhRv9fEz4et3y_B4|`D=ndjo@J8I7-mSLT zD$kK7TOK|f{x%|{IY!L1C`YD(VHZ|*AH8Ej{=-Q5oZ~o;m<@Jhb5NPm>=P;^VmC%~ zY9Aw|6Qp5di_XtQe>*6Ftk_4nXEo#ECbL>YMn}v)QN_kIK}K`7Ghj7i4Nwiwq8kj4 zv1Z&)tv1qU)O=ba(GmoK%VcJis)B6hMgpO&aP%;dvlRS-oJ}vJk+&hDDjaO`w1TQ{ zkeHz?nA7xQoi-WnHD-&kT|+kb+BL%dC{LRL7H_iwk11eG9HZUm&H5AAtg-Kf-8K); V_sjqLFIkt*FSAK2*t0bSo(eUGQ4atB diff --git a/nano/css/shared_vr.css b/nano/css/shared_vr.css new file mode 100644 index 0000000000..a368b1fac5 --- /dev/null +++ b/nano/css/shared_vr.css @@ -0,0 +1,5 @@ +th.Exploration{ + background: #bab421; + font-weight: bold; + color: #ffffff; +} \ No newline at end of file