From 16b58a8b18b40521e887650983df74c918d1c8ad Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 8 May 2022 05:56:06 -0400 Subject: [PATCH] Adds chemistry kits --- code/game/objects/items/selectable_item_vr.dm | 48 ++++++++++++++++++ code/game/objects/structures/trash_pile_vr.dm | 3 +- .../reagents/reagent_containers/glass_vr.dm | 24 +++++++++ icons/obj/chemical_vr.dmi | Bin 1519 -> 2107 bytes vorestation.dme | 4 ++ 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 code/game/objects/items/selectable_item_vr.dm diff --git a/code/game/objects/items/selectable_item_vr.dm b/code/game/objects/items/selectable_item_vr.dm new file mode 100644 index 0000000000..33b810d8d7 --- /dev/null +++ b/code/game/objects/items/selectable_item_vr.dm @@ -0,0 +1,48 @@ +/obj/item/selectable_item + name = "selectable item" + desc = "If you find this, you should definitely report this..." + icon = 'icons/obj/items.dmi' + icon_state = "gift1" + var/preface_string = "You are about to select an item. Are you sure you want to use it and select one?" + var/preface_title = "selectable item" + var/selection_string = "Select an item:" + var/selection_title = "Item Selection" + var/list/item_options = list("Gift" = /obj/item/weapon/a_gift, + "Health Analyzer" = /obj/item/device/healthanalyzer) + +/obj/item/selectable_item/attack_self(mob/user as mob) + tgui_alert(user, {"[preface_string]"}, preface_title) + var/chosen_item = tgui_input_list(usr, selection_string, selection_title, item_options) + chosen_item = item_options[chosen_item] + if(chosen_item) + user.drop_item() + var/obj/item/result = new chosen_item(get_turf(user)) + user.put_in_active_hand(result) + result.add_fingerprint(user) + qdel(src) + return + + +/obj/item/selectable_item/chemistrykit + icon = 'icons/obj/chemical_vr.dmi' + icon_state = "chemkit" + selection_string = "Select a chemical:" + selection_title = "Chemical Selection" + +/obj/item/selectable_item/chemistrykit/size + name = "size chemistry kit" + desc = "A pre-arranged home chemistry kit. This one is for rather specific set of size-altering chemicals." + preface_string = "This kit can be used to create a vial of a size-altering chemical, but there's only enough material for one." + preface_title = "Size Chemistry Kit" + item_options = list("Macrocillin" = /obj/item/weapon/reagent_containers/glass/beaker/vial/macrocillin, + "Microcillin" = /obj/item/weapon/reagent_containers/glass/beaker/vial/microcillin, + "Normalcillin" = /obj/item/weapon/reagent_containers/glass/beaker/vial/normalcillin) + +/obj/item/selectable_item/chemistrykit/gender + name = "gender chemistry kit" + desc = "A pre-arranged home chemistry kit. This one is for rather specific set of gender-altering chemicals." + preface_string = "This kit can be used to create a vial of a gender-altering chemical, but there's only enough material for one." + preface_title = "Gender Chemistry Kit" + item_options = list("Androrovir" = /obj/item/weapon/reagent_containers/glass/beaker/vial/androrovir, + "Gynorovir" = /obj/item/weapon/reagent_containers/glass/beaker/vial/gynorovir, + "Androgynorovir" = /obj/item/weapon/reagent_containers/glass/beaker/vial/androgynorovir) \ No newline at end of file diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 4247891860..4de01de0b4 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -254,7 +254,8 @@ prob(2);/obj/item/weapon/storage/box/syndie_kit/spy, prob(2);/obj/item/weapon/grenade/anti_photon, prob(2);/obj/item/clothing/under/hyperfiber/bluespace, - prob(2);/obj/item/weapon/reagent_containers/glass/beaker/vial/amorphorovir, + prob(2);/obj/item/selectable_item/chemistrykit/size, + prob(2);/obj/item/selectable_item/chemistrykit/gender, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, prob(1);/obj/item/device/nif/bad, prob(1);/obj/item/device/radio_jammer, diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index e0d11cd585..350a64e224 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -53,6 +53,30 @@ name = "vial (amorphorovir)" prefill = list("amorphorovir" = 1) +/obj/item/weapon/reagent_containers/glass/beaker/vial/androrovir + name = "vial (androrovir)" + prefill = list("androrovir" = 1) + +/obj/item/weapon/reagent_containers/glass/beaker/vial/gynorovir + name = "vial (gynorovir)" + prefill = list("gynorovir" = 1) + +/obj/item/weapon/reagent_containers/glass/beaker/vial/androgynorovir + name = "vial (androgynorovir)" + prefill = list("androgynorovir" = 1) + +/obj/item/weapon/reagent_containers/glass/beaker/vial/macrocillin + name = "vial (macrocillin)" + prefill = list("macrocillin" = 1) + +/obj/item/weapon/reagent_containers/glass/beaker/vial/microcillin + name = "vial (microcillin)" + prefill = list("microcillin" = 1) + +/obj/item/weapon/reagent_containers/glass/beaker/vial/normalcillin + name = "vial (normalcillin)" + prefill = list("normalcillin" = 1) + /obj/item/weapon/reagent_containers/glass/beaker/vial/supermatter name = "vial (supermatter)" desc = "A glass vial containing the extremely dangerous results of grinding a shard of supermatter down to a fine powder." diff --git a/icons/obj/chemical_vr.dmi b/icons/obj/chemical_vr.dmi index 1046726245b52363c6164ac0d9aa8e3ba02977db..a08a052c90f5f070b8a79a18bbc5ecb123226093 100644 GIT binary patch delta 2094 zcmV+}2+{ZN3%d}IB!827R9JLGWpiV4X>fFDZ*Bkpc$|gHI}U>|5Jl12Ud0G%qWoGn zkx}FVwh&o(f=9sy&6s5SDX0kV z%GQ`LO=5znY!QvRMMxXblti1Zz&QJAE7YOTv>U`QFH=IJ;!ZB1Y;F>^!kS8{`Pde+ zm@JM)TC>fCrGLax3S{7!5L3KA;Ck2CfH5|=6duXaJ?}a8^FGf#=iK*RT`SCHGpiX7 z&DD{s&Gkfr&|G6y1T(I zM@L8fVqOD$#18`5GoNt40@Tm{ds6YEqoX8k-O6V-ZVU_k*zhnGtCdZgHu?4WZ-O)8 zH~e@5>({R*H8qv-@p1b4`a*8oY&IM}b1Z0rRDAQfb7AE#%+C*KLR28}+v_p_xPSjX z+rRu3`hWWRyzR@A*L>O~-;MWar+LPF+Ud?43!NZ8@on8#myO?V25hg(;5Tnw1mMi+ zQ=By(=doj70KndOlO1=V>%C_IXl=br!*iE-?@ToSFVvmnPrWzjD$57pWJ?!a{bLZb zE@%_ly00!Pf518*;r=}U9*da*;QUu#1K^E2jeoq}RLk(l^k&g-9|JBilK$lM_j3E8 z_Xg3={2YKSA2-6Uj|VMY4*q}!{Q1uGZrSIaULjBXXfFU0L*wiKVjijoU`KL40M|}d z0pPg)cK|LO{TcvwZjS{mS}uO?9$>C9E3kx=Z&+Y78Wp|0z01z)vk97O%nJALU0(S9 z_kXx@_EkDs-UQ&k*Y0s3aUYWd69D8FoZ%PME?zwT4gjZ2f1us{8G8R=pKf0s#JVk? zuKqD>&S*wPMuJMlXf!T6f7I-NW2=LI@411&VBjY|I6}-_1u=IO7z_sVKh-fX@PL7V z2N(G>WnEChrEt65WF&20HvYh+@M&20 zWbiw8Fqrt|#Q*Dnc}n4;q9RXGVIi+IHinh|I|mMU>i}sf>^B2e8v@@BABM-%)3Frx zgoPx#Ma2it_A`_;6x4WAOAC*ur?Vv?AuRlN91ct^EhHr+`StnV44poWGFQukWPdlx zY9&gglFgepW4GHwK7QYB!)dO8`or@ks?};ehmQUbebq4@xZQMgbcBW9Znq;m_dJ$& zFZpqL_W-GQrBaF0=|rhi0^oEyy*2dE(9oifeZn2~ z9_Dx^xSFu)>wq-_0D<#kP-8kaDF}$7QF{l zv`!6Hv`!7ym8QjupW4!0u8P*FK@99%p7|YC`#qU=h+~P`xL?Ra?5t)!BJFwzKngY;EZ-S8eI%UExSb5QOrQk`kJl z>pX8XpNh-L$=NIR1!KlyXTg%{0JZv2msQS)nbAN2> zCNncrW3^g!DwRrOGJlzB#P9Z8xl)*wm9@8|q@-P?zW542PiJ1LAPD7pz5c|K3=Lw_7iGX2JVG=B6cAXOUsR2Tq(1xxTnfcS^2D?W8I;4lB2{?o*l zcJ2rmM*;7?b89C0ttRk&S?m*OfL^aZQ6dP^P+p*MI-Tx>Mx!Ci^Ta-{U^ Ye+S)0e6V*3?EnA(07*qoM6N<$f+t)D;Q#;t delta 1501 zcmZ`$XEdA%0Q>|idMAQiLPU#byCR$xZ3%K=Ma@c-kkwhyl8=a9;zjQ*>LO=F$gSu- zWc3oVSf|}a%PP^&|GS$vZ+^_YH$P?w99zuE;$T9sg_Xaqv!A1{o43E4mnQ%O=0?V= zF?Gsw&|@~FpaC1nXq-eJ9q&Hxs~ALj+k*s4)7pZL2BZqD(oN6P?@96zrR@B%TP%r` zMZ>=ZU$720bf(|6~zER4@K%~TLk8AWWR8=MP2Cu8|`N*e171n117Ox zwF4pCDw%APaM_5NPkg|Eu1v&J60fx~g&2^~!@a$oNT`dpyD2rjt z`{CEH&_Rrj-N`_j47`XP5+Nn=?jFrW*Rr)qpyT!sIP0pcPoYrYCF~F|!flER@-F6p z2KyZPtc@`@^PKv&n;}BG3gNzR2FF+w6$rt4gANrjQ?(|9j7M}^G3dQXY0GLWZ7ddU zZf+i^o}b(6*(i8UI7^Tak3T;e6hIx?W@q!5NIu{~yUj4Q?d~e4z0r*AT|y?@nrlu~ ze7W9@m0HSPa~fzuD1({n%tqXx=K{HSr`%bq)LEvW;1n8`V&ALk@!R0a-8aC(MoUMJ zf;Yh#wuGsKF`2*GWPazKQ+jQFpK&-3~Y00r%MfD-b8Bp_NNa~{xb2nR?hYV@=}M6XPZ6^wcvL&8A0?+ymtese-uG=-Ii z;xH&9l>{!rfZHUhu%_N-=U%xAqGe&}XN1Y^s2e`faaoy}ebQHO6MwFq=sibodu>x6 zc8cI-srwj$lt7B4KuWT6R>@XqS6`p3m{@%uKB0eCgLcWBCBaPei{dQ%hb1=N3yOVF zB+SZMGn(m(b3MkOmWy{}8awR&2({f$QxhBnL)EEhn7o;cyZn{nsB}J4>~q{et6y)D zE-ZPD>Ee+V?I6`==8xl(WcNc8-nVyVOYCM=(_4uM%Isag#`kZTPNo&LF{;6qci+jO-FJDejB%HRwxCtw)FN`kQkyLl_yfVYr$VtJRGR^wHV~s+Gur)xp`d zp`IIi$6$IKBlD4?xLk`Lv2zjn^r$X{$_7elIo=KW)!d2BPGmHGrYgkmgtwDQjE~IR z{?%0Tse*iwT>bKTR=|`Y-oO-ISXZR(USXS9Ifh~ycB^8%%ah_*Let( w>Pu!2IZu@`{W$H6=6{Cv9XI^P1|-4lTdbqXk33xS8Gs8Q^-OhZbsS#(1KPITeE>>>>>> e929fba143... Merge pull request #12925 from Heroman3003/selectable-items #include "code\game\objects\items\shooting_range.dm" #include "code\game\objects\items\surplus_voucher_ch.dm" #include "code\game\objects\items\tailoring.dm"