From d256f2a6eb7c9980736e738d82da73cfdfdde023 Mon Sep 17 00:00:00 2001 From: ToonClyde <49804499+ToonClyde@users.noreply.github.com> Date: Fri, 15 Apr 2022 03:02:50 -0700 Subject: [PATCH] Fix the carpet and tables --- .../LayeniaStation/LayeniaStation.dmm | 156 +++++++----------- .../smooth_structures/fancy_table_kinaris.dmi | Bin 1146 -> 1188 bytes .../icons/turf/floors/carpet_kinaris.dmi | Bin 1475 -> 1435 bytes 3 files changed, 64 insertions(+), 92 deletions(-) diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 13b636070..e4b89d0b0 100644 --- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm +++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm @@ -15740,7 +15740,7 @@ /area/engine/break_room) "dbl" = ( /obj/structure/flora/tree/jungle{ - icon_state = "tree6" + icon_state = "tree" }, /turf/open/floor/grass, /area/hallway/primary/fore/upper) @@ -17362,7 +17362,7 @@ /area/crew_quarters/dorms) "dts" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush3"; + icon_state = "bush"; pixel_x = -25 }, /turf/open/floor/grass, @@ -19145,12 +19145,6 @@ icon_state = "darkfull_plate" }, /area/hallway/primary/fore/upper) -"dQR" = ( -/obj/structure/flora/tree/jungle{ - icon_state = "tree2" - }, -/turf/open/floor/grass/layenia, -/area/layenia) "dQS" = ( /obj/machinery/requests_console{ department = "Atmospherics"; @@ -27222,22 +27216,6 @@ /obj/structure/closet/crate, /turf/open/floor/plasteel, /area/engine/break_room) -"frB" = ( -/obj/effect/turf_decal/loading_area{ - dir = 1; - icon_state = "drain"; - name = "drain" - }, -/obj/machinery/firealarm{ - layer = 4; - pixel_y = 24 - }, -/turf/open/floor/plasteel{ - dir = 8; - icon_plating = "floor"; - icon_state = "floor_whole_alt" - }, -/area/science/research) "frD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ dir = 5; @@ -28161,6 +28139,10 @@ pixel_x = 1; pixel_y = 8 }, +/obj/machinery/light{ + dir = 8; + pixel_x = -7 + }, /turf/open/floor/plasteel/white{ dir = 1; icon_state = "plaswhite_plate" @@ -29371,7 +29353,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/tree/jungle{ - icon_state = "tree3"; + icon_state = "tree"; pixel_y = -37 }, /obj/effect/turf_decal/weather/grass/line{ @@ -32462,7 +32444,7 @@ /area/security/checkpoint/supply) "gtc" = ( /obj/structure/flora/tree/jungle/small{ - icon_state = "tree2"; + icon_state = "tree"; pixel_x = -22 }, /turf/open/floor/grass, @@ -36198,7 +36180,7 @@ name = "drain" }, /obj/structure/flora/junglebush/large{ - icon_state = "bush3"; + icon_state = "bush"; pixel_x = -25; pixel_y = 0 }, @@ -36433,7 +36415,7 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/junglebush/large{ - icon_state = "bush2"; + icon_state = "bush"; pixel_y = 7 }, /obj/structure/window/reinforced, @@ -37068,7 +37050,7 @@ /obj/structure/flora/ausbushes/pointybush, /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/large{ - icon_state = "bush3" + icon_state = "bush" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ name = "scrubbers pipe" @@ -47663,7 +47645,7 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/junglebush/large{ - icon_state = "bush3"; + icon_state = "bush"; pixel_y = -24 }, /obj/structure/window/reinforced{ @@ -53655,12 +53637,6 @@ icon_state = "darkfull_plate" }, /area/science/xenobiology) -"kjv" = ( -/obj/structure/flora/junglebush/large{ - icon_state = "bush3" - }, -/turf/open/floor/grass/layenia, -/area/layenia) "kjF" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -53795,7 +53771,7 @@ "klb" = ( /obj/structure/flora/junglebush, /obj/structure/flora/tree/jungle/small{ - icon_state = "tree6"; + icon_state = "tree"; pixel_x = -12 }, /turf/open/floor/grass, @@ -63262,7 +63238,7 @@ /area/layenia) "mcb" = ( /obj/structure/flora/tree/jungle/small{ - icon_state = "tree4"; + icon_state = "tree"; pixel_x = -12; pixel_y = 14 }, @@ -63309,12 +63285,6 @@ }, /turf/open/floor/plating/asteroid/layenia/garden, /area/layenia/cave) -"mcB" = ( -/obj/structure/flora/tree/jungle/small{ - icon_state = "tree5" - }, -/turf/open/floor/grass/layenia, -/area/layenia) "mcC" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -67044,12 +67014,6 @@ icon_state = "floor_plate" }, /area/hallway/primary/central) -"mKW" = ( -/obj/structure/flora/tree/jungle/small{ - icon_state = "tree6" - }, -/turf/open/floor/grass/layenia, -/area/layenia) "mKX" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=FP1"; @@ -71506,6 +71470,22 @@ icon_state = "floor_plate" }, /area/crew_quarters/dorms) +"nxC" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/machinery/firealarm{ + layer = 4; + pixel_y = 24 + }, +/turf/open/floor/plasteel{ + dir = 8; + icon_plating = "floor"; + icon_state = "floor_whole_alt" + }, +/area/science/research) "nxD" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -75150,7 +75130,7 @@ "ohe" = ( /obj/structure/flora/junglebush, /obj/structure/flora/tree/jungle/small{ - icon_state = "tree5"; + icon_state = "tree"; pixel_x = -20; pixel_y = 2 }, @@ -77139,12 +77119,6 @@ icon_state = "plaswhite_plate" }, /area/medical/sleeper) -"oyf" = ( -/obj/structure/flora/tree/jungle/small{ - icon_state = "tree3" - }, -/turf/open/floor/grass/layenia, -/area/layenia) "oyg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ dir = 4; @@ -79484,6 +79458,17 @@ dir = 1 }, /area/science/research) +"oPC" = ( +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 8; + icon_plating = "floor"; + icon_state = "floor_whole_alt" + }, +/area/science/research) "oPK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ name = "scrubbers pipe" @@ -83048,7 +83033,7 @@ /area/chapel/main) "pvv" = ( /obj/structure/flora/tree/jungle{ - icon_state = "tree5"; + icon_state = "tree"; pixel_y = -13 }, /obj/effect/turf_decal/weather/grass, @@ -87664,7 +87649,7 @@ "qlg" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/tree/jungle/small{ - icon_state = "tree2"; + icon_state = "tree"; pixel_x = -20; pixel_y = -9 }, @@ -89179,12 +89164,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"qxk" = ( -/obj/structure/flora/tree/jungle{ - icon_state = "tree3" - }, -/turf/open/floor/grass/layenia, -/area/layenia) "qxp" = ( /obj/machinery/door/airlock/maintenance{ name = "Maintenance Access"; @@ -91258,7 +91237,7 @@ /area/medical/medbay/zone2) "qPb" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush2"; + icon_state = "bush"; pixel_x = -3; pixel_y = -5 }, @@ -91639,7 +91618,7 @@ /area/bridge) "qRz" = ( /obj/structure/flora/tree/jungle/small{ - icon_state = "tree5" + icon_state = "tree" }, /turf/open/floor/grass, /area/hallway/primary/fore/upper) @@ -106236,7 +106215,7 @@ /area/security/prison) "tfV" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush2"; + icon_state = "bush"; pixel_y = 7 }, /turf/open/floor/grass/layenia, @@ -108239,7 +108218,7 @@ /area/security/prison) "tya" = ( /obj/structure/flora/tree/jungle/small{ - icon_state = "tree2" + icon_state = "tree" }, /turf/open/floor/grass/layenia, /area/layenia) @@ -112982,6 +112961,10 @@ dir = 9 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/light{ + dir = 4; + pixel_x = 7 + }, /turf/open/floor/plasteel/white{ dir = 1; icon_state = "plaswhite_plate" @@ -119668,7 +119651,7 @@ /area/layenia/cloudlayer) "vqJ" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush2" + icon_state = "bush" }, /turf/open/floor/grass/layenia, /area/layenia) @@ -123587,17 +123570,6 @@ icon_state = "platingdmg3" }, /area/crew_quarters/dorms/upper) -"vYz" = ( -/obj/effect/turf_decal/loading_area{ - icon_state = "drain"; - name = "drain" - }, -/turf/open/floor/plasteel{ - dir = 8; - icon_plating = "floor"; - icon_state = "floor_whole_alt" - }, -/area/science/research) "vYB" = ( /obj/machinery/light{ dir = 8; @@ -127601,7 +127573,7 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/junglebush/large{ - icon_state = "bush2"; + icon_state = "bush"; pixel_y = -24 }, /obj/structure/window/reinforced{ @@ -127919,7 +127891,7 @@ /area/medical/chemistry) "wLm" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush3"; + icon_state = "bush"; pixel_x = -25; pixel_y = -4 }, @@ -132435,7 +132407,7 @@ /area/engine/break_room) "xDC" = ( /obj/structure/flora/tree/jungle{ - icon_state = "tree4" + icon_state = "tree" }, /turf/open/floor/grass/layenia, /area/layenia) @@ -148169,7 +148141,7 @@ xMC xMC xMC xMC -oyf +tya xMC xMC xMC @@ -148418,7 +148390,7 @@ xMC tNU xMC ufl -dQR +xDC xMC xMC oeJ @@ -148925,7 +148897,7 @@ gTW gTW tBc jiW -mcB +tya xMC tqX aiU @@ -149976,7 +149948,7 @@ prt tVV xMC ufl -qxk +xDC lFZ tBc gTW @@ -153309,7 +153281,7 @@ wjg uOy kzO xMC -mKW +tya xMC xMC vIA @@ -153569,7 +153541,7 @@ uOy wjg kzO xMC -kjv +vqJ xMC taj lFZ @@ -180269,8 +180241,8 @@ iEg iEg iEg dxf -frB -vYz +nxC +oPC dxf iEg iEg diff --git a/hyperstation/icons/obj/smooth_structures/fancy_table_kinaris.dmi b/hyperstation/icons/obj/smooth_structures/fancy_table_kinaris.dmi index 03fc62380de9189b89997492a47f52d1dfec16f6..96073a3deff0b7c2467721d9d0d4514d73f323ab 100644 GIT binary patch delta 906 zcmV;519klR2&4(HDFJ_GNklgY)D^YPpX4?CkVJgA6*^Yuc4! z|5Q~1SMLfma1Y(1Iq-0V0tcBm(r}<&2ohuip~2J36FBf>tVw^6h|uEA=MoN-a!!Io zgcdK)3plXIa|;8S6%Y9Le%e& z%n8^71;U-i#tE0@T5zDV(b;Q|@Os)d5AjiH zkg#*$KPS9tpNHtEG)UMv5Iw{8X%qhp`=_q!V+wyvfhjNr_C1h#0r`eK37my@tZ{)8 z8QihP1)d*sPuhKi?B4=>gzVn}5@90TPQq>1AfxtPY07p5wf9PqEt*n$uLP}ou+-jb zP<0QM+ItPE?!i)fuR+y4SZePz9O!zm)ZS}2(Dh&|QF^Zg!jbx`P5fR`zwc64n?%@4 zLf3zDt;FiJLe)K2cCQtx?zysitx$E(mECKFs(Y^NUMmW8Jy&+G6$QGUE4$Z<1J^xQ zcCWP|(Dq!}y;c8mc?b2(7vOU*sy;dl_IP2JJ gg&K}G)oXnOdm9W8$qL?#00000NkvXXu0jG}g3wmJGynhq delta 863 zcmV-l1EBn*3Hk`IDFJ^xNkl8nu6h`CCV-ytV9HvdOrjQYLEny&C>nMQN z0_FqML(?sA3z*5;8ZF--@Kcte#1^<$GB2+j!vgqiVWdw-mPGyF93Ax}gA9&j$Fw!Y z*+i8AYo7?T;3?WhbK%7Z6%I0Sso{cpDM*kFgceV)uHk~$V@-d8M1&4+v5;^4p0AP6pqZFa#c89ZsyTUIfZIw?AmbLZo{kRw2rM4ADoZy~tw}pu?5$>7L6Op$VD)vONg>Bb5o6wl%*@#V; z=j+`PW-T*1|2^e(Z{MU6VIn*P!v17u_mEVW3R7V!>}er&1@Z=~Kf`aAafNe(Y=Lft zvmDt1-3q5NC}zbK-d+Xo%aMfPCx=MF@RLI#OoV^EB0TgAGOG7VOLiit-YX?eG^Kj4 zgj60Z)q4%bd$3gRH5l)~QoYw;ya!A5Uc-g82TS!{!-cgWS%zXn5(r1?Ul?zr4TO{b zg^c&*MED{{x$0S!pd`Hd#w$H&U0mZt*Ef}T-jbLE)?gb=gRh4QDN=5cJNwZD$lix*9zl2 p*KS@bj9%V!^jcwt<6U{Je*puh0EHd~IY|Hj002ovPDHLkV1l{vptJx0 diff --git a/hyperstation/icons/turf/floors/carpet_kinaris.dmi b/hyperstation/icons/turf/floors/carpet_kinaris.dmi index f2466dda6370308c3ecd9435b2831f6b442188f0..10f90ea93eb609f6c58eff0ab729c05703334db8 100644 GIT binary patch delta 1144 zcmV-;1c&>>3!4kDGXZ~7Nklkj6I&Qjp)w~AC?}&Fiakv=dq8b6Vuocu@)_+ z6sI~=jcHKBk;4tVJN}vv}&y zFoUN|hUq-@XPCiLe})-6^<|i~U-~k9utxC)Ov>WXrk^#lxc#e{$- zVP$dr{{zmZtx>##9SI``oQ1THi}$A8-%Pj!2VA?q=>vZ%_cwJw?f#~&sdj&>s?dMV z0N3tsWf}U<8Q|LeZPA&CYx{6r|Jr}~_D6zid1(E(K8NlM!1%T){pDc2-ot^`f+_4;aVPAKdw(BT+2i2$LUG0P8{`MZ=)WJ$}sEP;>&R4 zVQV7~qcVSdT^>?1VO}~aOb!_4WkSF(FXIEw$`CKhc+p-}Azr#VQM9rQ@zT|aqAeC* z`9A#J)rq3j^-sPJU%NU{G_@X72h{38bwI5i)S6lkYE7*NwWijC>VR53s1F#a2XlGm zJ)h+8%zHk`;hFb*lEX9a`6P#D-t$Qg&%Ec89G-tUe(LitW6pm0&>3~)aM$l1^H6={ zXKb=?MHuhl=R|Fh+DBz-vJQVRjphP{$;mLZC!;|$OhbQYn4o}vD9GbHxQpvNdx4%yT{v6h) zDRmcdUsf-2H6zmiR}Ck_|vaXc75(wCtx>EWao##A6Q?S z_3i~$c%KOG5n-Ol&JS_@)~J4Vh4+c@9ua@$iR}Ck)o+XIXIFTi2=5VLp2*G*QT^7q zes+cTiSQl~=85e5a9F<$sh?fpy$!stf%7rDe@Z-@VBQtfKbnUV%)5g6NAqxkc~?;X zcpjb(d3RP&|9BqGhrBy4sDC^UPlvp-HN^f2JZ$e*;68==r||F*zHj$S>Ob;uXLok~wNd-xk)oA`&Cf7=+8K}cWIReLJ7HFP z(=qpR8%?i%EH*{aIL1jxFwq6iKV28Qw-lUST^GgXC^$+cmGOU#wKqwj2#ekN=y;b` z#y8g954vC#;cC$m%qrs>YcC*J^OkQq3LlN5FcQ_)!GA~;!Li_s;Mk$l9#SVgJ z;m+dp{|ipWwQ>K!?X)nu;3U-hxcPOGF@+32-nRA>uezXpknYlL~)sJ$B3xXWtf*^;>GB@U<`cV$c zFgE6+`cV#xWyx3hQT-@~b*4P63HPHMMhIdY!h&Q&KiJsN4@O1U>$$}j;lN>S1BX!& zzAcB`k}!XlPFtr7hPmt@80IowaFT_%%;KB&JP&c{HlC_wS%^!w@ld0=UU=&ed{)!s+s&r9QypaV3|LOL!Vz4Eb}LE=<};)@+WcV^Q&g^Bys5Tt7h^f zap?2wf`&JVLysR2+{qmJ=7!M?q$A9D>@CQ7te<}_mY$^h{mwqlWBqh-?>u)%er^tr z_0vVM@_rH?j!A;k-0mmg@tt7m`;?&$tA5pnI;{Eu!GS}?uiC(& z>JNViVVuF7qMX5;qMX5;qMX5;qMX5;qMX5;qMX5;qR+oDrxiyx?t5hSixC`df9vgA z6o<%^BZ@<0$`Qq38KK&3MRADCvZ6TL=K3rvibLpqipC-Fb6lSni(pBFz)U z`62PstPkb-a9qcUWn-Erit|I_r&*uP`qF=_j^JUQD9#UwA6j3l_2HFPx}Qk*5ow+% z&JXSUt*rc+mF_3feMFikit|G&e>*#WW~KXybRUuCiQ@dw%HPV)pIPaCBHc%%d7?N! zZ0B#y@@H1MZ$tNM==oSYKQ#_VHg_rCAI;&&<}T&?qd6Se+@*YfJcs9P?k-ZkKc0WX zX`8#tl<$w{@Vw2P$)UZ!1Bdnd6?&h-_jlp&iGFU*OTK^LaNzJCaroxv;l8mlLYfzf z{iMp_;r=1rH>7!?*iWh)Che-1q%@CU#x+^)_J+ z9YLE*kD$UK-9M!JhBPk}`$>(%2{RdfK61UkF&%!|@B{+B00000NkvXXu0mjffF*5u