cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10344 from KillianKirilenko/kk-misc2

Browse Source 
Explorer/Pilot ID & Locker Addons
This commit is contained in:
Novacat
2021-05-17 12:54:28 -04:00
committed by Chompstation Bot
parent 129eaeade4
commit 23d3beed44
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__defines/color.dm
View File

@@ -91,6 +91,7 @@
#define COLOR_DARK_TEAL "#2db5b5" #define COLOR_DARK_TEAL "#2db5b5"
#define COLOR_LIGHT_VIOLET "#e7bfff" #define COLOR_LIGHT_VIOLET "#e7bfff"
#define COLOR_SAN_MARINO_BLUE "#4b75ab" #define COLOR_SAN_MARINO_BLUE "#4b75ab"
#define COLOR_OLIVE "#52613b" //VOREStation Addition
#define PIPE_COLOR_GREY "#808080" #define PIPE_COLOR_GREY "#808080"
#define PIPE_COLOR_RED "#ff0000" #define PIPE_COLOR_RED "#ff0000"

8
code/game/objects/items/weapons/id cards/id_stacks_vr.dm
View File

@@ -145,7 +145,7 @@
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red") initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red")
/obj/item/weapon/card/id/civilian/pilot /obj/item/weapon/card/id/civilian/pilot
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-darkgreen") initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-olive")
/obj/item/weapon/card/id/civilian/entertainer /obj/item/weapon/card/id/civilian/entertainer
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown") initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown")
@@ -179,13 +179,13 @@
//Exploration //Exploration
/obj/item/weapon/card/id/exploration /obj/item/weapon/card/id/exploration
initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n") initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n")
/obj/item/weapon/card/id/exploration/fm /obj/item/weapon/card/id/exploration/fm
initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n", "stripe-medblu") initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu")
/obj/item/weapon/card/id/exploration/head /obj/item/weapon/card/id/exploration/head
initial_sprite_stack = list("base-stamp-silver", "top-darkgreen", "stamp-n", "pips-white") initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white")
//Talon //Talon

14
code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
View File

@@ -65,7 +65,7 @@
) )
/decl/closet_appearance/secure_closet/expedition /decl/closet_appearance/secure_closet/expedition
color = COLOR_BRASS color = COLOR_OLIVE
decals = list( decals = list(
"lower_side_vent" "lower_side_vent"
) )
@@ -84,15 +84,13 @@
/decl/closet_appearance/secure_closet/expedition/explorer /decl/closet_appearance/secure_closet/expedition/explorer
extra_decals = list( extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE, "stripe_vertical_mid_full" = COLOR_GRAY40,
"stripe_vertical_right_full" = COLOR_PURPLE, "exped" = COLOR_GRAY40
"exped" = COLOR_PURPLE
) )
/decl/closet_appearance/secure_closet/expedition/pathfinder /decl/closet_appearance/secure_closet/expedition/pathfinder
extra_decals = list( extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE, "stripe_vertical_left_full" = COLOR_GRAY20,
"stripe_vertical_mid_full" = COLOR_GRAY40, "stripe_vertical_right_full" = COLOR_GRAY20,
"stripe_vertical_right_full" = COLOR_PURPLE, "exped" = COLOR_GRAY20
"exped" = COLOR_GRAY40
) )

BIN
icons/obj/card_new_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB