mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 13:39:16 +01:00
Fix
This commit is contained in:
@@ -25,13 +25,8 @@
|
||||
desc = "A white folder."
|
||||
icon_state = "folder_white"
|
||||
|
||||
<<<<<<< HEAD
|
||||
/obj/item/folder/blue_captain
|
||||
desc = "A blue folder with Site Manager markings."
|
||||
=======
|
||||
/obj/item/folder/blue_captain
|
||||
desc = "A blue folder with " + JOB_SITE_MANAGER + " markings."
|
||||
>>>>>>> master
|
||||
icon_state = "folder_captain"
|
||||
|
||||
/obj/item/folder/blue_hop
|
||||
|
||||
Reference in New Issue
Block a user