From a76f6748bd5d402ed86eaeef4ddcb71f655a007a Mon Sep 17 00:00:00 2001 From: pudl Date: Sat, 4 Jun 2016 19:06:52 -0500 Subject: [PATCH] adds stupid shitty bar stools --- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 28 +++++++----------- .../objects/structures/beds_chairs/chair.dm | 6 ++++ icons/obj/chairs.dmi | Bin 25638 -> 25907 bytes 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index a9d88e26b44..c82c31507e0 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -1164,17 +1164,9 @@ }, /area/ai_monitored/security/armory) "acN" = ( -/obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/turf/open/floor/plasteel/bot{ - dir = 2 - }, -/area/ai_monitored/security/armory) +/obj/structure/chair/stool/bar, +/turf/open/floor/plasteel/bar, +/area/crew_quarters/bar) "acO" = ( /obj/structure/closet/l3closet/security, /obj/machinery/camera{ @@ -22539,7 +22531,7 @@ /turf/open/floor/plasteel/barber, /area/crew_quarters/locker) "aYI" = ( -/obj/structure/chair/stool, +/obj/structure/chair/stool/bar, /obj/effect/landmark/start{ name = "Assistant" }, @@ -59408,7 +59400,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "czP" = ( -/obj/structure/chair/stool, +/obj/structure/chair/stool/bar, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) @@ -96564,11 +96556,11 @@ aMw aNI aMw aOK -aPY -aPY -aPY -aPY -aPY +acN +acN +acN +acN +acN aQc bae aJC diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 99bdff56bf4..5e0d0478354 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -225,6 +225,12 @@ usr.put_in_hands(C) qdel(src) +/obj/structure/chair/stool/bar + name = "bar stool" + desc = "It has some unsavory stains on it..." + icon_state = "bar" + item_chair = null + /obj/item/chair name = "chair" desc = "Bar brawl essential." diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 29fed5de145ba552805f4a7f9e3196c4db0868a6..89494e7dfdee74bed49abeaae0a6c62a446442a4 100644 GIT binary patch delta 2840 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 delta 2576 zcmV+r3h(u^$^oXx0gxnr?Rr#LbVOxyV{&P5bZKvH004NLoshwb0x=AR&+StLy^1)y z;;k1MkvZrql+tEwurraiIQaH^aB=3KSf!T~zAt~0Ic#_P<_Ptnkyng~xCaI6RzmckQign-SF}b`ev4uY9z5%FLmBa&IVdcnQv7cdVg4H1ZF8V*qJY z%pjcr03ZNKL_t)uDFGB(fBZq)NZK&|$oCnc;;uVQ9eCA| zS3RQY1MvJ#r}ihJK~rD_@#=itZWo4O$PUjF!!Xe8c2O>uQK?kWXf$wibOggNY_rip zU)T00!b4MF$+X+;l-m^S=;#O!A3hxGe1$?mMu?#(6bfS|^yJACG@DHT_|AkxjH06G z&rTpo10U8$p_B=lvpzu!@*H?3#*c`=2P=S>_uZ`wxr-XeLXS9!*4M@Wb(&6!TC>z)4QiH6P*(eU?NU3;PiKnj2TW8tSCQn^<}h3(-8p9Ps;Qufz}qTENA9u-R-j%D+y9)&S+|tKR;=g+cH% zzsa&?e-J~A-{%?!E01YAf3?{6nM}sk&gb*C@dg=vx^<@Y^>s9x zO|)7qym|8mgTVlWLIF!lODGnLp%>)8e*KD0r!&9U^7FiKA04mjS>x9hI9IB&`ojPluIs`xD8c zg#qSrIh>xJBA3hA2IFNk&gVSN4NmF?(PsY>NB`cvdv+&0JUm3XTpr6u7nU#`H%>=o z=EKaw%Y0PU2jsRtksMkWAb?1Q;+%>`e|O^|Cu5PNuS)w9$)kkvp63n_9!}jhRjPxC4H6JKQ5wnfLYlxcY;OeYhi$HOd5{!c~Y8g`XWhcfAk=G zlpY-3=b z@4m$!4YD$vW#1f*>{rpQoP3NuGM1^Y#idBKTFqKpTN^VYzbPpIynp{bb_VHMt!B9; zHl3!Q$z<^M?OWxuR}*^R)xrIee9GD6ARQIY8~;S=Yh!=}G0#v!R5AKwfP_>^rIPFrh&e`!O%Q@0 z2oaD05(F`~D18pFR4T>VUVr`ib*yy=+4=-Qh(&1w1c1H0z3-l-(`nD&f3xo%Ja{k@ z`UF9ULwN&qW6*5%=>Px%&`Cr=R5%=Zn$WcGbkg@4eX2gH)HQBmKGD(u0e=&k1^s%x zKBn>b@nbIKipDu=9u9}7)oK!>Aqa1@-ULa)=w$25u45c@j-8kfls7=XP9(aM$<|Lw zgEu7D3m=fOZ*97@m?9HQNMA+B{0JS0yb027w^N_5-oW;7bYXt!g|Vyafbok= z;v#$FL3MqV&?#18zTuh-f#?058yg!I0PODWMlPdNDp^spkT88GVMl^-^wa4yc6WEN zv$F%>vK_+aD3p;Ce{nKy-A1p({J=dMjMD_;!aC6;ejSQ^A2$n$n|@Fe+}qpZs_*h(H+XrthrogFk9jo5Jzgb3&yAn7ZsNf4sZ(f|SZ9de%ZW!IG;M4_|+%IA>qqlbZ&lA0M~P7(c4je=3HB)hZf|241~-<+`i6v9V!IZW_cjfqB<=mNi-Kv^bdgu{w|m5~{*|3e0N< zcoNxDsd?8AgHEv$^9@%6bednBGk{T%-SOr@Uv?b{f+vv;&@@f!%E?FjRk)kOk!^bH z^W8Twqrqv&f9{~OtS`H61i_oY*tw+>rh5>@4b&`4O{7 z;7t(EbXfnI;LnRG{4pFKP|7erhU^YIOZu|wLJ*<|oDIfn6xiu>fU7s~8T=EXhTT2n m{mRw6>qjk@c6|w5_&-#|%bEs>lN|s6002ovPDHLk0$_p*!tqJ~