cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 14:08:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Two small fixes

Browse Source
This commit is contained in:
Heroman
2023-08-27 11:41:12 +10:00
parent e46bd401a7
commit 347d44d05c
6 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/color.dm
+1 -1
View File
@@ -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"
code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
+9
View File
@@ -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
code/game/objects/structures/crates_lockers/closets/walllocker.dm
+19
View File
@@ -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
code/modules/mob/living/silicon/robot/robot_modules/station.dm
+1 -1
View File
@@ -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
icons/obj/closets/decals/wall_double.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

maps/submaps/admin_use_vr/lucky_7.dmm
+11 -11
View File
@@ -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)