diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 50d40697..884fe7b3 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -178,7 +178,7 @@ /obj/structure/sign/poster/contraband poster_item_name = "contraband poster" - poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities." + poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard space facilities." poster_item_icon_state = "rolled_poster" /obj/structure/sign/poster/contraband/random @@ -264,7 +264,7 @@ /obj/structure/sign/poster/contraband/power name = "Power" - desc = "A poster that positions the seat of power outside Nanotrasen." + desc = "A poster that positions the seat of power outside Kinaris.Co." icon_state = "poster16" /obj/structure/sign/poster/contraband/space_cube @@ -425,8 +425,8 @@ icon_state = "poster1_legit" /obj/structure/sign/poster/official/nanotrasen_logo - name = "Nanotrasen Logo" - desc = "A poster depicting the Nanotrasen logo." + name = "Kinaris Logo" + desc = "A poster depicting the Kinaris.Co logo." icon_state = "poster2_legit" /obj/structure/sign/poster/official/cleanliness @@ -556,12 +556,12 @@ /obj/structure/sign/poster/official/pda_ad name = "PDA Ad" - desc = "A poster advertising the latest PDA from Nanotrasen suppliers." + desc = "A poster advertising the latest PDA from Think-a-tronic suppliers." icon_state = "poster28_legit" /obj/structure/sign/poster/official/enlist name = "Enlist" // but I thought deathsquad was never acknowledged - desc = "Enlist in the Nanotrasen Deathsquadron reserves today!" + desc = "Enlist in the Kinaris Deathsquadron reserves today!" icon_state = "poster29_legit" /obj/structure/sign/poster/official/nanomichi_ad @@ -586,7 +586,7 @@ /obj/structure/sign/poster/official/no_erp name = "No ERP" - desc = "This poster reminds the crew that Eroticism, Rape and Pornography are banned on Nanotrasen stations." + desc = "This poster reminds the crew that Eroticism, Rape and Pornography are banned on Kinaris stations." icon_state = "poster34_legit" /obj/structure/sign/poster/official/wtf_is_co2 diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index 1708753d..e72bd73a 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -6,7 +6,7 @@ /obj/effect/turf_decal/tile/blue name = "blue corner" - color = "#52B4E9" + color = "#8e9929" /obj/effect/turf_decal/tile/green name = "green corner" diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index a8ba2597..3008e98c 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -115,7 +115,7 @@ LINEN BINS /obj/item/bedsheet/captain name = "captain's bedsheet" - desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains." + desc = "It has a Kinaris symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains." icon_state = "sheetcaptain" item_color = "captain" dream_messages = list("authority", "a golden ID", "sunglasses", "a green disc", "an antique gun", "the captain") @@ -214,8 +214,8 @@ LINEN BINS dream_messages = list("a book", "an explosion", "lightning", "a staff", "a skeleton", "a robe", "magic") /obj/item/bedsheet/nanotrasen - name = "nanotrasen bedsheet" - desc = "It has the Nanotrasen logo on it and has an aura of duty." + name = "Kinaris bedsheet" + desc = "It has the Kinaris.Co logo on it and has an aura of duty." icon_state = "sheetNT" item_color = "nanotrasen" dream_messages = list("authority", "an ending") diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 0781d240..77c23c58 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -182,7 +182,7 @@ name = "Datapad" icon = 'icons/obj/library.dmi' icon_state ="book" - desc = "A fancy new state of the art Digital-Readpad(tm) provided by Nanotrasen, No more 20th century paper!" + desc = "A fancy new state of the art Digital-Readpad(tm) provided by Kinaris.Co, No more 20th century paper!" throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi index 3bbb57d9..f6657804 100644 Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi index 1cc99e09..4fe63126 100644 Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 1ced4827..70607d58 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index f86dd2e7..b99429ae 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index b13ae0b8..1b653f36 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 3a6d8023..3831b35f 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index e027c815..1aba5d22 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/modular_console.dmi b/icons/obj/modular_console.dmi index 8d4ec3e2..93357237 100644 Binary files a/icons/obj/modular_console.dmi and b/icons/obj/modular_console.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index d5cae1db..1b7bc3f4 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ