diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index a5315670..318abb5c 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -1009,7 +1009,7 @@ /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space{ assignedrole = "Space Syndicate"; dir = 8; - flavour_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. Monitor enemy activity as best you can, and try to keep a low profile. DON'T abandon the base without good cause. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!" + flavour_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. Monitor enemy activity as best you can, and try to keep a low profile. DON'T abandon the base without good cause. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Kinaris off your trail. Do not let the base fall into enemy hands!" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8; diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 794395ba..f2469307 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -38671,7 +38671,7 @@ "brB" = ( /obj/structure/table/wood, /obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, @@ -52780,7 +52780,7 @@ pixel_x = 7 }, /obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, @@ -56660,7 +56660,7 @@ pixel_y = -26 }, /obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, @@ -57499,7 +57499,7 @@ /area/crew_quarters/heads/chief) "bTQ" = ( /obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, @@ -81548,7 +81548,7 @@ /obj/item/toy/gun, /obj/item/clothing/head/beret/sec{ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); - desc = "A replica beret resembling that of a special operations officer under Nanotrasen."; + desc = "A replica beret resembling that of a special operations officer under Kinaris."; name = "replica officer's beret" }, /obj/item/radio/intercom{ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c55b1aaf..41410a62 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -60,7 +60,7 @@ "aae" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /mob/living/simple_animal/hostile/retaliate/bat{ - desc = "A fierce companion for any person of power, this spider has been carefully trained by Nanotrasen specialists. Its beady, staring eyes send shivers down your spine."; + desc = "A fierce companion for any person of power, this spider has been carefully trained by Kinaris specialists. Its beady, staring eyes send shivers down your spine."; emote_hear = list("chitters"); faction = list("spiders"); harm_intent_damage = 3; @@ -2360,7 +2360,7 @@ dir = 5 }, /obj/structure/sign/warning/securearea{ - desc = "A warning sign which reads 'WARNING: Do Not Enter When Red Light Shows', detailing the penalties that any Nanotrasen employee or silicon will suffer if violating this rule."; + desc = "A warning sign which reads 'WARNING: Do Not Enter When Red Light Shows', detailing the penalties that any Kinaris employee or silicon will suffer if violating this rule."; name = "WARNING: Do Not Enter When Red Light Shows"; pixel_y = 32 }, @@ -3270,7 +3270,7 @@ /area/crew_quarters/heads/hos) "agj" = ( /obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, @@ -9886,7 +9886,7 @@ /area/security/main) "ass" = ( /obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, @@ -49340,7 +49340,7 @@ "bQq" = ( /obj/structure/table/wood, /obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, @@ -50111,7 +50111,7 @@ /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/bridge/showroom/corporate"; dir = 4; - name = "Nanotrasen Corporate Showroom APC"; + name = "Kinaris Corporate Showroom APC"; pixel_x = 28 }, /obj/structure/cable/yellow{ @@ -50819,7 +50819,7 @@ /obj/structure/table/wood, /obj/item/toy/plush/carpplushie{ color = "red"; - name = "Nanotrasen wildlife department space carp plushie" + name = "Kinaris wildlife department space carp plushie" }, /turf/open/floor/carpet, /area/bridge/showroom/corporate) @@ -50847,8 +50847,8 @@ /obj/item/poster/random_official, /obj/item/poster/random_official, /obj/item/paicard{ - desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; - name = "Nanotrasen-brand personal AI device exhibit" + desc = "A real Kinaris success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; + name = "Kinaris-brand personal AI device exhibit" }, /turf/open/floor/carpet, /area/bridge/showroom/corporate) @@ -51391,8 +51391,8 @@ "bUK" = ( /obj/structure/table/wood, /obj/item/storage/secure/briefcase{ - desc = "A large briefcase with a digital locking system, and the Nanotrasen logo emblazoned on the sides."; - name = "Nanotrasen-brand secure briefcase exhibit"; + desc = "A large briefcase with a digital locking system, and the Kinaris logo emblazoned on the sides."; + name = "Kinaris-brand secure briefcase exhibit"; pixel_y = 2 }, /turf/open/floor/carpet, @@ -51414,8 +51414,8 @@ icon_state = "2-4" }, /obj/item/toy/beach_ball{ - desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen"; - name = "Nanotrasen-brand beach ball"; + desc = "The simple beach ball is one of Kinaris's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Kinaris"; + name = "Kinaris-brand beach ball"; pixel_y = 7 }, /obj/structure/table/wood, @@ -51499,7 +51499,7 @@ }, /obj/structure/table/wood, /obj/item/toy/talking/AI{ - name = "Nanotrasen-brand toy AI"; + name = "Kinaris-brand toy AI"; pixel_y = 6 }, /turf/open/floor/carpet, @@ -58029,7 +58029,7 @@ }, /mob/living/simple_animal/bot/medbot{ auto_patrol = 1; - desc = "A little medical robot, officially part of the Nanotrasen medical inspectorate. He looks somewhat underwhelmed."; + desc = "A little medical robot, officially part of the Kinaris medical inspectorate. He looks somewhat underwhelmed."; name = "Inspector Johnson" }, /turf/open/floor/plasteel/white, diff --git a/_maps/map_files/OmegaStation/job_changes.dm b/_maps/map_files/OmegaStation/job_changes.dm index bef766da..e58298eb 100644 --- a/_maps/map_files/OmegaStation/job_changes.dm +++ b/_maps/map_files/OmegaStation/job_changes.dm @@ -20,7 +20,7 @@ /datum/job/captain/New() ..() MAP_JOB_CHECK - supervisors = "Nanotrasen and Central Command" + supervisors = "Kinaris and Central Command" /datum/job/hop/New() ..() diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index fec9f956..5289ee11 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -5101,7 +5101,7 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/structure/sign/plaques/kiddie{ - desc = "An embossed piece of paper from the University of Nanotrasen at Portpoint."; + desc = "An embossed piece of paper from the University of Kinaris at Portpoint."; name = "\improper 'Diploma' frame"; pixel_y = 32 }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 8998a942..87c97cf8 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -193,11 +193,11 @@ "dK" = (/obj/item/cardboard_cutout/adaptive{color = "#9999BB"; icon_state = "cutout_ian"; name = "Black Knight"},/turf/open/floor/holofloor{icon_state = "white"},/area/holodeck/rec_center/spacechess) "dL" = (/turf/open/floor/holofloor/grass,/area/holodeck/rec_center/thunderdome1218) "dM" = (/obj/structure/chair/wood/wings,/turf/open/floor/holofloor/grass,/area/holodeck/rec_center/thunderdome1218) -"dN" = (/obj/structure/window/reinforced,/obj/machinery/mass_driver{dir = 1; icon_state = "mass_driver"; id = "trektorpedo1"; name = "photon torpedo tube"},/obj/item/toy/minimeteor{color = ""; desc = "A primitive long-range weapon, inferior to Nanotrasen's perfected bluespace artillery."; icon = 'icons/effects/effects.dmi'; icon_state = "impact_laser"; name = "photon torpedo"},/turf/open/floor/holofloor/hyperspace,/area/holodeck/rec_center/kobayashi) +"dN" = (/obj/structure/window/reinforced,/obj/machinery/mass_driver{dir = 1; icon_state = "mass_driver"; id = "trektorpedo1"; name = "photon torpedo tube"},/obj/item/toy/minimeteor{color = ""; desc = "A primitive long-range weapon, inferior to Kinaris's perfected bluespace artillery."; icon = 'icons/effects/effects.dmi'; icon_state = "impact_laser"; name = "photon torpedo"},/turf/open/floor/holofloor/hyperspace,/area/holodeck/rec_center/kobayashi) "dO" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/computer/arcade/orion_trail/kobayashi,/turf/open/floor/holofloor/plating,/area/holodeck/rec_center/kobayashi) "dP" = (/obj/machinery/button/massdriver{id = "trektorpedo1"; layer = 3.9; name = "photon torpedo button"; pixel_x = -16; pixel_y = -5},/obj/machinery/button/massdriver{id = "trektorpedo2"; layer = 3.9; name = "photon torpedo button"; pixel_x = 16; pixel_y = -5},/obj/machinery/computer/arcade/orion_trail/kobayashi,/turf/open/floor/holofloor/plating,/area/holodeck/rec_center/kobayashi) "dQ" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/computer/arcade/orion_trail/kobayashi,/turf/open/floor/holofloor/plating,/area/holodeck/rec_center/kobayashi) -"dR" = (/obj/structure/window/reinforced,/obj/machinery/mass_driver{dir = 1; icon_state = "mass_driver"; id = "trektorpedo2"; name = "photon torpedo tube"},/obj/item/toy/minimeteor{color = ""; desc = "A primitive long-range weapon, inferior to Nanotrasen's perfected bluespace artillery."; icon = 'icons/effects/effects.dmi'; icon_state = "impact_laser"; name = "photon torpedo"},/turf/open/floor/holofloor/hyperspace,/area/holodeck/rec_center/kobayashi) +"dR" = (/obj/structure/window/reinforced,/obj/machinery/mass_driver{dir = 1; icon_state = "mass_driver"; id = "trektorpedo2"; name = "photon torpedo tube"},/obj/item/toy/minimeteor{color = ""; desc = "A primitive long-range weapon, inferior to Kinaris's perfected bluespace artillery."; icon = 'icons/effects/effects.dmi'; icon_state = "impact_laser"; name = "photon torpedo"},/turf/open/floor/holofloor/hyperspace,/area/holodeck/rec_center/kobayashi) "dS" = (/obj/structure/chair{dir = 4},/turf/open/floor/holofloor{icon_state = "chapel"; dir = 1},/area/holodeck/rec_center/chapelcourt) "dT" = (/turf/open/floor/holofloor{icon_state = "chapel"; dir = 4},/area/holodeck/rec_center/chapelcourt) "dU" = (/obj/structure/chair,/turf/open/floor/holofloor{dir = 8; icon_state = "dark"},/area/holodeck/rec_center/chapelcourt) @@ -866,7 +866,7 @@ "qH" = (/obj/effect/turf_decal/bot,/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/window/brigdoor{name = "CentCom Customs"; icon_state = "rightsecure"; dir = 4; req_access_txt = "109"; base_state = "rightsecure"},/turf/open/floor/plasteel,/area/centcom/evac) "qI" = (/obj/effect/turf_decal/stripes/line{dir = 2},/obj/machinery/light{dir = 1},/turf/open/floor/plating,/area/syndicate_mothership) "qJ" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/evac) -"qK" = (/obj/structure/table/wood,/obj/item/phone{desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/obj/item/clothing/mask/cigarette/cigar/cohiba{pixel_x = 6},/obj/item/clothing/mask/cigarette/cigar/havana{pixel_x = 2},/obj/item/clothing/mask/cigarette/cigar{pixel_x = 4.5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/item/book/lorebooks/welcome_to_kinaris,/turf/open/floor/plasteel/grimy,/area/centcom/ferry) +"qK" = (/obj/structure/table/wood,/obj/item/phone{desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/obj/item/clothing/mask/cigarette/cigar/cohiba{pixel_x = 6},/obj/item/clothing/mask/cigarette/cigar/havana{pixel_x = 2},/obj/item/clothing/mask/cigarette/cigar{pixel_x = 4.5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/item/book/lorebooks/welcome_to_kinaris,/turf/open/floor/plasteel/grimy,/area/centcom/ferry) "qL" = (/obj/item/cardboard_cutout{desc = "They seem to be ignoring you... Typical."; icon_state = "cutout_ntsec"; name = "Private Security Officer"},/turf/open/floor/plasteel/dark,/area/centcom/evac) "qM" = (/obj/effect/turf_decal/bot,/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/window/brigdoor{base_state = "rightsecure"; dir = 4; icon_state = "leftsecure"; name = "CentCom Stand"; req_access_txt = "109"},/turf/open/floor/plasteel,/area/centcom/evac) "qN" = (/obj/structure/extinguisher_cabinet{pixel_x = -24},/obj/machinery/computer/secure_data{dir = 1},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/centcom/evac) @@ -1214,7 +1214,7 @@ "yU" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/centcom{name = "CentCom"; opacity = 1},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/turf/open/floor/plasteel,/area/centcom/control) "yV" = (/obj/structure/table,/obj/item/kitchen/rollingpin,/turf/open/floor/plasteel/cafeteria,/area/syndicate_mothership) "yY" = (/obj/structure/table/wood,/obj/item/storage/fancy/donut_box,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) -"yZ" = (/obj/structure/table/wood,/obj/item/phone{desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/obj/item/clothing/mask/cigarette/cigar/cohiba{pixel_x = 6},/obj/item/clothing/mask/cigarette/cigar/havana{pixel_x = 2},/obj/item/clothing/mask/cigarette/cigar{pixel_x = 4.5},/obj/machinery/newscaster{pixel_y = 32},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) +"yZ" = (/obj/structure/table/wood,/obj/item/phone{desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/obj/item/clothing/mask/cigarette/cigar/cohiba{pixel_x = 6},/obj/item/clothing/mask/cigarette/cigar/havana{pixel_x = 2},/obj/item/clothing/mask/cigarette/cigar{pixel_x = 4.5},/obj/machinery/newscaster{pixel_y = 32},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) "za" = (/obj/structure/bookcase/random,/obj/machinery/light{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) "zb" = (/obj/structure/table/wood,/obj/machinery/computer/med_data/laptop,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) "zd" = (/obj/item/twohanded/required/kirbyplants{icon_state = "plant-22"},/obj/machinery/light{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm index 242889e3..e87c4d3e 100644 --- a/code/__DEFINES/cargo.dm +++ b/code/__DEFINES/cargo.dm @@ -17,12 +17,12 @@ #define POD_DESC 3 #define POD_STYLES list(\ - list("supplypod", "supply pod", "A Nanotrasen supply drop pod."),\ - list("bluespacepod", "bluespace supply pod" , "A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."),\ - list("centcompod", "\improper Centcom supply pod", "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to Centcom after delivery."),\ + list("supplypod", "supply pod", "A Kinaris supply drop pod."),\ + list("bluespacepod", "bluespace supply pod" , "A Kinaris Bluespace supply pod. Teleports back to CentCom after delivery."),\ + list("centcompod", "\improper Centcom supply pod", "A Kinaris supply pod, this one has been marked with Central Command's designations. Teleports back to Centcom after delivery."),\ list("syndiepod", "blood-red supply pod", "A dark, intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\ - list("squadpod", "\improper MK. II supply pod", "A Nanotrasen supply pod. This one has been marked the markings of some sort of elite strike team."),\ - list("cultpod", "bloody supply pod", "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\ + list("squadpod", "\improper MK. II supply pod", "A Kinaris supply pod. This one has been marked the markings of some sort of elite strike team."),\ + list("cultpod", "bloody supply pod", "A Kinaris supply pod covered in scratch-marks, blood, and strange runes."),\ list("missilepod", "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\ list("smissilepod", "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\ list("boxpod", "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\ diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 9ecde198..5fd4ca88 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -81,6 +81,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( // Citadel specific species #define isipcperson(A) (is_species(A, /datum/species/ipc)) +#define issynthliz(A) (is_species(A, /datum/species/synthliz)) #define ismammal(A) (is_species(A, /datum/species/mammal)) #define isavian(A) (is_species(A, /datum/species/avian)) #define isaquatic(A) (is_species(A, /datum/species/aquatic)) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 341a0408..c5a2f65a 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -39,6 +39,7 @@ #define MOB_ORGANIC "organic" #define MOB_INORGANIC "inorganic" #define MOB_ROBOTIC "robotic" +#define MOB_SILICON "silicon" #define MOB_UNDEAD "undead" #define MOB_HUMANOID "humanoid" #define MOB_BUG "bug" diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 834fbea9..ab4d42c5 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -200,7 +200,7 @@ send_news_report() //tell the nice people on discord what went on before the salt cannon happens. - world.TgsTargetedChatBroadcast("The current round has ended. Please standby for your shift interlude Nanotrasen News Network's report!", FALSE) + world.TgsTargetedChatBroadcast("The current round has ended. Please standby for your shift interlude Kinaris News Network's report!", FALSE) world.TgsTargetedChatBroadcast(send_news_report(),FALSE) CHECK_TICK diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 49f9f120..f425e08c 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -251,7 +251,7 @@ SUBSYSTEM_DEF(shuttle) if(!admiral_message) admiral_message = pick(GLOB.admiral_messages) - var/intercepttext = "Nanotrasen Update: Request For Shuttle.
\ + var/intercepttext = "Kinaris Update: Request For Shuttle.
\ To whom it may concern:

\ We have taken note of the situation upon [station_name()] and have come to the \ conclusion that it does not warrant the abandonment of the station.
\ diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c8153d62..810882ff 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -534,7 +534,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/send_news_report() var/news_message - var/news_source = "Nanotrasen News Network" + var/news_source = "Kinaris News Network" switch(news_report) if(NUKE_SYNDICATE_BASE) news_message = "In a daring raid, the heroic crew of [station_name()] detonated a nuclear device in the heart of a terrorist base." diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm index 3f7f7944..ef52a8fc 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -24,7 +24,7 @@ if(isliving(parent)) host_mob = parent - if(!(MOB_ORGANIC in host_mob.mob_biotypes) && !(MOB_UNDEAD in host_mob.mob_biotypes)) //Shouldn't happen, but this avoids HUD runtimes in case a silicon gets them somehow. + if(MOB_SILICON in host_mob.mob_biotypes) //Shouldn't happen, but this avoids HUD runtimes in case a silicon gets them somehow. return COMPONENT_INCOMPATIBLE host_mob.hud_set_nanite_indicator() @@ -202,7 +202,7 @@ NP.receive_signal(code, source) /datum/component/nanites/proc/check_viable_biotype() - if(!(MOB_ORGANIC in host_mob.mob_biotypes) && !(MOB_UNDEAD in host_mob.mob_biotypes)) + if((MOB_SILICON in host_mob.mob_biotypes)) qdel(src) //bodytype no longer sustains nanites /datum/component/nanites/proc/check_access(datum/source, obj/O) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 6cd4bf0a..b2acea05 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -35,7 +35,7 @@ rename_team = "Deathsquad" code = "Delta" mission = "Leave no witnesses." - polldesc = "an elite Nanotrasen Strike Team" + polldesc = "an elite Kinaris Strike Team" /datum/ert/centcom_official code = "Green" diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index fb7bfa76..dd953eb8 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -194,7 +194,7 @@ /datum/map_template/shuttle/emergency/asteroid suffix = "asteroid" name = "Asteroid Station Emergency Shuttle" - description = "A respectable mid-sized shuttle that first saw service shuttling Nanotrasen crew to and from their asteroid belt embedded facilities." + description = "A respectable mid-sized shuttle that first saw service shuttling Kinaris crew to and from their asteroid belt embedded facilities." credit_cost = 3000 /datum/map_template/shuttle/emergency/bar @@ -229,7 +229,7 @@ /datum/map_template/shuttle/emergency/discoinferno suffix = "discoinferno" name = "Disco Inferno" - description = "The glorious results of centuries of plasma research done by Nanotrasen employees. This is the reason why you are here. Get on and dance like you're on fire, burn baby burn!" + description = "The glorious results of centuries of plasma research done by Kinaris employees. This is the reason why you are here. Get on and dance like you're on fire, burn baby burn!" admin_notes = "Flaming hot. The main area has a dance machine as well as plasma floor tiles that will be ignited by players every single time." credit_cost = 10000 diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm index 156f3792..b0d46100 100644 --- a/code/game/gamemodes/brother/traitor_bro.dm +++ b/code/game/gamemodes/brother/traitor_bro.dm @@ -59,7 +59,7 @@ return ..() /datum/game_mode/traitor/bros/generate_report() - return "It's Syndicate recruiting season. Be alert for potential Syndicate infiltrators, but also watch out for disgruntled employees trying to defect. Unlike Nanotrasen, the Syndicate prides itself in teamwork and will only recruit pairs that share a brotherly trust." + return "It's Syndicate recruiting season. Be alert for potential Syndicate infiltrators, but also watch out for disgruntled employees trying to defect. Unlike Kinaris, the Syndicate prides itself in teamwork and will only recruit pairs that share a brotherly trust." /datum/game_mode/proc/update_brother_icons_added(datum/mind/brother_mind) var/datum/atom_hud/antag/brotherhud = GLOB.huds[ANTAG_HUD_BROTHER] diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index b010b08b..1db06332 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -79,6 +79,6 @@ ..() /datum/game_mode/traitor/changeling/generate_report() - return "The Syndicate has started some experimental research regarding humanoid shapeshifting. There are rumors that this technology will be field tested on a Nanotrasen station \ + return "The Syndicate has started some experimental research regarding humanoid shapeshifting. There are rumors that this technology will be field tested on a Kinaris station \ for infiltration purposes. Be advised that support personel may also be deployed to defend these shapeshifters. Trust nobody - suspect everybody. Do not announce this to the crew, \ as paranoia may spread and inhibit workplace efficiency." diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm index 0f2e8f78..b6b9c955 100644 --- a/code/game/gamemodes/devil/devil_game_mode.dm +++ b/code/game/gamemodes/devil/devil_game_mode.dm @@ -57,7 +57,7 @@ return 1 /datum/game_mode/devil/generate_report() - return "Infernal creatures have been seen nearby offering great boons in exchange for souls. This is considered theft against Nanotrasen, as all employment contracts contain a lien on the \ + return "Infernal creatures have been seen nearby offering great boons in exchange for souls. This is considered theft against Kinaris, as all employment contracts contain a lien on the \ employee's soul. If anyone sells their soul in error, contact an attorney to overrule the sale. Be warned that if the devil purchases enough souls, a gateway to hell may open." /datum/game_mode/devil/proc/post_setup_finalize(datum/mind/devil) diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 31ce4c27..8e5d64a0 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -224,7 +224,7 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5) . += "Although your station lies within what is generally considered Kinaris-controlled space, the course of its orbit has caused it to cross unusually close to exogeological features with anomalous readings. Although these features offer opportunities for our research department, it is known that these little understood readings are often correlated with increased activity from competing interstellar organizations and individuals, among them the Wizard Federation and Cult of the Geometer of Blood - all known competitors for Anomaly Type B sites. Exercise elevated caution." if(40 to 49) . += "Contested System
" - . += "Your station's orbit passes along the edge of Kinaris allied influence. While subversive elements remain the most likely threat against your station, Nanotrasen and hostile organizations are bolder here, where our grip is weaker. Exercise increased caution against potential Syndicate agents, and be on the lookout for any potentially anomalous activity." + . += "Your station's orbit passes along the edge of Kinaris allied influence. While subversive elements remain the most likely threat against your station, Kinaris and hostile organizations are bolder here, where our grip is weaker. Exercise increased caution against potential Syndicate agents, and be on the lookout for any potentially anomalous activity." if(50 to 64) . += "Uncharted Space
" . += "Congratulations and thank you for participating in the Kinaris 'Frontier' space program! Your station is actively orbiting a high value system far from the nearest support stations. Little is known about your region of space, and the opportunity to encounter the unknown invites greater glory. You are encouraged to elevate security as necessary to protect your lives and station assets." diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index c3289df8..0fc1b3e1 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -247,8 +247,8 @@ GLOBAL_LIST_EMPTY(objectives) human_check = FALSE /datum/objective/hijack - explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody." - team_explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody. Leave no team member behind." + explanation_text = "Hijack the shuttle to ensure no loyalist Kinaris crew escape alive and out of custody." + team_explanation_text = "Hijack the shuttle to ensure no loyalist Kinaris crew escape alive and out of custody. Leave no team member behind." martyr_compatible = 0 //Technically you won't get both anyway. /datum/objective/hijack/check_completion() // Requires all owners to escape. diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index fc669d48..32e9c994 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -10,14 +10,14 @@ required_enemies = 5 recommended_enemies = 8 reroll_friendly = 0 - traitor_name = "Nanotrasen Internal Affairs Agent" + traitor_name = "Kinaris Internal Affairs Agent" antag_flag = ROLE_INTERNAL_AFFAIRS traitors_possible = 10 //hard limit on traitors if scaling is turned off num_modifier = 4 // Four additional traitors antag_datum = /datum/antagonist/traitor/internal_affairs - announce_text = "There are Nanotrasen Internal Affairs Agents trying to kill each other!\n\ + announce_text = "There are Kinaris Internal Affairs Agents trying to kill each other!\n\ IAA: Eliminate your targets and protect yourself!\n\ Crew: Stop the IAA agents before they can cause too much mayhem." @@ -78,5 +78,5 @@ /datum/game_mode/traitor/internal_affairs/generate_report() - return "Nanotrasen denies any accusations of placing internal affairs agents onboard your station to eliminate inconvenient employees. Any further accusations against CentCom for such \ + return "Kinaris denies any accusations of placing internal affairs agents onboard your station to eliminate inconvenient employees. Any further accusations against CentCom for such \ actions will be met with a conversation with an official internal affairs agent." diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 40c35a94..1d06edf6 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -96,4 +96,4 @@ /datum/game_mode/traitor/generate_report() return "Although more specific threats are commonplace, you should always remain vigilant for Syndicate agents aboard your station. Syndicate communications have implied that many \ - Nanotrasen employees are Syndicate agents with hidden memories that may be activated at a moment's notice, so it's possible that these agents might not even know their positions." \ No newline at end of file + Kinaris employees are Syndicate agents with hidden memories that may be activated at a moment's notice, so it's possible that these agents might not even know their positions." \ No newline at end of file diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 66e302ba..c25563f1 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -1,6 +1,6 @@ /obj/item/wallframe/camera name = "camera assembly" - desc = "The basic construction for Nanotrasen-Always-Watching-You cameras." + desc = "The basic construction for Kinaris-Always-Watching-You cameras." icon = 'icons/obj/machines/camera.dmi' icon_state = "cameracase" materials = list(MAT_METAL=400, MAT_GLASS=250) @@ -9,7 +9,7 @@ /obj/structure/camera_assembly name = "camera assembly" - desc = "The basic construction for Nanotrasen-Always-Watching-You cameras." + desc = "The basic construction for Kinaris-Always-Watching-You cameras." icon = 'icons/obj/machines/camera.dmi' icon_state = "camera1" max_integrity = 150 diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index ff7311c8..a4fcb325 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -575,7 +575,7 @@ /obj/machinery/computer/med_data/laptop name = "medical laptop" - desc = "A cheap Nanotrasen medical laptop, it functions as a medical records computer. It's bolted to the table." + desc = "A cheap Kinaris medical laptop, it functions as a medical records computer. It's bolted to the table." icon_state = "laptop" icon_screen = "medlaptop" icon_keyboard = "laptop_key" diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 79b99be9..3cf5321f 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -25,7 +25,7 @@ /obj/machinery/computer/secure_data/laptop name = "security laptop" - desc = "A cheap Nanotrasen security laptop, it functions as a security records console. It's bolted to the table." + desc = "A cheap Kinaris security laptop, it functions as a security records console. It's bolted to the table." icon_state = "laptop" icon_screen = "seclaptop" icon_keyboard = "laptop_key" @@ -405,7 +405,7 @@ What a mess.*/ if(!( printing )) var/wanted_name = stripped_input(usr, "Please enter an alias for the criminal:", "Print Wanted Poster", active1.fields["name"]) if(wanted_name) - var/default_description = "A poster declaring [wanted_name] to be a dangerous individual, wanted by Nanotrasen. Report any sightings to security immediately." + var/default_description = "A poster declaring [wanted_name] to be a dangerous individual, wanted by Kinaris. Report any sightings to security immediately." var/list/major_crimes = active2.fields["ma_crim"] var/list/minor_crimes = active2.fields["mi_crim"] if(major_crimes.len + minor_crimes.len) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 566613b1..58fb4c31 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -287,7 +287,7 @@ GLOBAL_LIST_EMPTY(allCasters) dat+="
Feed Security functions:
" dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" dat+="
Censor Feed Stories" - dat+="
Mark Feed Channel with Nanotrasen D-Notice" + dat+="
Mark Feed Channel with Kinaris D-Notice" dat+="
The newscaster recognises you as: [scanned_user]" if(1) dat+= "Station Feed Channels
" @@ -368,7 +368,7 @@ GLOBAL_LIST_EMPTY(allCasters) if(9) dat+="[viewing_channel.channel_name]: \[created by: [viewing_channel.returnAuthor(-1)]\]
" if(viewing_channel.censored) - dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" + dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Kinaris D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.

" else if( isemptylist(viewing_channel.messages) ) @@ -395,7 +395,7 @@ GLOBAL_LIST_EMPTY(allCasters) dat+="
Refresh" dat+="
Back" if(10) - dat+="Nanotrasen Feed Censorship Tool
" + dat+="Kinaris Feed Censorship Tool
" dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
" dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it." dat+="
Select Feed channel to get Stories from:
" @@ -406,7 +406,7 @@ GLOBAL_LIST_EMPTY(allCasters) dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ""]
" dat+="
Cancel" if(11) - dat+="Nanotrasen D-Notice Handler
" + dat+="Kinaris D-Notice Handler
" dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed" dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
" @@ -433,7 +433,7 @@ GLOBAL_LIST_EMPTY(allCasters) dat+="[viewing_channel.channel_name]: \[ created by: [viewing_channel.returnAuthor(-1)] \]
" dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
" if(viewing_channel.censored) - dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" + dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Kinaris D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.

" else if(isemptylist(viewing_channel.messages)) @@ -902,7 +902,7 @@ GLOBAL_LIST_EMPTY(allCasters) switch(screen) if(0) //Cover dat+="
The Griffon
" - dat+="
Nanotrasen-standard newspaper, for use on Nanotrasen? Space Facilities
" + dat+="
Kinaris-standard newspaper, for use on Kinaris? Space Facilities
" if(isemptylist(news_content)) if(wantedAuthor) dat+="Contents:
" diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index df1f2842..182cb31a 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -295,7 +295,7 @@ /obj/item/bombcore/training name = "dummy payload" - desc = "A Nanotrasen replica of a syndicate payload. Its not intended to explode but to announce that it WOULD have exploded, then rewire itself to allow for more training." + desc = "A Kinaris replica of a syndicate payload. Its not intended to explode but to announce that it WOULD have exploded, then rewire itself to allow for more training." var/defusals = 0 var/attempts = 0 diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index 3a1fbbcb..779640ad 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -1,5 +1,5 @@ /obj/mecha/combat/durand - desc = "An aging combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms." + desc = "An aging combat exosuit utilized by the Kinaris corporation. Originally developed to combat hostile alien lifeforms." name = "\improper Durand" icon_state = "durand" step_in = 4 diff --git a/code/game/mecha/combat/neovgre.dm b/code/game/mecha/combat/neovgre.dm index 3fc6dec0..4e622eb0 100644 --- a/code/game/mecha/combat/neovgre.dm +++ b/code/game/mecha/combat/neovgre.dm @@ -80,7 +80,7 @@ equip_cooldown = 8 //Rapid fire heavy laser cannon, simple yet elegant energy_drain = 30 name = "Aribter Laser Cannon" - desc = "Please re-attach this to neovgre and stop asking questions about why it looks like a normal Nanotrasen issue Solaris laser cannon - Nezbere" + desc = "Please re-attach this to neovgre and stop asking questions about why it looks like a normal Kinaris issue Solaris laser cannon - Nezbere" fire_sound = "sound/weapons/neovgre_laser.ogg" /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/neovgre/can_attach(obj/mecha/combat/neovgre/M) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 1824308a..33282afb 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -79,7 +79,7 @@ sleep(15) say("User DB corrupted \[Code 0x00FA\]. Truncating data structure...") sleep(30) - say("User DB truncated. Please contact your Nanotrasen system operator for future assistance.") + say("User DB truncated. Please contact your Kinaris system operator for future assistance.") /obj/machinery/mecha_part_fabricator/proc/output_parts_list(set_name) diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 61eb3ab7..d0c52f91 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -119,7 +119,7 @@ minor_announce("[ureal_name] has designated the planet as [station_name()]", "Captain's Banner", 0) log_game("[ukey] has renamed the planet as [station_name()].") name = "banner of [station_name()]" - desc = "The banner bears the official coat of arms of Nanotrasen, signifying that [station_name()] has been claimed by Captain [uname] in the name of the company." + desc = "The banner bears the official coat of arms of Kinaris, signifying that [station_name()] has been claimed by Captain [uname] in the name of the company." SSblackbox.record_feedback("text", "station_renames", 1, "[station_name()]") if(!unlimited_uses) used = TRUE diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 832dae31..e161bcd2 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -247,7 +247,7 @@ build_path = /obj/machinery/computer/cargo/request /obj/item/circuitboard/computer/bounty - name = "Nanotrasen Bounty Console (Computer Board)" + name = "Kinaris Bounty Console (Computer Board)" build_path = /obj/machinery/computer/bounty /obj/item/circuitboard/computer/operating diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 329631ff..eeac3f65 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -1,7 +1,7 @@ // Radio Cartridge, essentially a remote signaler with limited spectrum. /obj/item/integrated_signaler name = "\improper PDA radio module" - desc = "An electronic radio system of Nanotrasen origin." + desc = "An electronic radio system of Kinaris origin." icon = 'icons/obj/module.dmi' icon_state = "power_mod" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 278d5115..7a4b453c 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -255,7 +255,7 @@ /obj/item/flashlight/flare name = "flare" - desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'." + desc = "A red Kinaris issued flare. There are instructions on the side, it reads 'pull cord, make light'." w_class = WEIGHT_CLASS_SMALL brightness_on = 7 // Pretty bright. light_color = "#FA421A" diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index d7df0853..70f03a72 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -186,7 +186,7 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/gps/internal/base gpstag = "NT_AUX" - desc = "A homing signal from Nanotrasen's mining base." + desc = "A homing signal from Kinaris's mining base." /obj/item/gps/visible_debug name = "visible GPS" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 8bea8f4e..c5a52b42 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/headset_cent name = "\improper CentCom headset" - desc = "A headset used by the upper echelons of Nanotrasen." + desc = "A headset used by the upper echelons of Kinaris." icon_state = "cent_headset" keyslot = new /obj/item/encryptionkey/headset_com keyslot2 = new /obj/item/encryptionkey/headset_cent diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index fd1113a8..1ad95544 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -13,7 +13,7 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF /obj/item/documents/nanotrasen - desc = "\"Top Secret\" Stolen Nanotrasen documents, filled with complex diagrams and lists of names, dates and coordinates." + desc = "\"Top Secret\" Stolen Kinaris documents, filled with complex diagrams and lists of names, dates and coordinates." icon_state = "docs_verified" /obj/item/documents/syndicate diff --git a/code/game/objects/items/implants/implant_exile.dm b/code/game/objects/items/implants/implant_exile.dm index 9b682063..1a270ada 100644 --- a/code/game/objects/items/implants/implant_exile.dm +++ b/code/game/objects/items/implants/implant_exile.dm @@ -8,7 +8,7 @@ /obj/item/implant/exile/get_data() var/dat = {"Implant Specifications:
- Name: Nanotrasen Employee Exile Implant
+ Name: Kinaris Employee Exile Implant
Implant Details: The onboard gateway system has been modified to reject entry by individuals containing this implant
"} return dat diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm index 13bf9d6d..06c71dc5 100644 --- a/code/game/objects/items/implants/implant_mindshield.dm +++ b/code/game/objects/items/implants/implant_mindshield.dm @@ -5,7 +5,7 @@ /obj/item/implant/mindshield/get_data() var/dat = {"Implant Specifications:
- Name: Nanotrasen Employee Management Implant
+ Name: Kinaris Employee Management Implant
Life: Ten years.
Important Notes: Personnel injected with this device are much more resistant to brainwashing.
diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 46a6cb2c..bcb6ce09 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -173,7 +173,7 @@ auto_inject = FALSE auto_replenish = FALSE special = TRUE - var/objective = "Obey the law. Praise Nanotrasen." + var/objective = "Obey the law. Praise Kinaris." var/custom = FALSE /obj/machinery/implantchair/brainwash/implant_action(mob/living/C,mob/user) diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 978f0c05..6af67108 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -93,10 +93,10 @@
  • Secure the mainboard with a screwdriver.
  • Install the peripherals control module (Not included. Use supplied datadisk to create one).
  • Secure the peripherals control module with a screwdriver
    • -
  • Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 metal sheets.)
    • +
  • Install the internal armor plating (Not included due to Kinaris regulations. Can be made using 5 metal sheets.)
  • Secure the internal armor plating with a wrench
  • Weld the internal armor plating to the chassis
    • -
  • Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced metal sheets.)
    • +
  • Install the external reinforced armor plating (Not included due to Kinaris regulations. Can be made using 5 reinforced metal sheets.)
  • Secure the external reinforced armor plating with a wrench
  • Weld the external reinforced armor plating to the chassis
  • @@ -106,13 +106,13 @@
  • Internal armor is plasteel for additional strength.
  • External armor must be installed in 2 parts, totaling 10 sheets.
  • Completed mech is more resiliant against fire, and is a bit more durable overall
    • -
  • Nanotrasen is determined to the safety of its investments employees.
    • +
  • Kinaris is determined to the safety of its investments employees.

    • Operation

    - Please consult the Nanotrasen compendium "Robotics for Dummies". + Please consult the Kinaris compendium "Robotics for Dummies". "} /obj/item/book/manual/chef_recipes diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 0ee00e8d..36043328 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -878,7 +878,7 @@ attack_verb = list("healed", "cured", "demoted") /obj/item/toy/plush/mammal/redwood - desc = "An adorable stuffed toy resembling a Nanotrasen Captain. That just happens to be a bunny." + desc = "An adorable stuffed toy resembling a Kinaris Captain. That just happens to be a bunny." icon_state = "redwood" item_state = "redwood" attack_verb = list("ordered", "bapped", "reprimanded") diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 47b766c5..1442e1e5 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -162,8 +162,8 @@ desc = "A banner with the logo of the blue deity." /obj/item/storage/backpack/bannerpack - name = "nanotrasen banner backpack" - desc = "It's a backpack with lots of extra room. A banner with Nanotrasen's logo is attached, that can't be removed." + name = "Kinaris banner backpack" + desc = "It's a backpack with lots of extra room. A banner with Kinaris's logo is attached, that can't be removed." icon_state = "bannerpack" /obj/item/storage/backpack/bannerpack/Initialize() diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index da00e95e..279ec8d3 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -130,7 +130,7 @@ /obj/item/storage/backpack/captain name = "captain's backpack" - desc = "It's a special backpack made exclusively for Nanotrasen officers." + desc = "It's a special backpack made exclusively for Kinaris officers." icon_state = "captainpack" item_state = "captainpack" @@ -258,7 +258,7 @@ /obj/item/storage/backpack/satchel/cap name = "captain's satchel" - desc = "An exclusive satchel for Nanotrasen officers." + desc = "An exclusive satchel for Kinaris officers." icon_state = "satchel-cap" item_state = "captainpack" @@ -434,7 +434,7 @@ STR.silent = TRUE /obj/item/storage/backpack/duffelbag/syndie/hitman - desc = "A large duffel bag for holding extra things. There is a Nanotrasen logo on the back." + desc = "A large duffel bag for holding extra things. There is a Kinaris logo on the back." icon_state = "duffel-syndieammo" item_state = "duffel-syndieammo" diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 9bf1c0e9..020420e1 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -237,7 +237,7 @@ /obj/item/storage/bag/sheetsnatcher name = "sheet snatcher" - desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet." + desc = "A patented Kinaris storage system designed for any kind of mineral sheet." icon = 'icons/obj/mining.dmi' icon_state = "sheetsnatcher" diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 992caea9..70029d00 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -951,7 +951,7 @@ if("None") desc = "A sack neatly crafted out of paper." if("NanotrasenStandard") - desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go." + desc = "A standard Kinaris paper lunch sack for loyal employees on the go." if("SyndiSnacks") desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program." if("Heart") diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 819785ab..6101f641 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -274,7 +274,7 @@ /obj/item/storage/fancy/rollingpapers name = "rolling paper pack" - desc = "A pack of Nanotrasen brand rolling papers." + desc = "A pack of Kinaris brand rolling papers." w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/cigarettes.dmi' icon_state = "cig_paper_pack" diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index 9b9fae7c..7b66a913 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -105,7 +105,7 @@ icon_state = "screwdriver_nt" /obj/item/paper/guides/antag/nuke_instructions - info = "How to break into a Nanotrasen self-destruct terminal and remove its plutonium core:
    \ + info = "How to break into a Kinaris self-destruct terminal and remove its plutonium core:
    \