Kinaris Corp 1.1.2

another long overdue haul of shit I forgot/was to busy to get the first patch around.

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 kit for a cam-corder setup."
 	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 kit for a cam-corder setup."
 	icon = 'icons/obj/machines/camera.dmi'
 	icon_state = "camera1"
 	max_integrity = 150

code/game/objects/items/blueprints.dm

@@ -44,7 +44,7 @@
 	desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it."
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "blueprints"
-	fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage."
+	fluffnotice = "Property of Kinaris. For heads of staff only. Store in high-secure storage."
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	var/list/image/showing = list()
 	var/client/viewing
@@ -226,4 +226,4 @@
 	desc = "A digital copy of the station blueprints stored in your memory."
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "blueprints"
-	fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station."
+	fluffnotice = "Intellectual Property of Kinaris. For use in engineering cyborgs only. Wipe from memory upon departure from the station."

code/game/objects/items/cigs_lighters.dm

@@ -266,7 +266,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/cigarette/dromedary
 	desc = "A DromedaryCo brand cigarette."
 	list_reagents = list("nicotine" = 7.5, "silicon" = 7.5)
-	
+
+/obj/item/clothing/mask/cigarette/smokekins
+	desc = "A Kinaris Corp brand cigarette"
+	list_reagents = list("nicotine" = 7.5, "gold" = 1, "omnizine" = 5)
+
 /obj/item/clothing/mask/cigarette/uplift
 	desc = "An Uplift Smooth brand cigarette."
 	list_reagents = list("nicotine" = 7.5, "menthol" = 7.5)
@@ -282,7 +286,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/cigarette/carp
 	desc = "A Carp Classic brand cigarette."
 	list_reagents = list("nicotine" = 7.5, "sodiumchloride" = 7.5)
-	
+
 /obj/item/clothing/mask/cigarette/syndicate
 	desc = "An unknown brand cigarette."
 	list_reagents = list("nicotine" = 15, "omnizine" = 15)

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 stolen Nanotrasen design."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "power_mod"
 

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\" Nanotrasen documents, filled with complex diagrams and lists of names, dates and coordinates."
+	desc = "\"Top Secret\" Stolen Nanotrasen documents, filled with complex diagrams and lists of names, dates and coordinates."
 	icon_state = "docs_verified"
 
 /obj/item/documents/syndicate

code/game/objects/items/religion.dm

@@ -1,6 +1,6 @@
 /obj/item/banner
 	name = "banner"
-	desc = "A banner with Nanotrasen's logo on it."
+	desc = "Hmmm, Silky smooth."
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "banner"
 	item_state = "banner"
@@ -141,7 +141,7 @@
 	desc = "The banner of Command, a staunch and ancient line of bueraucratic kings and queens."
 	//No icon state here since the default one is the NT banner
 	job_loyalties = list("Captain", "Head of Personnel", "Chief Engineer", "Head of Security", "Research Director", "Chief Medical Officer")
-	warcry = "Hail Nanotrasen!"
+	warcry = "May the Radiance guide you all!!"
 
 /obj/item/banner/command/mundane
 	inspiration_available = FALSE

code/game/objects/items/storage/fancy.dm

@@ -206,6 +206,12 @@
 	icon_state = "dromedary"
 	spawn_type = /obj/item/clothing/mask/cigarette/dromedary
 
+/obj/item/storage/fancy/cigarettes/smokekins
+	name = "\improper smokekins packet"
+	desc = "Let the Radiance fill your lungs"
+	icon_state = "smokekins"
+	spawn_type = /obj/item/clothing/mask/cigarette/smokekins
+
 /obj/item/storage/fancy/cigarettes/cigpack_uplift
 	name = "\improper Uplift Smooth packet"
 	desc = "Your favorite brand, now menthol flavored."

code/modules/cargo/export_scanner.dm

@@ -1,6 +1,6 @@
 /obj/item/export_scanner
 	name = "export scanner"
-	desc = "A device used to check objects against Nanotrasen exports and bounty database. Sadly can not scan reagents vaule."
+	desc = "A device used to check objects against exports and bounties. Sadly can not scan reagents value."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "export_scanner"
 	item_state = "radio"

code/modules/cargo/packs/armory.dm

@@ -38,7 +38,7 @@
 
 /datum/supply_pack/security/armory/combatknives
 	name = "Combat Knives Crate"
-	desc = "Contains three sharpened combat knives. Each knife guaranteed to fit snugly inside any Nanotrasen-standard boot. Requires Armory access to open."
+	desc = "Contains three sharpened combat knives. Each knife guaranteed to fit snugly inside any of those stolen Nanotrasen-standard boot. Requires Armory access to open."
 	cost = 3200
 	contains = list(/obj/item/kitchen/knife/combat,
 					/obj/item/kitchen/knife/combat,
@@ -174,7 +174,7 @@
 
 /datum/supply_pack/security/armory/swat
 	name = "SWAT Crate"
-	desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open."
+	desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by Earth-Gov and Kinaris. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open."
 	cost = 6000
 	contains = list(/obj/item/clothing/head/helmet/swat/nanotrasen,
 					/obj/item/clothing/head/helmet/swat/nanotrasen,

code/modules/clothing/under/jobs/security.dm

@@ -9,7 +9,7 @@
  */
 /obj/item/clothing/under/rank/security
 	name = "security jumpsuit"
-	desc = "A tactical security jumpsuit for officers complete with Nanotrasen belt buckle."
+	desc = "A tactical security jumpsuit for officers complete with Kinaris PMC belt buckle."
 	icon_state = "rsecurity"
 	item_state = "r_suit"
 	item_color = "rsecurity"
@@ -20,7 +20,7 @@
 	random_sensor = FALSE
 /obj/item/clothing/under/rank/security/grey
 	name = "grey security jumpsuit"
-	desc = "A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
+	desc = "A tactical relic of years past before Valorie decided it was cheaper to dye the suits red instead of washing out the blood."
 	icon_state = "security"
 	item_state = "gy_suit"
 	item_color = "security"
@@ -63,7 +63,7 @@
 
 /obj/item/clothing/under/rank/warden
 	name = "security suit"
-	desc = "A formal security suit for officers complete with Nanotrasen belt buckle."
+	desc = "A formal security suit for officers complete with Kinaris PMC belt buckle."
 	icon_state = "rwarden"
 	item_state = "r_suit"
 	item_color = "rwarden"
@@ -74,14 +74,14 @@
 	random_sensor = FALSE
 /obj/item/clothing/under/rank/warden/grey
 	name = "grey security suit"
-	desc = "A formal relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
+	desc = "A formal relic of years past before Valorie decided it was cheaper to dye the suits red instead of washing out the blood."
 	icon_state = "warden"
 	item_state = "gy_suit"
 	item_color = "warden"
 
 /obj/item/clothing/under/rank/warden/skirt
 	name = "warden's suitskirt"
-	desc = "A formal security suitskirt for officers complete with Nanotrasen belt buckle."
+	desc = "A formal security suitskirt for officers complete with Kinaris PMC belt buckle."
 	icon_state = "rwarden_skirt"
 	item_state = "r_suit"
 	item_color = "rwarden_skirt"

code/modules/ruins/lavaland_ruin_code.dm

@@ -114,7 +114,7 @@
 	job_description = "Off-station Syndicate Scientist"
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper_s"
-	flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Continue your research as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!</b>"
+	flavour_text = "<span class='big bold'>You are a Donk.Corp branch syndicate agent,</span><b> employed in a top secret research facility developing biological weapons plants and toys. Unfortunately, your hated enemy, Nanotrasen activity in this sector of space is minimal. <b>Continue your research as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands! If discovered by Kinaris Corp, consider trade negotiations</b>"
 	outfit = /datum/outfit/lavaland_syndicate
 	assignedrole = "Lavaland Syndicate"
 	mirrorcanloadappearance = TRUE
@@ -140,9 +140,9 @@
 	H.faction |= ROLE_SYNDICATE
 
 /obj/effect/mob_spawn/human/lavaland_syndicate/comms
-	name = "Syndicate Comms Agent"
-	job_description = "Off-station Syndicate Comms Agent"
-	flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Monitor enemy activity as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> 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!</b>"
+	name = "Syndicate Intel Agent"
+	job_description = "Off-station Syndicate Intel Agent"
+	flavour_text = "<span class='big bold'>You are a Donk.Corp branch syndicate agent,</span><b> employed in a top secret research facility developing biological weapons plants and toys. Unfortunately, your hated enemy, Nanotrasen activity in this sector of space is minimal. <b>Continue your research as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands! If discovered by Kinaris Corp, consider trade negotiations</b>"
 	outfit = /datum/outfit/lavaland_syndicate/comms
 	mirrorcanloadappearance = TRUE
 
@@ -153,7 +153,7 @@
 		return INITIALIZE_HINT_QDEL
 
 /datum/outfit/lavaland_syndicate/comms
-	name = "Lavaland Syndicate Comms Agent"
+	name = "Lavaland Syndicate Intel Agent"
 	r_hand = /obj/item/melee/transforming/energy/sword/saber
 	mask = /obj/item/clothing/mask/chameleon/gps
 	suit = /obj/item/clothing/suit/armor/vest

code/modules/station_goals/bsa.dm

@@ -10,7 +10,7 @@
 	 We need you to construct BSA-[rand(1,99)] Artillery position aboard your station.
 
 	 Base parts are available for shipping via cargo.
-	 -Nanotrasen Naval Command"}
+	 -Val's personal Naval Command"}
 
 /datum/station_goal/bluespace_cannon/on_report()
 	//Unlock BSA parts
@@ -64,7 +64,7 @@
 
 /obj/machinery/bsa/middle
 	name = "Bluespace Artillery Fusor"
-	desc = "Contents classified by Nanotrasen Naval Command. Needs to be linked with the other BSA parts using multitool."
+	desc = "Contents classified by Naval Command. Needs to be linked with the other BSA parts using multitool."
 	icon_state = "fuel_chamber"
 	var/obj/machinery/bsa/back/back
 	var/obj/machinery/bsa/front/front

code/modules/vending/cigarette.dm

@@ -6,6 +6,7 @@
 	icon_state = "cigs"
 	products = list(/obj/item/storage/fancy/cigarettes = 5,
 					/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
+					/obj/item/storage/fancy/cigarettes/smokekins = 5,
 					/obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
 					/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
 					/obj/item/storage/fancy/cigarettes/cigpack_midori = 3,