diff --git a/code/datums/ert.dm b/code/datums/ert.dm index e18c6701..6cd4bf0a 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -13,7 +13,7 @@ /datum/ert/New() if (!polldesc) - polldesc = "a Code [code] Nanotrasen Emergency Response Team" + polldesc = "a Code [code] Kinaris Emergency Response Team" /datum/ert/blue opendoors = FALSE @@ -54,7 +54,7 @@ leader_role = /datum/antagonist/ert/commander/inquisitor rename_team = "Inquisition" mission = "Destroy any traces of paranormal activity aboard the station." - polldesc = "a Nanotrasen paranormal response team" + polldesc = "a Kinaris paranormal response team" /datum/ert/greybois code = "Green" diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 353d8d67..b6cae9e2 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1168,7 +1168,7 @@ illustration = null /obj/item/storage/box/mre //base MRE type. - name = "Nanotrasen MRE Ration Kit Menu 0" + name = "Kinaris MRE Ration Kit Menu 0" desc = "A package containing food suspended in an outdated bluespace pocket which lasts for centuries. If you're lucky you may even be able to enjoy the meal without getting food poisoning." icon_state = "mre" illustration = null @@ -1194,7 +1194,7 @@ ENABLE_BITFIELD(S.foodtype, TOXIC) /obj/item/storage/box/mre/menu1 - name = "\improper Nanotrasen MRE Ration Kit Menu 1" + name = "\improper Kinaris MRE Ration Kit Menu 1" /obj/item/storage/box/mre/menu1/safe desc = "A package containing food suspended in a bluespace pocket capable of lasting till the end of time." @@ -1209,7 +1209,7 @@ new /obj/item/tank/internals/emergency_oxygen(src) /obj/item/storage/box/mre/menu2 - name = "\improper Nanotrasen MRE Ration Kit Menu 2" + name = "\improper Kinaris MRE Ration Kit Menu 2" /obj/item/storage/box/mre/menu2/safe spawner_chance = 0 @@ -1224,7 +1224,7 @@ new /obj/item/tank/internals/emergency_oxygen(src) /obj/item/storage/box/mre/menu3 - name = "\improper Nanotrasen MRE Ration Kit Menu 3" + name = "\improper Kinaris MRE Ration Kit Menu 3" desc = "The holy grail of MREs. This item contains the fabled MRE pizza, spicy nachos and a sample of coffee instant type 2. Any NT employee lucky enough to get their hands on one of these is truly blessed." icon_state = "menu3" can_expire = FALSE //always fresh, never expired. @@ -1239,7 +1239,7 @@ new /obj/item/tank/internals/emergency_oxygen(src) /obj/item/storage/box/mre/menu4 - name = "\improper Nanotrasen MRE Ration Kit Menu 4" + name = "\improper Kinaris MRE Ration Kit Menu 4" /obj/item/storage/box/mre/menu4/safe spawner_chance = 0 diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm index 2ac79f6e..1bf3fda8 100644 --- a/code/modules/cargo/bounties/science.dm +++ b/code/modules/cargo/bounties/science.dm @@ -1,24 +1,24 @@ /datum/bounty/item/science/boh name = "Bag of Holding" - description = "Nanotrasen would make good use of high-capacity backpacks. If you have any, please ship them." + description = "Centcom would make good use of high-capacity backpacks. If you have any, please ship them." reward = 10000 wanted_types = list(/obj/item/storage/backpack/holding) /datum/bounty/item/science/tboh name = "Trash Bag of Holding" - description = "Nanotrasen would make good use of high-capacity trash bags. If you have any, please ship them." + description = "Centcom would make good use of high-capacity trash bags. If you have any, please ship them." reward = 10000 wanted_types = list(/obj/item/storage/backpack/holding) /datum/bounty/item/science/bluespace_syringe name = "Bluespace Syringe" - description = "Nanotrasen would make good use of high-capacity syringes. If you have any, please ship them." + description = "Centcom would make good use of high-capacity syringes. If you have any, please ship them." reward = 10000 wanted_types = list(/obj/item/reagent_containers/syringe/bluespace) /datum/bounty/item/science/bluespace_body_bag name = "Bluespace Body Bag" - description = "Nanotrasen would make good use of high-capacity body bags. If you have any, please ship them." + description = "Centcom would make good use of high-capacity body bags. If you have any, please ship them." reward = 10000 wanted_types = list(/obj/item/bodybag/bluespace) diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm index adffaf99..d1b99cae 100644 --- a/code/modules/cargo/bounties/special.dm +++ b/code/modules/cargo/bounties/special.dm @@ -1,6 +1,6 @@ /datum/bounty/item/alien_organs name = "Alien Organs" - description = "Nanotrasen is interested in studying Xenomorph biology. Ship a set of organs to be thoroughly compensated." + description = "Various research divisions are interested in studying Xenomorph biology. Ship a set of organs to be thoroughly compensated." reward = 25000 required_count = 3 wanted_types = list(/obj/item/organ/brain/alien, /obj/item/organ/alien, /obj/item/organ/body_egg/alien_embryo) @@ -21,7 +21,7 @@ /datum/bounty/item/adamantine name = "Adamantine" - description = "Nanotrasen's anomalous materials division is in desparate need for Adamantine. Send them a large shipment and we'll make it worth your while." + description = "Centcom's anomalous materials division is in desparate need for Adamantine. Send them a large shipment and we'll make it worth your while." reward = 35000 required_count = 10 wanted_types = list(/obj/item/stack/sheet/mineral/adamantine) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 83e1bd00..3d732a1f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -228,7 +228,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //backgrounds var/mutable_appearance/character_background var/icon/bgstate = "steel" - var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced") + var/list/bgstate_options = list("000", "midgrey", "hiro", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced") var/show_mismatched_markings = FALSE //determines whether or not the markings lists should show markings that don't match the currently selected species. Intentionally left unsaved. diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index cea89078..ebef17ab 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -9,7 +9,7 @@ Captain faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "Nanotrasen officials and Space law" + supervisors = "Kinaris officials and Space law" selection_color = "#ccccff" req_admin_notify = 1 minimal_player_age = 5 diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index f8957bde..1dbbd727 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ae5a8539..f3750013 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 71abf1aa..a9f6ed9a 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 1b7bc3f4..e8be260f 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 22e4aef6..0ea6e014 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -16,7 +16,7 @@ /obj/item/clothing/suit/hooded/cloak/david name = "red cloak" icon_state = "goliath_cloak" - desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" + desc = "Ever wanted to look like a badass without ANY effort? Try this red cloak, perfect for kids" hoodtype = /obj/item/clothing/head/hooded/cloakhood/david body_parts_covered = CHEST|GROIN|ARMS mutantrace_variation = NO_MUTANTRACE_VARIATION @@ -24,7 +24,7 @@ /obj/item/clothing/head/hooded/cloakhood/david name = "red cloak hood" icon_state = "golhood" - desc = "conceal your face in shame with this nanotrasen brand hood" + desc = "conceal your face in shame with this." flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/modular_citadel/icons/ui/backgrounds.dmi b/modular_citadel/icons/ui/backgrounds.dmi index 7e061d6b..b22ce214 100644 Binary files a/modular_citadel/icons/ui/backgrounds.dmi and b/modular_citadel/icons/ui/backgrounds.dmi differ