From 11141462a056ab9999bc1fe0fabf3be2ba2f18d7 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Wed, 30 Sep 2015 00:00:36 +0100 Subject: [PATCH 1/4] fix #11222 also fixes the name and adds feedback to adding items --- .../research/xenoarchaeology/machinery/geosample_scanner.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index 378848e26e..ed23b965df 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -1,6 +1,6 @@ /obj/machinery/radiocarbon_spectrometer - name = "Radiocarbon spectrometer" + name = "radiocarbon spectrometer" desc = "A specialised, complex scanner for gleaning information on all manner of small things." anchored = 1 density = 1 @@ -91,9 +91,13 @@ user << "You remove [amount_transferred]u of coolant from [src]." update_coolant() return + if(scanned_item) + user << "\The [src] already has \a [scanned_item] inside!" + return user.drop_item() I.loc = src scanned_item = I + user << "You put \the [I] into \the [src]." /obj/machinery/radiocarbon_spectrometer/proc/update_coolant() var/total_purity = 0 From 4fdf4afa08c719cbfd2e7b54cf1d7e3f4d289057 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Fri, 2 Oct 2015 08:56:34 +0200 Subject: [PATCH 2/4] Adds on-mob NVG sprites. Fixes #10965. --- icons/mob/eyes.dmi | Bin 6804 -> 7356 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 486e578cb6dac728cae0c1781a3e888319736838..b68ccd373c51314ec6920588282b4535c70cf643 100644 GIT binary patch literal 7356 zcmcgxXIN9)whbT(NI8H?6Hr7Dl>>tG5|l`hrhpVFLFv62dKHl-O;n_dAc!DH3!Q*1 z^iCq7cOeoWA%vFXZ9MmV_uX^vyYIa7efRuGvNHExWv?;UoMVn1cS~QBg^8C51Ol;W zYe5V_AevXeCxYQ9V8Ld>J%K-lLB?heAojktKF(eboIO22pn&Y>PkTLRuP{IAZ!);o zUi-eW4JL8&?Hs7$gA`xdBZsu-IpVJkrqxs9NAg}4yy-ue?6|a16*!5z*D{V;|2${( z=#+^;KMb}lqU3b1;q4{Osm22tt*^QRAA63TIJ;6s@HR31TCH}xv{6xtRe0b!fu;Kd zY)0*Am$Bbxy2n+#4)-fSZ0(x9y6w--8|j9=(*HCRt(}*{nQ(uAO0d!P-V~<;{J|7@ncF(Ru>N=k#j#}@B{jXjLB7>`OgK{ z*Y5g(pU~Kv1ds~s=JfYVId9}&U`?b|4Y*`9ax+hiTX3ylG;P?-u9z*}@yF)`Nx$CE zT6?lyNdN7QVllrKopZLk31Tg?P|6TCyLg& zcGVxupDYA{_|9uXt{DepuT6$~jSzE?nmzxEAOqi;nm3~Dr z_;b2GUp(5ul0)uaJm!eFm&{Kr9{0&#zjd`%OwN7S@^v>i!+H1OJ3C9S*kck}2=N}5 zm)+%)jiYKig>Tj_`i6h@Y+Q(GJe#*3EElNi@Y1c-6(1Hpo!7fuJKg(`1`VSJfe?Db z0Kk$m>}nv;$s@mj)aYrBfNos_(d-P&ZPsfq%ZsGPSyNY5!mgQ{XT)g~RITMvcX3wJ zlxW#)bs%=*aQC^! za?j<-p$WHKc`vobrl#|au+qXQYoog^Ey-q=9pIkRs;~RZknS$d9s+y$rGX3V<_$h? zzTwWEO2{bCOuqR5i^{hR>zPc`5?*j}qPDXmZI{c?9?l-JR-J`gtjtg9E6zw5EWLPU zmiJ{NQ8rbp1Me8m7MNGzHs0LlKpq*(t0zuiqK|V~`-BGuHjEMsggH1c0s@tk$`t~V zNTzLO2@W}pyb|Vdur8VwlyUK5!R_keB9U_rI7f*}v!0&d52TdXjvR6mT4u?V{{*`N zq4!~J7?`Hx$fxC5O}*X>bJ!D&?YO0KIxRO+y1R z{^j>O{d?0r>4+Mt`-QbVPz32`+nn`hyIsfYcNqP?Cji@@Fg>&XZ=_3FDH$QTVMJNq zr6`dTK0Q4dYz{vztCp>-93aJedy6h*Je!J)WG9_mSnQm5%3*GFm-podoW_-qRL;0Z z%7m^#^{Hiduorr)Ot7(A;rnDO5%b)Y>sQNwPV(a7qDenERV$X0i9a>zS(FaMH%?mZrSKa?%#+O`a4h<%Q zKks(uX7ZLMBf6ZnqGUr$UC#(rJydU}}3r7WFweCS~o|_*=!J)cWHX4}Zn!@n1qyO0W{|sb}%w;o>;jrrC2+ z++O;Q-(wH9!5VAGB0L`7Hv1_?Pm=qzHxvrZBU;y>spLK=q!12A1%(H@xX`9**^T^y zw`IAWuh~;#6fWv8TIZLo2y1r`gC4O&kK$-R8#E4mAp^}sl-y|E5q;sXV@E*dGw)-Q?04Pz2LYhXK)o-kym7fi5!qr%g5wl_>`PJZl0)97{RmB3C&{ z9%Ex;ZuZp1#>NQ2+Jm=goy~#4MSIE-ZZhSdOa;QVYGBV7MoJKAbyIsq>)-S z0S1FbmYlv`kkhoJe2VIjmeKnC^#bLKJHB3n&WM?iYx(u0noc?eLi-*O)K<2KN`k}V zJjAN8z|rwt>f!0^?IqTEF-bhqP{L`FXK7#YJEjc+(HCFUh{mvJu|8hx>pn15vve#FfV9O z8rBAztlBrfmGVZ%cX6cTcq=s03C+bm_TgUC3J!M)4J#fQO)r+>l>r>#@oEs^ zB{;lwwfi0~p}wSW%5nz*?GS`!i|p1-UhF?Fr{8(W2oXRy#lAbAFubq@18>2mB$N^8 z5Wig|z>|3uVDId|&v$YPrXu#TJk6#LrX?0szfM8UGx^y>0+8@yDDB%Lr9uEA4PcysAk$OVcXvJ^h>Yc z@b@lJsPg1%VXd1&78AyXp7peNHbP&R^RZtd2EFMQ1RYcqHb@Z>j9y0CDtxb#eW-J? zYo{b>7|z(x1|Ya&Lgg%XPg)0M2_G7~i1UKwVIpj_3~DB`tB&};!e0UZ1QlN5h7UAb>=4X(#cX`;Xv>T-YG zelrCr5676Qc{Xo8&X93^kqr*FZcY{wO5l=sv5XnF$JL_m>dh2iSJDff%&H2Tk4rNc zm7tc9yv@I8+J{=y5*@D@MEhk9u0DZH6us-aSY0+(@KiB*^0=SHTK>E0uEM_N7MxzC z)i7r=GBH+5Gp2(h&#Wavtq->g^I{ZVZ@ zH9dINXPMSw^jL4b=i_Gb#<-ABfyec{mR*O++M`o@)ckq9mG9ij+w1<-lw9zGX6Mqa z6d=z>U>lufB!TGfureg$vud0WAZU=g6MMq41rxMm_YhdLH0H4q${VpiFyk*Vr6XBe zTN^nt9yZz!nf3Z+X=HW*@c**Dd|{Vomlg*#1)pbUpWZ!K21_U?C>Zi2CNaDzc?~>myUi`&hWF^M z&dyXDN%=R+EH*w`Sf&dC$$adoT-E{izJJ@CN7{dhKj|~K;~j^bFKTX{z(^BbEIAB6 z*S)#k))u?ZgvZ-?XvdX_iPxHd1(LJU`c;*d$P&#P4|}rY`b`4a+085OM=O)Jh5;}i z4>)?Zn!A<%q-D7(!T!#s=~w0C!VO*zHt94q+5t07D|yXC5KF77s-&dv=2Rw)FUTj2 z)w-f*LujRM2Oa|0KAaM6_k#g*w-xQy$o4k-vsX*w~?cF^zVk$GJ zsib7ZPjEHQ)y3r^OtJ4*sRI+?CSYEGqm}R>IGNo2#xWro?HhML z1y@>6d+Xl5oqAP9hThO~{|=awnN1mtwh0hNd_pruyG-wABo|Hz^pki^0gmL=5Wsc% z?^O5SaVEDxO5JJ=mTm`hx?ivur59d)vFjV@HC6c~o(N^k3qoDg_ znB9GYv4^1RCcAT7hz{z?114LtC>O00hk_NfVv_bmC8a}lc$oYU2spjKma_L>2l%(q z9mnV9CY!gND}s$sp30j!#jEMzFw((*GlXJ%bm^zZ^J{k!`xnuCfr9F-# zCAG~M;L61cnkFiF8oS^KPHQWz=mO^|RBulOuh#}q0H?~rSHOa+bLBj9CxX{oBEdCv zrS5(1xE!n^1VT&dhzvitfL)IvIpi>6C4}&vNJl8Ot{+@(LiM5lNwqlbrdvb5qC^(l zRpD|CZq-0-L5SJ*Ye1A}hyGfIpi0@3p~{vHr{1fkz+BZqG;PASwpKNURhq2DAAL2- zlRFD)6W-_{c$T6B4R(OqNRqM4JhyoAItCzOFOS^SXLhPff!9nwW&w3vMw4;Bo-^MO zIZ_@0I@3*FvITcEZm^#PXxq*IIBokG+qBey#ISPum?V4!!}27?7xoSwuyt|)^xdCh**!AVF+)U}G9PEabEujzovxjml|6iiJT79xRX_FB2@ z<3|Du_jkIxKznub)fH5$=^Ls2(IFL+BO?!*=H-j(ofh2lR+D+9m}Y&oXB3ibF%u$K z@FRB|POWa98x4zDTJzr#IWHz8l!Ptw<@bkhkKI?YRDCkb7jpTObP3^u72>magWXct zkv=c};u|k6pK5qhb9G}NNweqamoWbnbHn9S9Qvpwx_00x*!nlGctufX1ZhD{sH{$d zt8|gCP37#f%;UC?&dTPmkdd8_2GrjP(piZCmIs;rF13_!_#m zZyLq`6qfS&lPU)Xjyb!zU2P$UBKM|w<>9XA^8E3{#KhJuBNG!@m&1H9C!e%Q36S=q+>S>Tg0hf3Z05h3z&`+f#+E$lS>LsMPtz82o;4nYGO#0)ej(pt@^Z?~ZPxxbn_@67Mf0IxC zT}~N-+ag)3fsgdTw(%l~`K5wL0&sHA>~C#tY2CYb&tI71N_2Geq>75l4UCF&EJR5C z>@731Z!ONlB7{$Z6iJ)vr6Rp7U2Sb`e**)9R8s^{gSzz28upLR`?F<;{1cIh!ZeHe zkdZL@6LF9yXvpeXN!L1$Q=c+Gpd%w`v_;Zx9P&6jDf6q6l9H=YLnh=0N#j2X;BeU) zGH|su`h#5XdUD>fHIS6|c%&D$SiU^XN;^jq&pq4llLqOJsm#2be`zCmfhg^;V<^GR z+;s(cJHsE~P5RTfE)%7Xq9^y|r-*Fz zo{o<0{{C38DHLKCz&53P5OOp-D8$A_4e~ji$BB=^z2Umnf)UD)a|G`xF3B$;^LC$1 zNPA{p4!lt~H+O@by}@zn>MkxL!3S9pcD}B@ympUGAxZ31>fqB>3rJsF2l*zE?ebmW z!<8Rzg^#b!za~^(By6nIz4`HlOLM|87$C=Jy(|%abbJV@XR#t2LnG|75~X4keulho zh}6|Lty{%JDVrk3m`_WYAFq!Y8QH>EfdV41rC9Ww^~0=KqTv6NV*DYJ@IREff9G0% z8|#Wy6Afr(3~K85)Up3&XSTvz=!E5M_5qxZ`s(F_%t(#iPM0A|n&?mWI027XQv@jQ zqfhs+u!zAQ6{XS!6R<>O|7qe=1$?4c=b-1FJO zShbN4j?>xDl7`>+G^b^a)*;^Rsw2mbM)~x3_lTEc_p9>;bIJOPj<%ncD}9&sOQqkI zm&@LjCiTe-@SQM9xuoQeW1c_}9$letc&fbbdbsMMF59-O=vb{+q=zpbT8>$6p2se? zHoO+v_^cG83m9WNZZYi2kVFN)*#JV~qK(z91y73M!Y(xxb~4n^*jP9mQ6PpzslEpV zb$IJm#-2#@f!4)lbEfW#dvvV>-c>liDChoMz-M}n2M?fs!%lL?aJ^cE&Xb_jK-Sn@ zjFZMUR0~lRD-6o(u^M8#?N~!AD|a`Kw$ag14M?F~Up6}_Fe`Em#7%iJ9DMYko6~Wj zTdJxe&P2+wZ=mP=_WHTK$_DntQy&l)LOh2j8~mI?-8u`2q|zy;TuKKf;zWE$UwcNO zHRG5iwZ-DJ5wPYgK>4b=|GZ<9)_KkKS(L>4ryX7Q$C|!enGTqkqBQw;&xDy8U-dbL z0|W>5)CbsOmgt-a)D{4uuim}|#_NZ7J@bbORlX50Y+oQs^Yy1;z zSzGN2YisY|2?VhOId<0&ry^9 z-N1N~))JGGllVlWRVgt&wqtgH0x;@QEH6r+oI#L--F))GkZ1J==Es(r$eA@If9kF> zU+K|Lo}C=2^!^x?a0#dM!qZ9zlkGgQv1Pvr)CKFk)(|_Q3X5yY_=Ug&M5EQ71 zgIw>+14~RP^YZeRq1a+RiNKbQbN$-9K*8gEN{JSkS-mpT;4}Uc-Z2N=WtO|?>s+0y zO1PAd<}j3_gb+uJ{HiBMi?W_hc?`BXYx;TE;!q}-_pn)i(cb%g zMn~hWg~fR=csiYCi$u!0Q)<%LXu$TOnqRR5&&O|MTDkBKnt91vtl79{AfX%bcg>uD z@0Li2)lyeiKXaNDsF!yM%L&tbY9idKY+x6c{)6Sdi@u|Gt~Kl;^&%~@^Ri0I8*j2w zcb3Fzw}HS5L}2L$eTNi5kLtKt1?Z*`n{xos`p4H9e;{c7>2!Y>ZFSv~=AG(5YK*38 z|1`6m73j;ncUqq}NX_BqzLnP^AJwirK<+a1;w3&scu~z&$$YDpWQfq&yq(XYtVwa44JU6v&z)kv3^RsKfcX(=Sd0N{6@ik46ZJY=VUaQq{ z(4PTuR{#)WRBV{$*J)^sOi^T329Tt}|M}+PPw(JAcKkx63)O)n)pSk*1RDg>zM&5( Jzi#vJzW|c3_JaTb literal 6804 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 UncLtBiXs4FXlhV;**W6B06KCs>i_@% From 5ef5f40cbe2d5e086a8357792aff91457062459f Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 2 Oct 2015 12:45:19 +0100 Subject: [PATCH 3/4] add 'info' topic command to get information on a character --- code/world.dm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/code/world.dm b/code/world.dm index ac17aa21c0..3a5f0a5f83 100644 --- a/code/world.dm +++ b/code/world.dm @@ -184,6 +184,69 @@ var/world_topic_spam_protect_time = world.timeofday return list2params(positions) + else if(copytext(T,1,5) == "info") + var/input[] = params2list(T) + if(input["key"] != config.comms_password) + if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50) + + spawn(50) + world_topic_spam_protect_time = world.time + return "Bad Key (Throttled)" + + world_topic_spam_protect_time = world.time + world_topic_spam_protect_ip = addr + + return "Bad Key" + + var/search = input["info"] + var/ckey = ckey(search) + + var/list/match = list() + + for(var/mob/M in mob_list) + if(findtext(M.name, search)) + match += M + else if(M.ckey == ckey) + match += M + else if(M.mind && findtext(M.mind.assigned_role, search)) + match += M + + if(!match.len) + return "No matches" + else if(match.len == 1) + var/mob/M = match[1] + var/info = list() + info["key"] = M.key + info["name"] = M.name == M.real_name ? M.name : "[M.name] ([M.real_name])" + info["role"] = M.mind ? (M.mind.assigned_role ? M.mind.assigned_role : "No role") : "No mind" + var/turf/MT = get_turf(M) + info["loc"] = M.loc ? "[M.loc]" : "null" + info["turf"] = MT ? "[MT] @ [MT.x], [MT.y], [MT.z]" : "null" + info["area"] = MT ? "[MT.loc]" : "null" + info["antag"] = M.mind ? (M.mind.special_role ? M.mind.special_role : "Not antag") : "No mind" + info["hasbeenrev"] = M.mind ? M.mind.has_been_rev : "No mind" + info["stat"] = M.stat + info["type"] = M.type + if(isliving(M)) + var/mob/living/L = M + info["damage"] = list2params(list( + oxy = L.getOxyLoss(), + tox = L.getToxLoss(), + fire = L.getFireLoss(), + brute = L.getBruteLoss(), + clone = L.getCloneLoss(), + brain = L.getBrainLoss() + )) + else + info["damage"] = "non-living" + info["gender"] = M.gender + return list2params(info) + else + var/list/ret = list() + for(var/mob/M in match) + ret[M.key] = M.name + return list2params(ret) + else if(copytext(T,1,9) == "adminmsg") /* We got an adminmsg from IRC bot lets split the input then validate the input. From f249bf3bccc83eeb6e5841d6b2ea8d04701f290c Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Sun, 4 Oct 2015 17:47:47 +0200 Subject: [PATCH 4/4] Compilation fixes. --- baystation12.dme | 2 +- code/{__defines => }/_macros.dm | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename code/{__defines => }/_macros.dm (100%) diff --git a/baystation12.dme b/baystation12.dme index 4641b7858a..f36717bdbe 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -10,13 +10,13 @@ #define DEBUG // END_PREFERENCES // BEGIN_INCLUDE +#include "code\_macros.dm" #include "code\global.dm" #include "code\hub.dm" #include "code\names.dm" #include "code\stylesheet.dm" #include "code\world.dm" #include "code\__defines\_compile_options.dm" -#include "code\__defines\_macros.dm" #include "code\__defines\admin.dm" #include "code\__defines\atmos.dm" #include "code\__defines\chemistry.dm" diff --git a/code/__defines/_macros.dm b/code/_macros.dm similarity index 100% rename from code/__defines/_macros.dm rename to code/_macros.dm