From d8ba52dd10e36764cf7e75ff0ad17419a595a04d Mon Sep 17 00:00:00 2001 From: SatinIsle Date: Sat, 23 Sep 2023 00:28:31 +0100 Subject: [PATCH] Adds teleportation tome and makes potion bases smaller --- code/game/objects/random/misc_vr.dm | 3 +- code/modules/reagents/machinery/alembic.dm | 3 + icons/obj/props/fantasy.dmi | Bin 1758 -> 2613 bytes maps/redgate/fantasy_items.dm | 67 +++++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm index fd9cf62989..1d98d288ee 100644 --- a/code/game/objects/random/misc_vr.dm +++ b/code/game/objects/random/misc_vr.dm @@ -339,5 +339,6 @@ prob(3);/obj/item/weapon/bone/skull, prob(20);/obj/item/weapon/material/twohanded/staff, prob(3);/obj/item/weapon/gun/energy/hooklauncher/ring, - prob(3);/obj/item/toy/eight_ball + prob(3);/obj/item/toy/eight_ball, + prob(3);/obj/item/device/perfect_tele/magic ) diff --git a/code/modules/reagents/machinery/alembic.dm b/code/modules/reagents/machinery/alembic.dm index 624ebabe28..8c0aeb3c14 100644 --- a/code/modules/reagents/machinery/alembic.dm +++ b/code/modules/reagents/machinery/alembic.dm @@ -298,15 +298,18 @@ desc = "A mixture of concentrated acids, be careful not to spill it! A base ingredient of many potions." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "aqua_regia" + w_class = ITEMSIZE_TINY /obj/item/weapon/potion_base/ichor name = "ichor" desc = "A thick and heavy red reagent said to be tinged with the blood of gods. A base ingredient of many potions." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "ichor" + w_class = ITEMSIZE_TINY /obj/item/weapon/potion_base/alkahest name = "alkahest" desc = "Also known as the universal solvent, said to be capable of dissolving metal rapidly. A base ingredient of many potions." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "alkahest" + w_class = ITEMSIZE_TINY diff --git a/icons/obj/props/fantasy.dmi b/icons/obj/props/fantasy.dmi index e6f4d380912719b206d5c5cb4253273190861efe..71c189910e4280bd3752e6ffc45362951df91666 100644 GIT binary patch delta 2571 zcmV+m3iS2f4Yd>{iBL{Q4GJ0x0000DNk~Le0001>0001>2m=5B0K5^G9{>OVnUN(% ze}rH-Q9JUQqX;%z&N{73Zil_kSq?hO%`h}Z z8nCS+vDKx+nbOqQdB@p}dmd| za#`Bu{a>y#8e6vP8B4oD!0F*Xe};toXRMDI%a>WTgTY<5p{T2~`rdePk_^pPa|B=C zn=cu56Obg)xqNRv&}f_t;WbvTA-)<_lKg?A?+rK{4oBQ8I*;$DREgsoiHgqQyW)+N z7{q93)JN9{UaCrczAfIJ57AKYv%|;NN4+9{-;pm(lO!1@2_Uuzdn%-Af8^^s@&Vlh z04IRhB8;d$_)54M`T7c=D-#gYhxt>lmTAmERBImk`Z#{l(Xh!0Ih%|DZK4RrEy8Ar z9v&X14?QJ(K=t|4uFvK#9hRVJoj}aqc#?Eds7s`Vehm#vYWfYrIM#f|i3E;8Jo2LXJVLz5f0!>Z?fn--WJ{>% zR=*-5@AL5{A*p>D9IDBy0O?GKf1N8eGJtzmS}fQMA)V54$@)UPNjQpOOIsPld9L_? zQ1j{g@_K-B|1bg%Sn>fO56H(irb$|+FrBq7C3qsj{Nbyb+KP7`^a?H<6*XOJnIO~h}p{XS4 z-;2%n&>G*qlx%Bhe6`84`Lm~|8Shw=yZL=XU~Bz>9lw{r=FbLCPXmt7r9ZbJFk)l* z>JvCW{LlL?fBm`jdQD&({h_UGw#=5WWm_KLIr}5~1Gem$_vQG=p+AS2TbB|_91PH@ zKL#_yjy<`m{zM7rPWFT%yEER2FwvKmjU^BxBlE_ zwaH$VN-vpI;tWfa$tBLP#F<=THr}y6M}V(O*Z^>Ke@Q^6n+XDZeR+jV1`IMuT>5hZ z#|(x6Y}ORT&tvl#j?~Y#=iIJK}qP ze`{v&f9?IfOXxpI*h`(Qf2aAH#~@1>3eeKO18o%FW~;SPgze)n^p!;D-yt9<-)teb zuORrbg^!?%0J=TdZ}J>7h=hO#8HCTS8Sn*k>dzriu4@dx@_?RqGg|`Ont)FIxlO)O zNhHB;tz_9~o|4Kz0^30G|o)`NsgA`g5C)kH(1^ z89&(j8DNc-Vuui?F^Okm3vRO9u9BPyThh@Fhe0w!4i+Jo_a>`?ecO z6~6-&J9ZDs--C+1>>ohILH3WJ;wTXI0}@|Ry>)g#d`0!f`wHzK`wHzSrLcFBXuc|g z>35#5${^<-R1S%d^N%WrMA-6efOLH9e-Mv2)6@5^zehacWc>r;5hv>(5sx@qJ^{)P z)@gbC>Jq0XV+WP5ODy=h#DcF&-12RJX*t1mG)YwaI_>&PXVp?^dF1=uf^Z>`*y(f>6E5&d}!Yen69@c{Uy8cp?wV~o(I$Ic3XW(e=a_> zUjoXPI*4CG8SqQ8@u7VOKr939fsYUEmw@t#T0IM;_$5;|KD2KIB;l7#<@n&f!yR>M zd87#IyFB?@9(h9h)+hh#>&Ef8{@jhJ+n>8Jb=zMzrdtPO`g1p>|3QE5E~{+)yKBqV zzq__<{kv<+*1x;9Z2h@w%i5p2f3g%G{`*`p>LWaz`gaq|C%&S3lK|n#t9OK8zUHek z$n@vR_`V^6`E>k^5RW*y{+x~%M+oLuof}G^#eX@L~>W%jm+Clae+Og|9fA!}|v@(Mt zUztIXugsvxS7y-kUHWsByWNgB+5H3Aeovgde?UCN$@@pdQ=Dzz-k+l*w<r*!y>%miW-Vf4zVAX^9W*-*wkrcinZDuYA}4g_iI7ztHks{})=m>;FQ_ zcYR-Id9Uxg1Rwr~SH+SgP(J>TlZwSv2#K$#-uU%>3T<(f6l%UIgWUSQg~}lj^8LfG zd_cBbmYnSRz6IhDC*MB|rmAzKODwGK(Rkc4Mh-xpBlS>G2F@Eq&=!UCRQeP3|-uJ5~meAoYlm+$(& hyY9N{uDi~x{{Z(nN-FLPD<=Q|002ovPDHLkV1mqO8SnrA delta 1709 zcmV;e22%O86y6ObiBL{Q4GJ0x0000DNk~Le0001h0001B2m=5B0OF*IdjJ3cdyyqZ ze^ERD|H}Z5008s00o$VhumAws008L80RPfFDZ*Bkpc$}4y%?iRW z5QNXkQ-t;^;!m$$q(yqLuON}E&C+x$f16P8?Tszei`dFuW`=Kvg-zA5IF*&k&!y~v zJ$9rHDqC-)c%TV3n*B}+3s~DQ8Xt6kC=*RRxY}(5C*@nkGq&N?87Nm+`hxS)JavXxeKtQY-2rmWQtPw%0n3V)a8}|h@zh-Q)w2mG z%W_GbEUli1T7cqTdcjiasq~cqe<6XDhQG>VIEBlhdOAN+BjD5Fr~MTti`NtR>zZ?3 zaSjqJ1p$YJ$FX`MKd`SrzzQT-3Yhd4PfmFps|x}brT`p1j$fQs(dco6)#tG~-k&=t zbsaF~RRz>5p`fx9=oYWn>&-ea1#5&e1;qI4auiZe2H@zc6?ZI97K__&eU+HwG&6TuG(6u)|}ngopepnw)I z@`D1p2LPi1J8LP#2NlPU=k?JLdKwm9>cQh!U7u($K%l6()o8UYe_*U!4G8RYxYow% zx&h0jT>h3zG(%UwYUD12is|pH5e_e>-KI2l8u>;LscQz{79b!O;lg0T@guIE@*=j| z-Y^BudTa>5371VcevYu-H^${#_n7JR|0ImMGQbwVNdrs^wy%PSmy0b~>A$oHuZ&;oQ%5muikKJ@j#X3X#5e7~{lx`22SQUa9!*Zl0u_v>rA zrt*CT2d?)I=6m@c2-kt*o7n?z#BP)zKqhQ|zTf!r{qg<%O?Tk!{oPgIYr?CYGxELQ z*L#3e5PJ&l&-b0+?@kJxP+<2#Y$d!u-veJabSLoUe-!{9C%6P83CNRdx?w;EPyx_` z190v304*R(zDL4A%>jI+1yH+To_ya8tuR3XzO|G9@`WVR6!fqR3<|Ii^vMFUJpzAz&r^@$ zqyN$WfTRDQ>;8P7_WQp;!0f1t+>dU6kZ2?z^#^g0l2!bdN~PZ#j? zh3HE_Y&Rs6jrRKwDd6K#FC=ubF(rI{-c6s@#j#{FgFbBzfBp>LBUYa+0D?ylvHENQ zzkY@95vzvThe tome can't support any more pages!") + return + + var/new_name = html_encode(tgui_input_text(user,"New pages's name (2-20 char):","[src]",null,20)) + if(!check_menu(user)) + return + + if(length(new_name) > 20 || length(new_name) < 2) + to_chat(user, "Entered name length invalid (must be longer than 2, no more than than 20).") + return + + if(new_name in beacons) + to_chat(user, "No duplicate names, please. '[new_name]' exists already.") + return + + var/obj/item/device/perfect_tele_beacon/magic/nb = new(get_turf(src)) + nb.tele_name = new_name + nb.tele_hand = src + nb.creator = user.ckey + beacons[new_name] = nb + beacons_left-- + if(isliving(user)) + var/mob/living/L = user + L.put_in_any_hand_if_possible(nb) + rebuild_radial_images() + + else + destination = beacons[choice] + rebuild_radial_images() \ No newline at end of file