From 66757d0650f2fabfa0d500663c1ee75a8d8f6479 Mon Sep 17 00:00:00 2001 From: fauxki Date: Tue, 22 Oct 2013 17:58:54 -0700 Subject: [PATCH 1/2] * Should fix bar shutters not working. * Switches floor tiles in beach holodeck because the water effect wasn't working correctly. --- maps/tgstation2.dmm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index 00d5d6b2bad..8cc48fd06c4 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -338,8 +338,8 @@ "agz" = (/obj/machinery/door/airlock{name = "Internal Affairs"; req_access_txt = "38"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/lawoffice) "agA" = (/turf/simulated/wall,/area/lawoffice) "agB" = (/turf/simulated/wall,/area/crew_quarters/sleep{name = "Security Wing Dormitories"}) -"agC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Security Wing Dorms"; req_access = null; req_access_txt = "63"},/turf/simulated/floor,/area/crew_quarters/sleep{name = "Security Wing Dormitories"}) -"agD" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Security Wing Dorms"; req_access = null; req_access_txt = "63"},/turf/simulated/floor,/area/crew_quarters/sleep{name = "Security Wing Dormitories"}) +"agC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Security Wing Dorms"; req_access = null; req_access_txt = "0"},/turf/simulated/floor,/area/crew_quarters/sleep{name = "Security Wing Dormitories"}) +"agD" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Security Wing Dorms"; req_access = null; req_access_txt = "0"},/turf/simulated/floor,/area/crew_quarters/sleep{name = "Security Wing Dormitories"}) "agE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "agF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating/airless,/area/solar/auxport) "agG" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating/airless,/area/solar/auxport) @@ -1506,7 +1506,7 @@ "aCX" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) "aCY" = (/obj/structure/disposalpipe/segment{dir = 4},/mob/living/carbon/monkey{name = "Pun Pun"; icon_state = "punpun1"},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) "aCZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/weapon/pen/blue{pixel_x = 0; pixel_y = 4},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) -"aDa" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/door_control{id = "Bar"; name = "Bar Shutters"; pixel_y = 25; throw_range = 15},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) +"aDa" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/door_control{id = "bar"; name = "Bar Shutters"; pixel_y = 25; throw_range = 15},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) "aDb" = (/obj/machinery/atmospherics/pipe/manifold{pipe_color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "aDc" = (/obj/machinery/power/apc{dir = 8; name = "Chapel Office APC"; pixel_x = -25},/obj/structure/cable,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office) "aDd" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office) @@ -6891,7 +6891,7 @@ "cCA" = (/obj/structure/flora/grass/green,/turf/simulated/floor/holofloor{icon_state = "snow"},/area/holodeck/source_snowfield) "cCB" = (/obj/structure/flora/tree/dead,/turf/simulated/floor/holofloor{icon_state = "snow"},/area/holodeck/source_snowfield) "cCC" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "green"},/area/holodeck/source_thunderdomecourt) -"cCD" = (/turf/simulated/floor/beach/water{tag = "icon-seashallow"; icon_state = "seashallow"},/area/holodeck/source_beach) +"cCD" = (/turf/simulated/floor/beach/sand{tag = "icon-seashallow"; icon_state = "seashallow"; dir = 2},/area/holodeck/source_beach) "cCE" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "green"},/area/holodeck/source_boxingcourt) "cCF" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "green"},/area/holodeck/source_boxingcourt) "cCG" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "green"},/area/holodeck/source_thunderdomecourt) @@ -6904,9 +6904,9 @@ "cCN" = (/obj/structure/stool,/turf/simulated/floor/holofloor{icon_state = "carpet15-0"; dir = 4},/area/holodeck/source_meetinghall) "cCO" = (/obj/structure/stool,/turf/simulated/floor/holofloor{icon_state = "carpet11-0"; dir = 4},/area/holodeck/source_meetinghall) "cCP" = (/obj/structure/stool,/turf/simulated/floor/holofloor{icon_state = "carpet7-0"; dir = 4},/area/holodeck/source_meetinghall) -"cCQ" = (/turf/simulated/floor/beach/water{tag = "icon-beach (SOUTHEAST)"; icon_state = "beach"; dir = 6},/area/holodeck/source_beach) +"cCQ" = (/turf/simulated/floor/beach/sand{tag = "icon-beach (SOUTHEAST)"; icon_state = "beach"; dir = 6},/area/holodeck/source_beach) "cCR" = (/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_basketball) -"cCS" = (/turf/simulated/floor/beach/water{tag = "icon-beach (SOUTHWEST)"; icon_state = "beach"; dir = 10},/area/holodeck/source_beach) +"cCS" = (/turf/simulated/floor/beach/sand{tag = "icon-beach (SOUTHWEST)"; icon_state = "beach"; dir = 10},/area/holodeck/source_beach) "cCT" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area) "cCU" = (/turf/unsimulated/wall{icon_state = "iron13"},/area) "cCV" = (/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/wall{icon_state = "iron12"},/area) From 5f6181f665d1388b125d22b39c41eb2bbce0d8fb Mon Sep 17 00:00:00 2001 From: fauxki Date: Tue, 22 Oct 2013 17:59:55 -0700 Subject: [PATCH 2/2] Fixes to icons of snorkel and inflatable to make them appear correctly on sprite. --- icons/mob/belt.dmi | Bin 7971 -> 7969 bytes icons/mob/mask.dmi | Bin 26061 -> 26061 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 2dcf98290ec1662546a1e173431590da8a18c719..2dc3db1b7f42a51d1a690a042c4c2331d25c96ef 100644 GIT binary patch delta 528 zcmV+r0`L8!KA}F4Bmp3iB`kl4CT0R|%wS=&ZTHvjAxVK$XkK6TmPn5uW_Udq9?h@k z-}_gyd)XI%xQnh8vo)I^Ka0h?D^qQ@X1yvFHM^=#mp?I4VzV_5iJRal@k6mFT^G&P zEQ`gdqlPcPzkw^2ta=%k%`BsfYLe3Sr;}>Cfq;_9r<#QP=U?u0@dSU@_3YWEt`%oh z^?>SH>nTQO4@XL^j?JjbJ^t5u8mUXF7KMot_hjZySD$s3S`3XZWVNt0lOlw09zrj0QmoOOX<+Ek3oJ+$fuXaJ8}2F=`>DVF+{g^+fu(Y|`M^@S9DUjLN6#4-xGc~w z(I@9!(r?O@(}l6^eN3(Jk$qCNGxUtx$s60$>MzIN!MSSt7+8Nw?xJ4m7pmWchD&G3 ztIjJ2Y;tGM^r3HnD+k1c8Y8T%P-O)xOH^6H$~Us-nwkdq#2QfGezNU5WRPy4uDtuC zn(=|3QnschIKX!Ub>*2738}&h2Arv_Z;w<~de~p2E_HJ9ln8lt4(P1*(LBHI%vKBGR6Bmp9kB`kkHgPDLEGgx4@?f&{bBq@*z&FjnF66x{746i4SAI-1l z-^W*TcsXW&xa(ajW^Z;serBt8SH{}x&32QmYIao}FJJmdk=qeaRFjl;IGt464Fr@-KGr1UKmT&4i)Vkhu4m6ScC9$8 zsz+4UT2FoNY+g`oC5_hQf%Uio1EOk>e2pZZZy;(5QERNQ4Tf#;T{-PlL!WRop@1EZ zZWG!{sNgAq1riuLOJIS>##sYGo4|T(6F8|1J-P|3hc|67sSY5(X^Uw+Ceg^`&3=uM z`I|2Qrf|L>xg=mB=L>&;xx8ySxh7;r@7n$kE077ldsWa;2JDK!0&IoA0^}c9fY1XA zkaS?^Gz%<9rh%bDFR&n41cuH=Zn&#h?5FdLz- z)q)SaO4*v4-~itZ)Rkw7B%}&27;vVxzAdP%^sv83UFziIDN^BCzy6KvqW94}zaGrt V<(T~g=N{*RZf64aW3x>H)Ev_h21Nh> diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index f768b7ee7be482f3950d6bdeefb073de777cbe86..6be896d5bd73fe5cc4a433480617b2065350acf1 100644 GIT binary patch delta 576 zcmV-G0>Ayu%K^>H0gyR=m(6bCFc5&x$x~SE6;=!M&`T~WsuhR!70_T$Y;PPpavW0n z^gZyCv<1zetT-Wk{_L5tXW&u%dHK6}6YJMazQ@?w;6)*xe*Mm~-l}9oAy&&gGibF* z$1iPygrX1+b@%b%@FCBXjjbreQ=XL(YHURz7T>Yuz%8zG8rp4t4Q)jV&mgU=QCSI& zKH`z1g>AxU88M$YhOmcp-L}dzg$@p)5Ubg0w#u`Jz4hwn`Ww6O1RB~cxEp8q$mdXIK%J;-GDbRQe}uPmZB zQV8mfO|}X_-4%%pQQLcVkRfW@bWL+0S2YfFhbqVv=t_)X#$d8FV{qD(I3cq~YAVG0sQ=z8`q=;zBZiiWGc>2i8xL0p*>QRsS={ z=(%Cn*aj!{%#(uA$#&pCI@r^9?n2TbxK0{SjE8mxnM%zQYNn2PKE~;Wgx^u$2_vns zbSfIl$iwkxjp97E0j0I+u=OY_2aQy(7p)%}MHz`Sky@Xl&_ zCyp~wT&STkt>!XB&QuxEw7d!)z}N^rkm?c3=+i#L3h6&HC+?>3QM|mZ#rk!Ve*$C3 OXacid&&ac90%l`sKN^Vu delta 576 zcmV-G0>Ayu%K^>H0gyR=md$SBFc5&x$x~SE6;=!Mu$Np`R4WecE1Gu#I=?|JgS#d)8{Mj>O&*V}3e*Uw272B6xe#F??;6)*xe*Da{-l}9oAvWtgGibF* z!=E-mLQ#l^x_f_j_>gDH##R*KDbLCXHMXJ`dXIK*J;-E_bRV1ezga|Y zq!82{o9q>Wx+@YHqPF+!AVbu)>6+$5u4)|U4popT(3P0NjKO4U#^AIyXM!xf^?!jL zNdrd(I3cq~YAVDb7d&zMXjU;z}}qiWGc>C)Ov)i1NjFHw@ zIu(s&-h_8w*BK+-Q`!ZO4mB(vnZKj5@}?!)80y8mzin78d1-dIiV z%yA})3pKPd)l!DYnJN>SmRG?87#qO{QaxcAecFdupq OXfx}YuAZ}J0%l`KTpt1e