diff --git a/code/datums/craft/recipes/misc.dm b/code/datums/craft/recipes/misc.dm index efa16c7c93..093eaa90c3 100644 --- a/code/datums/craft/recipes/misc.dm +++ b/code/datums/craft/recipes/misc.dm @@ -120,9 +120,9 @@ name = "red folder" result = /obj/item/weapon/folder/red -/datum/craft_recipe/folder/white - name = "white folder" - result = /obj/item/weapon/folder/white +/datum/craft_recipe/folder/cyan + name = "cyan folder" + result = /obj/item/weapon/folder/cyan /datum/craft_recipe/folder/yellow name = "yellow folder" diff --git a/code/game/objects/items/weapons/secdocs.dm b/code/game/objects/items/weapons/secdocs.dm index ba4fbde72c..3ddb8e393f 100644 --- a/code/game/objects/items/weapons/secdocs.dm +++ b/code/game/objects/items/weapons/secdocs.dm @@ -1,8 +1,8 @@ /obj/item/weapon/oddity/secdocs name = "science data" desc = "Folder contains some papers with important science data." - icon = 'icons/obj/items.dmi' - icon_state = "scifolder0" + icon = 'icons/obj/oddities.dmi' + icon_state = "folder" price_tag = 5000 oddity_stats = list( @@ -14,7 +14,7 @@ var/static/inv_spawn_count = 3 /obj/item/weapon/oddity/secdocs/Initialize() - icon_state = "scifolder[rand(0,3)]" + icon_state = "folder-[pick("omega","psi","theta")]" name = pick("Atractor fields theory", "World lines theory", "Outside context problem evidence", diff --git a/code/game/objects/random/junk.dm b/code/game/objects/random/junk.dm index 5ef7c508e9..25e98896ef 100644 --- a/code/game/objects/random/junk.dm +++ b/code/game/objects/random/junk.dm @@ -14,7 +14,7 @@ /obj/item/weapon/folder/blue = 2, /obj/item/weapon/folder/red = 2, /obj/item/weapon/folder/yellow = 2, - /obj/item/weapon/folder/white = 2, + /obj/item/weapon/folder/cyan = 2, /obj/item/weapon/circuitboard/broken = 3, /obj/item/weapon/material_trash/metal = 9, /obj/item/weapon/material_trash/circuit = 6, diff --git a/code/game/objects/random/purerandom.dm b/code/game/objects/random/purerandom.dm index 3390b417e6..d9dbe112bf 100755 --- a/code/game/objects/random/purerandom.dm +++ b/code/game/objects/random/purerandom.dm @@ -45,7 +45,7 @@ /obj/item/weapon/folder/blue = 2, /obj/item/weapon/folder/red = 2, /obj/item/weapon/folder/yellow = 2, - /obj/item/weapon/folder/white = 2, + /obj/item/weapon/folder/cyan = 2, /obj/item/weapon/paper_bin = 2, /obj/item/device/flash = 2, /obj/item/device/camera_film = 4, diff --git a/code/modules/client/preference_setup/loadout/lists/utility.dm b/code/modules/client/preference_setup/loadout/lists/utility.dm index 84929a1152..77a072c7c6 100644 --- a/code/modules/client/preference_setup/loadout/lists/utility.dm +++ b/code/modules/client/preference_setup/loadout/lists/utility.dm @@ -21,7 +21,7 @@ ..() var/folder = list( "Grey" = /obj/item/weapon/folder, - "White" = /obj/item/weapon/folder/white, + "Cyan" = /obj/item/weapon/folder/cyan, "Red" = /obj/item/weapon/folder/red, "Yellow" = /obj/item/weapon/folder/yellow, "Blue" = /obj/item/weapon/folder/blue, diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b8d576a8c5..0345a89d73 100755 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -429,6 +429,7 @@ BLIND // can't see anything var/fire_resist = T0C+100 body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS allowed = list( + /obj/item/weapon/clipboard, /obj/item/weapon/storage/pouch/, /obj/item/weapon/gun, /obj/item/weapon/melee, diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 4dd8d8e318..933d31d131 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -18,9 +18,9 @@ desc = "A yellow folder." icon_state = "folder_yellow" -/obj/item/weapon/folder/white - desc = "A white folder." - icon_state = "folder_white" +/obj/item/weapon/folder/cyan + desc = "A cyan folder." + icon_state = "folder_cyan" /obj/item/weapon/folder/update_icon() overlays.Cut() diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index e258819510..cc18b787a3 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 441cbceec4..8781201bfa 100755 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/oddities.dmi b/icons/obj/oddities.dmi index bfac0a8c02..91d8ad1f77 100644 Binary files a/icons/obj/oddities.dmi and b/icons/obj/oddities.dmi differ diff --git a/maps/CEVEris/_CEV_Eris.dmm b/maps/CEVEris/_CEV_Eris.dmm index 84081af225..cd6d40b9ba 100644 --- a/maps/CEVEris/_CEV_Eris.dmm +++ b/maps/CEVEris/_CEV_Eris.dmm @@ -52695,7 +52695,7 @@ /area/eris/medical/medbay/iso) "cmZ" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, +/obj/item/weapon/folder/cyan, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/tiled/white/violetcorener, /area/eris/medical/medbay/iso) @@ -81362,7 +81362,7 @@ /area/eris/command/mbo) "dzY" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, +/obj/item/weapon/folder/cyan, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -83290,8 +83290,8 @@ /area/eris/engineering/construction) "dEj" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/folder/white, +/obj/item/weapon/folder/cyan, +/obj/item/weapon/folder/cyan, /obj/item/weapon/hand_labeler, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/storage/box/gloves, diff --git a/maps/encounters/spacefortress/spacefortress.dmm b/maps/encounters/spacefortress/spacefortress.dmm index 66ff62a693..ebd386e675 100644 --- a/maps/encounters/spacefortress/spacefortress.dmm +++ b/maps/encounters/spacefortress/spacefortress.dmm @@ -391,10 +391,6 @@ /obj/random/material_rare/low_chance, /turf/simulated/floor/tiled, /area/outpost/abandoned_fortress) -"bS" = ( -/obj/item/weapon/folder/white, -/turf/simulated/floor/tiled, -/area/outpost/abandoned_fortress) "bT" = ( /obj/structure/sink{ icon_state = "sink"; @@ -13370,7 +13366,7 @@ ae ae ae ab -bS +bp bp bp ab @@ -21836,7 +21832,7 @@ bp bp bp bp -bS +bp bp aN aS @@ -26292,7 +26288,7 @@ ab ab ae ab -bS +bp bp bp ac