Merge pull request #794 from lyricalpaws/master

Let synthliz and IPC have and be infected by nanites

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

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

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"
 

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"

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"

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

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

code/game/objects/items/implants/implant_exile.dm

@@ -8,7 +8,7 @@
 
 /obj/item/implant/exile/get_data()
 	var/dat = {"<b>Implant Specifications:</b><BR>
-				<b>Name:</b> Nanotrasen Employee Exile Implant<BR>
+				<b>Name:</b> Kinaris Employee Exile Implant<BR>
 				<b>Implant Details:</b> The onboard gateway system has been modified to reject entry by individuals containing this implant<BR>"}
 	return dat
 

code/game/objects/items/implants/implant_mindshield.dm

@@ -5,7 +5,7 @@
 
 /obj/item/implant/mindshield/get_data()
 	var/dat = {"<b>Implant Specifications:</b><BR>
-				<b>Name:</b> Nanotrasen Employee Management Implant<BR>
+				<b>Name:</b> Kinaris Employee Management Implant<BR>
 				<b>Life:</b> Ten years.<BR>
 				<b>Important Notes:</b> Personnel injected with this device are much more resistant to brainwashing.<BR>
 				<HR>

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)

code/game/objects/items/manuals.dm

@@ -93,10 +93,10 @@
 				<li>Secure the mainboard with a screwdriver.</li>
 				<li>Install the peripherals control module (Not included. Use supplied datadisk to create one).</li>
 				<li>Secure the peripherals control module with a screwdriver</li>
-				<li>Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 metal sheets.)</li>
+				<li>Install the internal armor plating (Not included due to Kinaris regulations. Can be made using 5 metal sheets.)</li>
 				<li>Secure the internal armor plating with a wrench</li>
 				<li>Weld the internal armor plating to the chassis</li>
-				<li>Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced metal sheets.)</li>
+				<li>Install the external reinforced armor plating (Not included due to Kinaris regulations. Can be made using 5 reinforced metal sheets.)</li>
 				<li>Secure the external reinforced armor plating with a wrench</li>
 				<li>Weld the external reinforced armor plating to the chassis</li>
 				<li></li>
@@ -106,13 +106,13 @@
 				<li>Internal armor is plasteel for additional strength.</li>
 				<li>External armor must be installed in 2 parts, totaling 10 sheets.</li>
 				<li>Completed mech is more resiliant against fire, and is a bit more durable overall</li>
-				<li>Nanotrasen is determined to the safety of its <s>investments</s> employees.</li>
+				<li>Kinaris is determined to the safety of its <s>investments</s> employees.</li>
 				</ol>
 				</body>
 				</html>
 
 				<h2>Operation</h2>
-				Please consult the Nanotrasen compendium "Robotics for Dummies".
+				Please consult the Kinaris compendium "Robotics for Dummies".
 			"}
 
 /obj/item/book/manual/chef_recipes

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")

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()

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"
 

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"
 

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")

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"

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:<br>\
+	info = "How to break into a Kinaris self-destruct terminal and remove its plutonium core:<br>\
 	<ul>\
 	<li>Use a screwdriver with a very thin tip (provided) to unscrew the terminal's front panel</li>\
 	<li>Dislodge and remove the front panel with a crowbar</li>\

code/game/objects/items/tools/weldingtool.dm

@@ -1,7 +1,7 @@
 #define WELDER_FUEL_BURN_INTERVAL 13
 /obj/item/weldingtool
 	name = "welding tool"
-	desc = "A standard edition welder provided by Nanotrasen."
+	desc = "A standard edition welder provided by Kinaris."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "welder"
 	item_state = "welder"