From 347d44d05cea626a498ef2eac0a1cd12c541f59d Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 27 Aug 2023 11:41:12 +1000 Subject: [PATCH] Two small fixes --- code/__defines/color.dm | 2 +- .../_closets_appearance_definitions.dm | 9 +++++++ .../crates_lockers/closets/walllocker.dm | 19 +++++++++++++++ .../silicon/robot/robot_modules/station.dm | 2 +- icons/obj/closets/decals/wall_double.dmi | Bin 5480 -> 5515 bytes maps/submaps/admin_use_vr/lucky_7.dmm | 22 +++++++++--------- 6 files changed, 41 insertions(+), 13 deletions(-) diff --git a/code/__defines/color.dm b/code/__defines/color.dm index 73db8eef6e..8f8332d768 100644 --- a/code/__defines/color.dm +++ b/code/__defines/color.dm @@ -7,7 +7,7 @@ #define COLOR_MAROON "#800000" #define COLOR_PURPLE "#800080" #define COLOR_VIOLET "#9933ff" -#define COLOR_OLIVE "#52613b" // VOREStation Edit +#define COLOR_OLIVE "#52613b" #define COLOR_BROWN_ORANGE "#824b28" #define COLOR_DARK_ORANGE "#b95a00" #define COLOR_GRAY40 "#666666" 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 b967465ac9..6db060fed6 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm @@ -1578,6 +1578,15 @@ /decl/closet_appearance/wall_double/generic_civ color = COLOR_DARK_BLUE_GRAY +/decl/closet_appearance/wall_double/casino + color = COLOR_GRAY20 + decals = null + extra_decals = list( + "stripe_outer" = COLOR_GOLD, + "stripe_inner" = COLOR_ORANGE, + "thaler" = COLOR_GREEN + ) + // 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 c66918ac24..6be9205ef3 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -315,6 +315,25 @@ pixel_x = 32 dir = EAST +/obj/structure/closet/walllocker_double/casino + closet_appearance = /decl/closet_appearance/wall_double/casino + +/obj/structure/closet/walllocker_double/casino/north + pixel_y = 32 + dir = SOUTH + +/obj/structure/closet/walllocker_double/casino/south + pixel_y = -32 + dir = NORTH + +/obj/structure/closet/walllocker_double/casino/west + pixel_x = -32 + dir = WEST + +/obj/structure/closet/walllocker_double/casino/east + pixel_x = 32 + dir = EAST + /obj/structure/closet/walllocker_double/cargo desc = "A wall mounted cabinet. This one is in cargo colors." closet_appearance = /decl/closet_appearance/wall_double/cargo diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 666de99605..dc55106494 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -79,7 +79,7 @@ var/global/list/robot_modules = list( if(!R.client) R.icon_selected = FALSE // It wasnt a player selecting icon? Let them do it later! - create_equipment() + create_equipment(R) for(var/obj/item/I in modules) I.canremove = FALSE diff --git a/icons/obj/closets/decals/wall_double.dmi b/icons/obj/closets/decals/wall_double.dmi index 9a47f92f6b032995c634b9169c0791f8bd4d8800..ba78f6675f0fcb1b4e91bd36541d784aa61b7312 100644 GIT binary patch delta 5126 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 B@d*F` literal 5480 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 HmM{Me3P>$} diff --git a/maps/submaps/admin_use_vr/lucky_7.dmm b/maps/submaps/admin_use_vr/lucky_7.dmm index 356e3cb461..131697a524 100644 --- a/maps/submaps/admin_use_vr/lucky_7.dmm +++ b/maps/submaps/admin_use_vr/lucky_7.dmm @@ -59,13 +59,13 @@ "bg" = (/obj/random/trash_pile,/obj/random/trash,/obj/random/trash,/obj/random/junk,/turf/simulated/floor/plating,/area/submap/casino_event) "bh" = (/obj/machinery/slot_machine,/turf/simulated/floor/carpet/brown,/area/submap/casino_event) "bi" = (/obj/machinery/slot_machine,/obj/machinery/light{dir = 4},/turf/simulated/floor/carpet/brown,/area/submap/casino_event) -"bj" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/book/manual/wizzoffguide,/obj/item/weapon/deck/wizoff,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cah,/obj/item/weapon/deck/cah/black,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/purple,/area/submap/casino_event) +"bj" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/book/manual/wizzoffguide,/obj/item/weapon/deck/wizoff,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cah,/obj/item/weapon/deck/cah/black,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/purple,/area/submap/casino_event) "bk" = (/turf/simulated/floor/carpet/purple,/area/submap/casino_event) "bl" = (/obj/machinery/button/remote/airlock{id = "L7 PGR 1"; name = "Door Lock"; pixel_x = 24; pixel_y = 26; specialfunctions = 4},/turf/simulated/floor/carpet/purple,/area/submap/casino_event) -"bm" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/book/manual/wizzoffguide,/obj/item/weapon/deck/wizoff,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cah,/obj/item/weapon/deck/cah/black,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/green,/area/submap/casino_event) +"bm" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/book/manual/wizzoffguide,/obj/item/weapon/deck/wizoff,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cah,/obj/item/weapon/deck/cah/black,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/green,/area/submap/casino_event) "bn" = (/turf/simulated/floor/carpet/green,/area/submap/casino_event) "bo" = (/obj/machinery/button/remote/airlock{id = "L7 PGR 2"; name = "Door Lock"; pixel_x = 24; pixel_y = 26; specialfunctions = 4},/turf/simulated/floor/carpet/green,/area/submap/casino_event) -"bp" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/book/manual/wizzoffguide,/obj/item/weapon/deck/wizoff,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cah,/obj/item/weapon/deck/cah/black,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/blue2,/area/submap/casino_event) +"bp" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/book/manual/wizzoffguide,/obj/item/weapon/deck/wizoff,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cah,/obj/item/weapon/deck/cah/black,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/blue2,/area/submap/casino_event) "bq" = (/turf/simulated/floor/carpet/blue2,/area/submap/casino_event) "br" = (/obj/machinery/button/remote/airlock{id = "L7 PGR 3"; name = "Door Lock"; pixel_x = 24; pixel_y = 26; specialfunctions = 4},/turf/simulated/floor/carpet/blue2,/area/submap/casino_event) "bs" = (/obj/structure/railing{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/submap/casino_event) @@ -224,7 +224,7 @@ "ep" = (/obj/structure/table/rack/shelf,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/turf/simulated/floor/tiled/dark,/area/submap/casino_event) "eq" = (/obj/structure/table/woodentable,/obj/random/drinkbottle,/turf/simulated/floor/carpet/brown,/area/submap/casino_event) "er" = (/obj/structure/casino_table/blackjack_l{dir = 4},/turf/simulated/floor/carpet/brown,/area/submap/casino_event) -"es" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/box/roulette_balls_normal,/obj/item/weapon/storage/box/roulette_balls_fancy,/obj/item/weapon/storage/box/roulette_balls_cheat,/turf/simulated/floor/carpet/green,/area/submap/casino_event) +"es" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/box/roulette_balls_normal,/obj/item/weapon/storage/box/roulette_balls_fancy,/obj/item/weapon/storage/box/roulette_balls_cheat,/turf/simulated/floor/carpet/green,/area/submap/casino_event) "et" = (/obj/structure/casino_table/craps{dir = 1},/obj/item/weapon/dice,/obj/item/weapon/dice{pixel_x = 4; pixel_y = 6},/turf/simulated/floor/carpet/brown,/area/submap/casino_event) "eu" = (/obj/machinery/door/airlock{id_tag = "roulette_1"; name = "Private Roulette Room 1"},/turf/simulated/floor/carpet/green,/area/submap/casino_event) "ev" = (/obj/machinery/door/airlock{id_tag = "roulette_2"; name = "Private Roulette Room 2"},/turf/simulated/floor/carpet/purple,/area/submap/casino_event) @@ -271,15 +271,15 @@ "fk" = (/obj/machinery/chipmachine{pixel_x = -32},/obj/machinery/atm{pixel_y = 30},/turf/simulated/floor/carpet/bcarpet,/area/submap/casino_event) "fl" = (/turf/simulated/floor/carpet/bcarpet,/area/submap/casino_event) "fm" = (/obj/machinery/button/remote/airlock{id = "blackjack_1"; name = "Door Lock"; pixel_x = 24; pixel_y = 26; specialfunctions = 4},/turf/simulated/floor/carpet/bcarpet,/area/submap/casino_event) -"fn" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/box/roulette_balls_normal,/obj/item/weapon/storage/box/roulette_balls_fancy,/obj/item/weapon/storage/box/roulette_balls_cheat,/turf/simulated/floor/carpet/purple,/area/submap/casino_event) +"fn" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/box/roulette_balls_normal,/obj/item/weapon/storage/box/roulette_balls_fancy,/obj/item/weapon/storage/box/roulette_balls_cheat,/turf/simulated/floor/carpet/purple,/area/submap/casino_event) "fo" = (/obj/machinery/chipmachine{pixel_x = -32},/obj/machinery/atm{pixel_y = 30},/turf/simulated/floor/carpet/gaycarpet,/area/submap/casino_event) "fp" = (/turf/simulated/floor/carpet/gaycarpet,/area/submap/casino_event) "fq" = (/obj/machinery/button/remote/airlock{id = "blackjack_2"; name = "Door Lock"; pixel_x = 24; pixel_y = 26; specialfunctions = 4},/turf/simulated/floor/carpet/gaycarpet,/area/submap/casino_event) -"fr" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/box/roulette_balls_normal,/obj/item/weapon/storage/box/roulette_balls_fancy,/obj/item/weapon/storage/box/roulette_balls_cheat,/turf/simulated/floor/carpet/blue2,/area/submap/casino_event) +"fr" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/box/roulette_balls_normal,/obj/item/weapon/storage/box/roulette_balls_fancy,/obj/item/weapon/storage/box/roulette_balls_cheat,/turf/simulated/floor/carpet/blue2,/area/submap/casino_event) "fs" = (/obj/machinery/chipmachine{pixel_x = -32},/obj/machinery/atm{pixel_y = 30},/turf/simulated/floor/carpet/turcarpet,/area/submap/casino_event) "ft" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/casino_event) "fu" = (/obj/machinery/button/remote/airlock{id = "blackjack_3"; name = "Door Lock"; pixel_x = 24; pixel_y = 26; specialfunctions = 4},/turf/simulated/floor/carpet/turcarpet,/area/submap/casino_event) -"fv" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/sblucarpet,/area/submap/casino_event) +"fv" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/sblucarpet,/area/submap/casino_event) "fw" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/reddouble,/turf/simulated/floor/wood,/area/submap/casino_event) "fx" = (/obj/item/weapon/stool/baystool/padded,/turf/simulated/floor/carpet/blue2,/area/submap/casino_event) "fy" = (/obj/item/modular_computer/console{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/red/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/submap/casino_event) @@ -448,7 +448,7 @@ "iF" = (/obj/machinery/button/remote/airlock{id = "L7 Room 5"; name = "Door Lock"; pixel_x = 24; pixel_y = 26; specialfunctions = 4},/turf/simulated/floor/wood,/area/submap/casino_event) "iG" = (/obj/machinery/door/airlock{id_tag = "casino_stall_1"; name = "Stall 1"},/turf/simulated/floor/tiled/white,/area/submap/casino_event) "iH" = (/obj/machinery/door/airlock{name = "Backroom"},/turf/simulated/floor/wood,/area/submap/casino_event) -"iI" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/purcarpet,/area/submap/casino_event) +"iI" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/dicecup,/turf/simulated/floor/carpet/purcarpet,/area/submap/casino_event) "iJ" = (/obj/machinery/computer/timeclock/premade/north,/turf/simulated/floor/tiled,/area/submap/casino_event) "iK" = (/obj/machinery/item_bank{pixel_y = 28},/turf/simulated/floor/tiled,/area/submap/casino_event) "iL" = (/turf/space,/area/submap/casino_event) @@ -466,9 +466,9 @@ "iX" = (/obj/machinery/button/remote/airlock{id = "L7 VIP Room"; name = "Door Lock"; pixel_x = 24; pixel_y = 26; specialfunctions = 4},/turf/simulated/floor/wood,/area/submap/casino_event) "iY" = (/obj/effect/overmap/visitable/sector/common_gateway/lucky7,/turf/space,/area/submap/casino_event) "iZ" = (/obj/effect/landmark/hidden_level,/turf/space,/area/submap/casino_event) -"ja" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards,/turf/simulated/floor/carpet/bcarpet,/area/submap/casino_event) -"jb" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards,/turf/simulated/floor/carpet/gaycarpet,/area/submap/casino_event) -"jc" = (/obj/structure/closet/walllocker_double{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards,/turf/simulated/floor/carpet/turcarpet,/area/submap/casino_event) +"ja" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards,/turf/simulated/floor/carpet/bcarpet,/area/submap/casino_event) +"jb" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards,/turf/simulated/floor/carpet/gaycarpet,/area/submap/casino_event) +"jc" = (/obj/structure/closet/walllocker_double/casino{dir = 8; name = "Game Cabinet"; pixel_x = -28},/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards,/turf/simulated/floor/carpet/turcarpet,/area/submap/casino_event) "jd" = (/obj/effect/floor_decal/spline/plain{dir = 5},/turf/simulated/floor/wood,/area/submap/casino_event) "je" = (/obj/machinery/door/airlock{id_tag = "L7 Room 5"; name = "Private Room 5"},/turf/simulated/floor/wood,/area/submap/casino_event) "jn" = (/obj/machinery/door/airlock{name = "Tournament Room"},/turf/simulated/floor/carpet/blue2,/area/submap/casino_event)