From 109135a35aeb0ed53d68323d6b4628e9789cfc97 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sat, 17 Oct 2020 13:53:53 +0100 Subject: [PATCH 1/2] Wall Cabinets & Crate Markings --- .../_closets_appearance_definitions.dm | 30 +++++ .../crates_lockers/closets/walllocker.dm | 106 +++++++++++++++++- icons/obj/closets/bases/wall_double.dmi | Bin 0 -> 4361 bytes icons/obj/closets/decals/large_crate.dmi | Bin 787 -> 2722 bytes icons/obj/closets/decals/wall.dmi | Bin 2077 -> 3234 bytes icons/obj/closets/decals/wall_double.dmi | Bin 0 -> 3839 bytes 6 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 icons/obj/closets/bases/wall_double.dmi create mode 100644 icons/obj/closets/decals/wall_double.dmi diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm index b90a7961e2..9075c87272 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm @@ -1380,6 +1380,36 @@ "glass" = COLOR_WHITE ) +// Wall cabinets +/decl/closet_appearance/wall_double + base_icon = 'icons/obj/closets/bases/wall_double.dmi' + decal_icon = 'icons/obj/closets/decals/wall_double.dmi' + decals = list( + "vent" + ) + extra_decals = null + +/decl/closet_appearance/wall_double/kitchen + decals = null + color = COLOR_OFF_WHITE + +/decl/closet_appearance/wall_double/medical + decals = null + color = COLOR_OFF_WHITE + extra_decals = list( + "stripe_outer" = COLOR_BLUE_GRAY, + "stripe_inner" = COLOR_OFF_WHITE, + "cross" = COLOR_BLUE_GRAY + ) + +/decl/closet_appearance/wall_double/fire_safety + color = COLOR_RED_LIGHT + decals = null + extra_decals = list( + "stripes" = COLOR_OFF_WHITE, + "glass" = COLOR_WHITE + ) + // Carts /decl/closet_appearance/cart color = COLOR_GRAY20 diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index b6d49f32de..5782d9c3e2 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -10,7 +10,7 @@ anchored = 1 store_mobs = 0 -//spawns endless (3 sets) amounts of breathmask, emergency oxy tank and crowbar +//spawns 2 sets of breathmask, emergency oxy tank and crowbar /obj/structure/closet/walllocker/emerglocker name = "emergency locker" @@ -55,6 +55,7 @@ pixel_x = 32 dir = EAST +<<<<<<< HEAD //VOREStation Add Start /obj/structure/closet/walllocker/medical name = "first-aid closet" @@ -74,5 +75,108 @@ dir = WEST /obj/structure/closet/walllocker/medical/east +======= +//double-size "cabinet" lockers, from Killian +/obj/structure/closet/walllocker_double + desc = "A wall mounted storage cabinet." + name = "Wall Cabinet" + icon = 'icons/obj/closets/bases/wall_double.dmi' + closet_appearance = /decl/closet_appearance/wall_double + density = 0 + anchored = 1 + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + +/obj/structure/closet/walllocker_double/north + pixel_y = 32 + dir = SOUTH + +/obj/structure/closet/walllocker_double/south + pixel_y = -32 + dir = NORTH + +/obj/structure/closet/walllocker_double/west + pixel_x = -32 + dir = WEST + +/obj/structure/closet/walllocker_double/east + pixel_x = 32 + dir = EAST + +/obj/structure/closet/walllocker_double/kitchen + desc = "A wall mounted storage cabinet, for the kitchen. Now where's the flour gone..?" + name = "Kitchen Cabinet" + icon = 'icons/obj/closets/bases/wall_double.dmi' + closet_appearance = /decl/closet_appearance/wall_double/kitchen + density = 0 + anchored = 1 + +/obj/structure/closet/walllocker_double/kitchen/north + pixel_y = 32 + dir = SOUTH + +/obj/structure/closet/walllocker_double/kitchen/south + pixel_y = -32 + dir = NORTH + +/obj/structure/closet/walllocker_double/kitchen/west + pixel_x = -32 + dir = WEST + +/obj/structure/closet/walllocker_double/kitchen/east + pixel_x = 32 + dir = EAST + +/obj/structure/closet/walllocker_double/medical + name = "Medical Cabinet" + desc = "A wall mounted medical supply cabinet. Probably full of drugs!" //not actually full of drugs, sorry! + closet_appearance = /decl/closet_appearance/wall_double/medical + +/obj/structure/closet/walllocker_double/medical/north + pixel_y = 32 + dir = SOUTH + +/obj/structure/closet/walllocker_double/medical/south + pixel_y = -32 + dir = NORTH + +/obj/structure/closet/walllocker_double/medical/west + pixel_x = -32 + dir = WEST + +/obj/structure/closet/walllocker_double/medical/east + pixel_x = 32 + dir = EAST + +/obj/structure/closet/walllocker_double/hydrant + name = "fire-safety closet" + desc = "It's a storage cabinet packed with fire-fighting supplies." + closet_appearance = /decl/closet_appearance/wall_double/fire_safety + anchored = 1 + density = 0 + wall_mounted = 1 + + starts_with = list( + /obj/item/clothing/suit/fire/firefighter, + /obj/item/clothing/mask/gas, + /obj/item/device/flashlight, + /obj/item/weapon/tank/oxygen/red, + /obj/item/weapon/extinguisher, + /obj/item/clothing/head/hardhat/red) + +/obj/structure/closet/walllocker_double/hydrant/north + pixel_y = 32 + dir = SOUTH + +/obj/structure/closet/walllocker_double/hydrant/south + pixel_y = -32 + dir = NORTH + +/obj/structure/closet/walllocker_double/hydrant/west + pixel_x = -32 + dir = WEST + +/obj/structure/closet/walllocker_double/hydrant/east +>>>>>>> 63b7caa... Wall Cabinets & Crate Markings (#7724) pixel_x = 32 dir = EAST \ No newline at end of file diff --git a/icons/obj/closets/bases/wall_double.dmi b/icons/obj/closets/bases/wall_double.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e6b1a39271fde7602cb0f013cc197959ee55ad0a GIT binary patch literal 4361 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 literal 2077 zcmb7FdpOhkAOEtF+}27RB-2Vq!(4K|&DO{za(4(7Mkcp0*9}b~OKz2gQD-h0rL0Vp zq=O`iW|5T><=R}rXcK4W_xnB1@1OI>>HR$K_v?9op3n1s-j~<=d0%pNIwmWnBn1F~ zteq{!RfISHR!IqwrMwQ&62Y}3_upbM*qA_kXjE)yWCQ>tl;-sIO110k*z#u#|L}D_ zVq>|OQei8{)3Ci4#=Lpy97iBfkxCli8-k!m3{*x6=lcmNhYH$FZgm7Rw=RvL4)~aV zeTEs+o$<|NfZ!0FVkd$H%u0ASluI}FM_p_KRGY1qhFWr>A)gi(dV_^m%2A+b6J z4|;Mk5Mx#Nqj<*%v!qyane)yMMx$CXt)6jHxSj)HRS|=(Q^+@Ha%Q{3t|B?7qPWA& zw^B$A2Sy6igo#hTEqN=~bYA~qnUZRkH2Z}3-8IX(^(Yj$VIuypW7W3GFvQ(Fr4_A7KDx~L1I&>Wwi@?hYfx#ApO7XL) zQD+pA#)Vz0m5T}RK2m6gdCi{?;%KgQP=zqRQCk)?)db6E(M0X|0|s-EPkhU-JhQ75 z6tE*;RC{>2n)fz4J@2xyq_+$w%|s#4Tn_!Rk|BZNpuNq62pK7T7cWrobY{K^182oS z57O^Sycz=2)$GFv4UL!?@g`ih{G6UV?Vy(dgtoHmG+053DC)Z)e@paFPcm_R?Y@9) zXD`(B_)ZiBfcWq9Fqpwv$)Oq6gZeTaV34h|j4DbuZA%BRQ~qB#l`~|vs^nOx(Pw?7 zoEwx+c_-Zm(?m5f5v)@k553>>;_6mnY8hhr15!iR_NKS%ER$8U=;}&yd(W9g6W`vJ zzUj9&@`mUwT~%Rt(&tlLi{By%*{F5FVO8z~{ZJY&&MakP-Q+W6(3J|KLeD~Q;_7-W z97V2HH3RUZH4Dj*0o?9)a~7Pa%c1T$J#r5G6}5)7tvda@a>y!66As%!;C8qMWx=DA@-lP{Jg z`BN0O#;D}s4-2yoifCjEas0WqUYji-B64l8J<4s*u$&{2-QyO|t{$5>WE^(eQ;S$Q zm-?pJ|C9=ryGj2YJcZvsGAQ0KS1%*u8^_SBk==o>+Cd3KqB6@zYdY3+0QXSpX~-9x70(FwdSE&> z$X>Q-VHIg&l5a!TC2BUCTF-5T`yse+O%Gj%+Ch82m|$m+_?6q#S7L1EChVP)=F$y{ z`ke_%>4tU_0HQXE;?uc!tK=EHdvHsON-MU;=SY_OBh(AMI=t-AIm5~ko*a}irZ0n9 zJTCbY+ws3@AHz(mf25~p!WuMS`2KnDYHD+nv0!zW`P8MWayN)NIyXUUNru5nF43y% z{j;)k(oA&IV%{^}Wu}&|B()vr&mpy$a9b0PTCO7P!%2=Jc*!d_7p&m;TK|xxlRH4h+xA*Q&PYnb%_aX{F$V&{ zbl%H(N2H~TrLAb_@He&U3e6GpSE#c2zGOjv;q&JX z%q2J19}68|$;>3AO%3 z&=hX|dqMGI(yBiOWBE8yt3c1OBa~{QCQR!-d_&Lo!_d$Z!u&?r3l@YWyXIXVA3Bop zz3Wqaw55P{koBvJV%wrp0Ns!1e=sCh~P zb8U4W`<}FH;_o))!*y!qlmh;^ZNv#TN&40`|I{-{t|6OUw%yJUhQ)+rpYMy!gt75|DaeGeSc z&S)sI$+yITsE_4emhCw}V)ucv7wkX7ofWOjHiOhobfDz2CaUmC7a2#xp?Qq+|36&d Yt{-(4+p4)UqI(b6Svz6wqED0m0uchRO#lD@ diff --git a/icons/obj/closets/decals/wall_double.dmi b/icons/obj/closets/decals/wall_double.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3649cd44ec77aa6dfd94019bb0a33f27a41be483 GIT binary patch literal 3839 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 literal 0 HcmV?d00001 From 541e85f8c02ea94deeae9662329de3f2f3dd9e19 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 18 Oct 2020 15:37:36 +0300 Subject: [PATCH 2/2] Update walllocker.dm --- .../structures/crates_lockers/closets/walllocker.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index 5782d9c3e2..d0e260c220 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -55,7 +55,6 @@ pixel_x = 32 dir = EAST -<<<<<<< HEAD //VOREStation Add Start /obj/structure/closet/walllocker/medical name = "first-aid closet" @@ -75,7 +74,10 @@ dir = WEST /obj/structure/closet/walllocker/medical/east -======= + pixel_x = 32 + dir = EAST +//VOREStation Add End + //double-size "cabinet" lockers, from Killian /obj/structure/closet/walllocker_double desc = "A wall mounted storage cabinet." @@ -177,6 +179,5 @@ dir = WEST /obj/structure/closet/walllocker_double/hydrant/east ->>>>>>> 63b7caa... Wall Cabinets & Crate Markings (#7724) pixel_x = 32 - dir = EAST \ No newline at end of file + dir = EAST