cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 15:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #794 from lyricalpaws/master

Browse Source 
Let synthliz and IPC have and be infected by nanites
This commit is contained in:
QuoteFox
2021-01-02 14:02:24 +00:00
committed by GitHub
parent c209ed7596 ec82ae4d80
commit a9575ffc21
112 changed files with 194 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_maps/RandomRuins/SpaceRuins/listeningstation.dmm
View File

@@ -1009,7 +1009,7 @@
/obj/effect/mob_spawn/human/lavaland_syndicate/comms/space{
assignedrole = "Space Syndicate";
dir = 8;
flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. <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>"
flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. <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 Kinaris off your trail. Do not let the base fall into enemy hands!</b>"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8;

10
_maps/map_files/Deltastation/DeltaStation2.dmm
View File

@@ -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{

30
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -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,

2
_maps/map_files/OmegaStation/job_changes.dm
View File

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

2
_maps/map_files/PubbyStation/PubbyStation.dmm
View File

@@ -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
},

8
_maps/map_files/generic/CentCom.dmm
View File

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

10
code/__DEFINES/cargo.dm
View File

@@ -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."),\

1
code/__DEFINES/is_helpers.dm
View File

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

1
code/__DEFINES/mobs.dm
View File

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

2
code/__HELPERS/roundend.dm
View File

@@ -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

2
code/controllers/subsystem/shuttle.dm
View File

@@ -251,7 +251,7 @@ SUBSYSTEM_DEF(shuttle)
if(!admiral_message)
admiral_message = pick(GLOB.admiral_messages)
var/intercepttext = "<font size = 3><b>Nanotrasen Update</b>: Request For Shuttle.</font><hr>\
var/intercepttext = "<font size = 3><b>Kinaris Update</b>: Request For Shuttle.</font><hr>\
To whom it may concern:<br><br>\
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.<br>\

2
code/controllers/subsystem/ticker.dm
View File

@@ -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."

4
code/datums/components/nanites.dm
View File

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

2
code/datums/ert.dm
View File

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

4
code/datums/shuttles.dm
View File

@@ -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

2
code/game/gamemodes/brother/traitor_bro.dm
View File

@@ -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]

2
code/game/gamemodes/changeling/traitor_chan.dm
View File

@@ -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."

2
code/game/gamemodes/devil/devil_game_mode.dm
View File

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

2
code/game/gamemodes/dynamic/dynamic.dm
View File

@@ -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)
. += "<b>Contested System</b></center><BR>"
. += "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)
. += "<b>Uncharted Space</b></center><BR>"
. += "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."

4
code/game/gamemodes/objective.dm
View File

@@ -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.

6
code/game/gamemodes/traitor/double_agents.dm
View File

@@ -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\
<span class='danger'>IAA</span>: Eliminate your targets and protect yourself!\n\
<span class='notice'>Crew</span>: 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."

2
code/game/gamemodes/traitor/traitor.dm
View File

@@ -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."
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."

4
code/game/machinery/camera/camera_assembly.dm
View File

@@ -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

2
code/game/machinery/computer/medical.dm
View File

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

4
code/game/machinery/computer/security.dm
View File

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

12
code/game/machinery/newscaster.dm
View File

@@ -287,7 +287,7 @@ GLOBAL_LIST_EMPTY(allCasters)
dat+="<HR><B>Feed Security functions:</B><BR>"
dat+="<BR><A href='?src=[REF(src)];menu_wanted=1'>[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue</A>"
dat+="<BR><A href='?src=[REF(src)];menu_censor_story=1'>Censor Feed Stories</A>"
dat+="<BR><A href='?src=[REF(src)];menu_censor_channel=1'>Mark Feed Channel with Nanotrasen D-Notice</A>"
dat+="<BR><A href='?src=[REF(src)];menu_censor_channel=1'>Mark Feed Channel with Kinaris D-Notice</A>"
dat+="<BR><HR>The newscaster recognises you as: <FONT COLOR='green'>[scanned_user]</FONT>"
if(1)
dat+= "Station Feed Channels<HR>"
@@ -368,7 +368,7 @@ GLOBAL_LIST_EMPTY(allCasters)
if(9)
dat+="<B>[viewing_channel.channel_name]: </B><FONT SIZE=1>\[created by: <FONT COLOR='maroon'>[viewing_channel.returnAuthor(-1)]</FONT>\]</FONT><HR>"
if(viewing_channel.censored)
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>"
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Kinaris D-Notice.<BR>"
dat+="No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>"
else
if( isemptylist(viewing_channel.messages) )
@@ -395,7 +395,7 @@ GLOBAL_LIST_EMPTY(allCasters)
dat+="<BR><HR><A href='?src=[REF(src)];refresh=1'>Refresh</A>"
dat+="<BR><A href='?src=[REF(src)];setScreen=[1]'>Back</A>"
if(10)
dat+="<B>Nanotrasen Feed Censorship Tool</B><BR>"
dat+="<B>Kinaris Feed Censorship Tool</B><BR>"
dat+="<FONT SIZE=1>NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.<BR>"
dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it.</FONT>"
dat+="<HR>Select Feed channel to get Stories from:<BR>"
@@ -406,7 +406,7 @@ GLOBAL_LIST_EMPTY(allCasters)
dat+="<A href='?src=[REF(src)];pick_censor_channel=[REF(CHANNEL)]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
dat+="<BR><A href='?src=[REF(src)];setScreen=[0]'>Cancel</A>"
if(11)
dat+="<B>Nanotrasen D-Notice Handler</B><HR>"
dat+="<B>Kinaris D-Notice Handler</B><HR>"
dat+="<FONT SIZE=1>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.</FONT><HR>"
@@ -433,7 +433,7 @@ GLOBAL_LIST_EMPTY(allCasters)
dat+="<B>[viewing_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[viewing_channel.returnAuthor(-1)]</FONT> \]</FONT><BR>"
dat+="Channel messages listed below. If you deem them dangerous to the station, you can <A href='?src=[REF(src)];toggle_d_notice=[REF(viewing_channel)]'>Bestow a D-Notice upon the channel</A>.<HR>"
if(viewing_channel.censored)
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>"
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Kinaris D-Notice.<BR>"
dat+="No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>"
else
if(isemptylist(viewing_channel.messages))
@@ -902,7 +902,7 @@ GLOBAL_LIST_EMPTY(allCasters)
switch(screen)
if(0) //Cover
dat+="<DIV ALIGN='center'><B><FONT SIZE=6>The Griffon</FONT></B></div>"
dat+="<DIV ALIGN='center'><FONT SIZE=2>Nanotrasen-standard newspaper, for use on Nanotrasen? Space Facilities</FONT></div><HR>"
dat+="<DIV ALIGN='center'><FONT SIZE=2>Kinaris-standard newspaper, for use on Kinaris? Space Facilities</FONT></div><HR>"
if(isemptylist(news_content))
if(wantedAuthor)
dat+="Contents:<BR><ul><B><FONT COLOR='red'>**</FONT>Important Security Announcement<FONT COLOR='red'>**</FONT></B> <FONT SIZE=2>\[page [pages+2]\]</FONT><BR></ul>"

2
code/game/machinery/syndicatebomb.dm
View File

@@ -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

2
code/game/mecha/combat/durand.dm
View File

@@ -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

2
code/game/mecha/combat/neovgre.dm
View File

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

2
code/game/mecha/mech_fabricator.dm
View File

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

2
code/game/objects/items/charter.dm
View File

@@ -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

2
code/game/objects/items/circuitboards/computer_circuitboards.dm
View File

@@ -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

2
code/game/objects/items/devices/PDA/radio.dm
View File

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

2
code/game/objects/items/devices/flashlight.dm
View File

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

2
code/game/objects/items/devices/gps.dm
View File

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

2
code/game/objects/items/devices/radio/headset.dm
View File

@@ -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

2
code/game/objects/items/documents.dm
View File

@@ -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

2
code/game/objects/items/implants/implant_exile.dm
View File

@@ -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

2
code/game/objects/items/implants/implant_mindshield.dm
View File

@@ -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>

2
code/game/objects/items/implants/implantchair.dm
View File

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

8
code/game/objects/items/manuals.dm
View File

@@ -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

2
code/game/objects/items/plushes.dm
View File

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

4
code/game/objects/items/religion.dm
View File

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

6
code/game/objects/items/storage/backpack.dm
View File

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

2
code/game/objects/items/storage/bags.dm
View File

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

2
code/game/objects/items/storage/boxes.dm
View File

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

2
code/game/objects/items/storage/fancy.dm
View File

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

2
code/game/objects/items/theft_tools.dm
View File

@@ -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>\

2
code/game/objects/items/tools/weldingtool.dm
View File

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

2
code/game/objects/structures/crates_lockers/closets/job_closets.dm
View File

@@ -103,7 +103,7 @@
/obj/structure/closet/wardrobe/chaplain_black
name = "chapel wardrobe"
desc = "It's a storage unit for Nanotrasen-approved religious attire."
desc = "It's a storage unit for Kinaris-approved religious attire."
icon_door = "black"
/obj/structure/closet/wardrobe/chaplain_black/PopulateContents()

4
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -1,6 +1,6 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue Nanotrasen attire."
desc = "It's a storage unit for standard-issue Kinaris attire."
icon_door = "blue"
/obj/structure/closet/wardrobe/PopulateContents()
..()
@@ -60,7 +60,7 @@
return
/obj/structure/closet/wardrobe/orange
name = "prison wardrobe"
desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
desc = "It's a storage unit for Kinaris-regulation prisoner attire."
icon_door = "orange"
/obj/structure/closet/wardrobe/orange/PopulateContents()
for(var/i in 1 to 3)

2
code/game/objects/structures/fluff.dm
View File

@@ -37,7 +37,7 @@
/obj/structure/fluff/empty_sleeper/nanotrasen
name = "broken hypersleep chamber"
desc = "A Nanotrasen hypersleep chamber - this one appears broken. \
desc = "A Kinaris hypersleep chamber - this one appears broken. \
There are exposed bolts for easy disassembly using a wrench."
icon_state = "sleeper-o"

2
code/game/objects/structures/watercloset.dm
View File

@@ -208,7 +208,7 @@
/obj/machinery/shower
name = "shower"
desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
desc = "The HS-451. Installed in the 2550s by the Kinaris Hygiene Division."
icon = 'icons/obj/watercloset.dmi'
icon_state = "shower"
density = FALSE

10
code/modules/admin/admin.dm
View File

@@ -238,7 +238,7 @@
dat+="<HR><B>Feed Security functions:</B><BR>"
dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_menu_wanted=1'>[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue</A>"
dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_menu_censor_story=1'>Censor Feed Stories</A>"
dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_menu_censor_channel=1'>Mark Feed Channel with Nanotrasen D-Notice (disables and locks the channel).</A>"
dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_menu_censor_channel=1'>Mark Feed Channel with Kinaris D-Notice (disables and locks the channel).</A>"
dat+="<BR><HR><A href='?src=[REF(src)];[HrefToken()];ac_set_signature=1'>The newscaster recognises you as:<BR> <FONT COLOR='green'>[src.admin_signature]</FONT></A>"
if(1)
dat+= "Station Feed Channels<HR>"
@@ -292,7 +292,7 @@
if(9)
dat+="<B>[admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[created by: <FONT COLOR='maroon'>[admincaster_feed_channel.returnAuthor(-1)]</FONT>\]</FONT><HR>"
if(src.admincaster_feed_channel.censored)
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>"
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Kinaris D-Notice.<BR>"
dat+="No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>"
else
if( isemptylist(src.admincaster_feed_channel.messages) )
@@ -313,7 +313,7 @@
dat+="<BR><HR><A href='?src=[REF(src)];[HrefToken()];ac_refresh=1'>Refresh</A>"
dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_setScreen=[1]'>Back</A>"
if(10)
dat+="<B>Nanotrasen Feed Censorship Tool</B><BR>"
dat+="<B>Kinaris Feed Censorship Tool</B><BR>"
dat+="<FONT SIZE=1>NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.<BR>"
dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it.</FONT>"
dat+="<HR>Select Feed channel to get Stories from:<BR>"
@@ -324,7 +324,7 @@
dat+="<A href='?src=[REF(src)];[HrefToken()];ac_pick_censor_channel=[REF(CHANNEL)]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_setScreen=[0]'>Cancel</A>"
if(11)
dat+="<B>Nanotrasen D-Notice Handler</B><HR>"
dat+="<B>Kinaris D-Notice Handler</B><HR>"
dat+="<FONT SIZE=1>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.</FONT><HR>"
@@ -353,7 +353,7 @@
dat+="<B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.returnAuthor(-1)]</FONT> \]</FONT><BR>"
dat+="Channel messages listed below. If you deem them dangerous to the station, you can <A href='?src=[REF(src)];[HrefToken()];ac_toggle_d_notice=[REF(src.admincaster_feed_channel)]'>Bestow a D-Notice upon the channel</A>.<HR>"
if(src.admincaster_feed_channel.censored)
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>"
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Kinaris D-Notice.<BR>"
dat+="No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>"
else
if( isemptylist(src.admincaster_feed_channel.messages) )

2
code/modules/admin/holder2.dm
View File

@@ -48,7 +48,7 @@ GLOBAL_PROTECT(href_token)
target = ckey
name = "[ckey]'s admin datum ([R])"
rank = R
admin_signature = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
admin_signature = "Kinaris Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
href_token = GenerateToken()
if(R.rights & R_DEBUG) //grant profile access
world.SetConfig("APP/admin", ckey, "role=admin")

2
code/modules/antagonists/cult/cult.dm
View File

@@ -430,7 +430,7 @@
if(check_cult_victory())
parts += "<span class='greentext big'>The cult has succeeded! Nar'Sie has snuffed out another torch in the void!</span>"
else
parts += "<span class='redtext big'>The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!</span>"
parts += "<span class='redtext big'>The staff managed to stop the cult! Dark words and heresy are no match for Kinaris's finest!</span>"
if(objectives.len)
parts += "<b>The cultists' objectives were:</b>"

4
code/modules/antagonists/ert/ert.dm
View File

@@ -115,7 +115,7 @@
to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division."
var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Kinaris's Security Division."
if(leader) //If Squad Leader
missiondesc += " Lead your squad to ensure the completion of the mission. Board the shuttle when your team is ready."
else
@@ -132,7 +132,7 @@
to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division."
var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Kinaris's Security Division."
if(leader) //If Squad Leader
missiondesc += " Lead your squad to ensure the completion of the mission. Board the shuttle when your team is ready."
else

6
code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
View File

@@ -255,7 +255,7 @@
first_status = "Set"
else
first_status = "Auth S1."
var/second_status = exploded ? "Warhead triggered, thanks for flying Nanotrasen" : (safety ? "Safe" : "Engaged")
var/second_status = exploded ? "Warhead triggered, thanks for flying Kinaris" : (safety ? "Safe" : "Engaged")
data["status1"] = first_status
data["status2"] = second_status
data["anchored"] = anchored
@@ -459,8 +459,8 @@
return CINEMATIC_SELFDESTRUCT_MISS
/obj/machinery/nuclearbomb/beer
name = "Nanotrasen-brand nuclear fission explosive"
desc = "One of the more successful achievements of the Nanotrasen Corporate Warfare Division, their nuclear fission explosives are renowned for being cheap to produce and devastatingly effective. Signs explain that though this particular device has been decommissioned, every Nanotrasen station is equipped with an equivalent one, just in case. All Captains carefully guard the disk needed to detonate them - at least, the sign says they do. There seems to be a tap on the back."
name = "Kinaris-brand nuclear fission explosive"
desc = "One of the more successful achievements of the Kinaris Corporate Warfare Division, their nuclear fission explosives are renowned for being cheap to produce and devastatingly effective. Signs explain that though this particular device has been decommissioned, every Kinaris station is equipped with an equivalent one, just in case. All Captains carefully guard the disk needed to detonate them - at least, the sign says they do. There seems to be a tap on the back."
proper_bomb = FALSE
var/obj/structure/reagent_dispensers/beerkeg/keg

4
code/modules/antagonists/traitor/IAA/internal_affairs.dm
View File

@@ -6,7 +6,7 @@
/datum/antagonist/traitor/internal_affairs
name = "Internal Affairs Agent"
employer = "Nanotrasen"
employer = "Kinaris"
special_role = "internal affairs agent"
antagpanel_category = "IAA"
var/syndicate = FALSE
@@ -242,7 +242,7 @@
to_chat(owner.current, "<span class='userdanger'>You are the [special_role].</span>")
if(syndicate)
to_chat(owner.current, "<span class='userdanger'>Your target has been framed for [crime], and you have been tasked with eliminating them to prevent them defending themselves in court.</span>")
to_chat(owner.current, "<B><font size=5 color=red>Any damage you cause will be a further embarrassment to Nanotrasen, so you have no limits on collateral damage.</font></B>")
to_chat(owner.current, "<B><font size=5 color=red>Any damage you cause will be a further embarrassment to Kinaris, so you have no limits on collateral damage.</font></B>")
to_chat(owner.current, "<span class='userdanger'> You have been provided with a standard uplink to accomplish your task. </span>")
to_chat(owner.current, "<span class='userdanger'>By no means reveal that you, or any other NT employees, are undercover agents.</span>")
else

2
code/modules/awaymissions/bluespaceartillery.dm
View File

@@ -30,7 +30,7 @@
dat += "Locked on<BR>"
dat += "<B>Charge progress: [reload]/[reload_cooldown]:</B><BR>"
dat += "<A href='byond://?src=[REF(src)];fire=1'>Open Fire</A><BR>"
dat += "Deployment of weapon authorized by <br>Nanotrasen Naval Command<br><br>Remember, friendly fire is grounds for termination of your contract and life.<HR>"
dat += "Deployment of weapon authorized by <br>Kinaris Naval Command<br><br>Remember, friendly fire is grounds for termination of your contract and life.<HR>"
user << browse(dat, "window=scroll")
onclose(user, "scroll")

2
code/modules/cargo/bounties/security.dm
View File

@@ -27,7 +27,7 @@
/datum/bounty/item/security/sechuds
name = "Sec HUDs"
description = "Nanotrasen PMC has started to train officers how to use Sec HUDs to the fullest affect. Please send spare Sec HUDs so we can teach the men."
description = "Kinaris PMC has started to train officers how to use Sec HUDs to the fullest affect. Please send spare Sec HUDs so we can teach the men."
reward = 1250
required_count = 5
wanted_types = list(/obj/item/clothing/glasses/hud/security)

2
code/modules/cargo/exports/large_objects.dm
View File

@@ -11,7 +11,7 @@
/datum/export/large/crate/total_printout(datum/export_report/ex, notes = TRUE) // That's why a goddamn metal crate costs that much.
. = ..()
if(. && notes)
. += " Thanks for participating in Nanotrasen Crates Recycling Program."
. += " Thanks for participating in Kinaris Crates Recycling Program."
/datum/export/large/crate/wooden
cost = 100

2
code/modules/cargo/expressconsole.dm
View File

@@ -9,7 +9,7 @@
/obj/machinery/computer/cargo/express
name = "express supply console"
desc = "This console allows the user to purchase a package \
with 1/40th of the delivery time: made possible by NanoTrasen's new \"1500mm Orbital Railgun\".\
with 1/40th of the delivery time: made possible by Kinaris's new \"1500mm Orbital Railgun\".\
All sales are near instantaneous - please choose carefully"
icon_screen = "supply_express"
circuit = /obj/item/circuitboard/computer/cargo/express

4
code/modules/cargo/packs/armory.dm
View File

@@ -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 Kinaris-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 IS-ERI 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,

4
code/modules/cargo/packs/costumes_toys.dm
View File

@@ -189,7 +189,7 @@
/datum/supply_pack/costumes_toys/costume
name = "Standard Costume Crate"
desc = "Supply the station's entertainers with the equipment of their trade with these Nanotrasen-approved costumes! Contains a full clown and mime outfit, along with a bike horn and a bottle of nothing."
desc = "Supply the station's entertainers with the equipment of their trade with these Kinaris-approved costumes! Contains a full clown and mime outfit, along with a bike horn and a bottle of nothing."
cost = 1300
access = ACCESS_THEATRE
contains = list(/obj/item/storage/backpack/clown,
@@ -280,7 +280,7 @@
/datum/supply_pack/costumes_toys/wizard
name = "Wizard Costume Crate"
desc = "Pretend to join the Wizard Federation with this full wizard outfit! Nanotrasen would like to remind its employees that actually joining the Wizard Federation is subject to termination of job and life."
desc = "Pretend to join the Wizard Federation with this full wizard outfit! Kinaris would like to remind its employees that actually joining the Wizard Federation is subject to termination of job and life."
cost = 2000
contains = list(/obj/item/staff,
/obj/item/clothing/suit/wizrobe/fake,

4
code/modules/cargo/packs/engineering.dm
View File

@@ -12,7 +12,7 @@
/datum/supply_pack/engineering/shieldgen
name = "Anti-breach Shield Projector Crate"
desc = "Hull breaches again? Say no more with the Nanotrasen Anti-Breach Shield Projector! Uses forcefield technology to keep the air in, and the space out. Contains two shield projectors."
desc = "Hull breaches again? Say no more with the Kinaris Anti-Breach Shield Projector! Uses forcefield technology to keep the air in, and the space out. Contains two shield projectors."
cost = 2500
contains = list(/obj/machinery/shieldgen,
/obj/machinery/shieldgen)
@@ -183,7 +183,7 @@
/datum/supply_pack/engineering/bsa
name = "Bluespace Artillery Parts"
desc = "The pride of Nanotrasen Naval Command. The legendary Bluespace Artillery Cannon is a devastating feat of human engineering and testament to wartime determination. Highly advanced research is required for proper construction. "
desc = "The pride of Kinaris Naval Command. The legendary Bluespace Artillery Cannon is a devastating feat of human engineering and testament to wartime determination. Highly advanced research is required for proper construction. "
cost = 15000
special = TRUE
contains = list(/obj/item/circuitboard/machine/bsa/front,

4
code/modules/cargo/packs/misc.dm
View File

@@ -115,7 +115,7 @@
/datum/supply_pack/misc/bicycle
name = "Bicycle"
desc = "Nanotrasen reminds all employees to never toy with powers outside their control."
desc = "Kinaris reminds all employees to never toy with powers outside their control."
cost = 1000000
contains = list(/obj/vehicle/ridden/bicycle)
crate_name = "Bicycle Crate"
@@ -139,7 +139,7 @@
/datum/supply_pack/misc/book_crate
name = "Book Crate"
desc = "Surplus from the Nanotrasen Archives, these five books are sure to be good reads."
desc = "Surplus from the Kinaris Archives, these five books are sure to be good reads."
cost = 1500
contains = list(/obj/item/book/codex_gigas,
/obj/item/book/manual/random/,

4
code/modules/cargo/packs/organic.dm
View File

@@ -23,7 +23,7 @@
/datum/supply_pack/organic/hydroponics/beekeeping_fullkit
name = "Beekeeping Starter Crate"
desc = "BEES BEES BEES. Contains three honey frames, a beekeeper suit and helmet, flyswatter, bee house, and, of course, a pure-bred Nanotrasen-Standardized Queen Bee!"
desc = "BEES BEES BEES. Contains three honey frames, a beekeeper suit and helmet, flyswatter, bee house, and, of course, a pure-bred Kinaris-Standardized Queen Bee!"
cost = 1800
contains = list(/obj/structure/beebox/unwrenched,
/obj/item/honey_frame,
@@ -374,7 +374,7 @@
/datum/supply_pack/organic/potted_plants
name = "Potted Plants Crate"
desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from Nanotrasen's potted plant research division. Warranty void if thrown."
desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from Kinaris's potted plant research division. Warranty void if thrown."
cost = 730
contains = list(/obj/item/twohanded/required/kirbyplants/random,
/obj/item/twohanded/required/kirbyplants/random,

4
code/modules/cargo/packs/security.dm
View File

@@ -31,7 +31,7 @@
/datum/supply_pack/security/forensics
name = "Forensics Crate"
desc = "Stay hot on the criminal's heels with Nanotrasen's Detective Essentials(tm). Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, and of course, a fedora. Requires Security access to open."
desc = "Stay hot on the criminal's heels with Kinaris's Detective Essentials(tm). Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, and of course, a fedora. Requires Security access to open."
cost = 1800
contains = list(/obj/item/detective_scanner,
/obj/item/storage/box/evidence,
@@ -156,7 +156,7 @@
/datum/supply_pack/security/justiceinbound
name = "Standard Justice Enforcer Crate"
desc = "This is it. The Bee's Knees. The Creme of the Crop. The Pick of the Litter. The best of the best of the best. The Crown Jewel of Nanotrasen. The Alpha and the Omega of security headwear. Guaranteed to strike fear into the hearts of each and every criminal aboard the station. Also comes with a security gasmask. Requires Security access to open."
desc = "This is it. The Bee's Knees. The Creme of the Crop. The Pick of the Litter. The best of the best of the best. The Crown Jewel of Kinaris. The Alpha and the Omega of security headwear. Guaranteed to strike fear into the hearts of each and every criminal aboard the station. Also comes with a security gasmask. Requires Security access to open."
cost = 6000 //justice comes at a price. An expensive, noisy price.
contraband = TRUE
contains = list(/obj/item/clothing/head/helmet/justice,

4
code/modules/cargo/packs/service.dm
View File

@@ -158,7 +158,7 @@
/datum/supply_pack/service/janitor
name = "Janitorial Supplies Crate"
desc = "Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, spray cleaner, rag, NT soap and a trash bag."
desc = "Fight back against dirt and grime with Kinaris's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, spray cleaner, rag, NT soap and a trash bag."
cost = 1300
contains = list(/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
@@ -229,7 +229,7 @@
/datum/supply_pack/service/party
name = "Party Equipment"
desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, and a bottle of patron, goldschlager, and shaker!"
desc = "Celebrate both life and death on the station with Kinaris's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, and a bottle of patron, goldschlager, and shaker!"
cost = 2000
contains = list(/obj/item/storage/box/drinkingglasses,
/obj/item/reagent_containers/food/drinks/shaker,

4
code/modules/cargo/supplypod.dm
View File

@@ -2,7 +2,7 @@
//------------------------------------SUPPLY POD-------------------------------------//
/obj/structure/closet/supplypod
name = "supply pod" //Names and descriptions are normally created with the setStyle() proc during initialization, but we have these default values here as a failsafe
desc = "A Nanotrasen supply drop pod."
desc = "A Kinaris supply drop pod."
icon = 'icons/obj/supplypods.dmi'
icon_state = "supplypod"
pixel_x = -16 //2x2 sprite
@@ -256,7 +256,7 @@
//------------------------------------UPGRADES-------------------------------------//
/obj/item/disk/cargo/bluespace_pod //Disk that can be inserted into the Express Console to allow for Advanced Bluespace Pods
name = "Bluespace Drop Pod Upgrade"
desc = "This disk provides a firmware update to the Express Supply Console, granting the use of Nanotrasen's Bluespace Drop Pods to the supply department."
desc = "This disk provides a firmware update to the Express Supply Console, granting the use of Kinaris's Bluespace Drop Pods to the supply department."
icon = 'icons/obj/module.dmi'
icon_state = "cargodisk"
item_state = "card-id"

2
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -155,7 +155,7 @@
/obj/item/clothing/shoes/workboots
name = "work boots"
desc = "Nanotrasen-issue Engineering lace-up work boots for the especially blue-collar."
desc = "Kinaris-issue Engineering lace-up work boots for the especially blue-collar."
icon_state = "workboots"
item_state = "workboots"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'

2
code/modules/clothing/spacesuits/miscellaneous.dm
View File

@@ -46,7 +46,7 @@ Contains:
//NEW SWAT suit
/obj/item/clothing/suit/space/swat
name = "MK.I SWAT Suit"
desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Nanotrasen in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Kinaris in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
icon_state = "heavy"
item_state = "swat_suit"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)

2
code/modules/clothing/suits/armor.dm
View File

@@ -96,7 +96,7 @@
/obj/item/clothing/suit/armor/vest/leather
name = "security overcoat"
desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security."
desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Kinaris Security."
icon_state = "leathercoat-sec"
item_state = "hostrench"
body_parts_covered = CHEST|GROIN|ARMS|LEGS

8
code/modules/clothing/under/accessories.dm
View File

@@ -127,7 +127,7 @@
"<span class='notice'>You try to pin [src] on [M]'s chest.</span>")
var/input
if(!commended && user != M)
input = stripped_input(user,"Please input a reason for this commendation, it will be recorded by Nanotrasen.", ,"", 140)
input = stripped_input(user,"Please input a reason for this commendation, it will be recorded by Kinaris.", ,"", 140)
if(do_after(user, delay, target = M))
if(U.attach_accessory(src, user, 0)) //Attach it, do not notify the user of the attachment
if(user == M)
@@ -150,7 +150,7 @@
/obj/item/clothing/accessory/medal/conduct
name = "distinguished conduct medal"
desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew."
desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Kinaris. It is often awarded by a captain to a member of his crew."
/obj/item/clothing/accessory/medal/bronze_heart
name = "bronze heart medal"
@@ -196,7 +196,7 @@
/obj/item/clothing/accessory/medal/silver/security
name = "robust security award"
desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff."
desc = "An award for distinguished combat and sacrifice in defence of Kinaris's commercial interests. Often awarded to security staff."
/obj/item/clothing/accessory/medal/gold
name = "gold medal"
@@ -208,7 +208,7 @@
/obj/item/clothing/accessory/medal/gold/captain
name = "medal of captaincy"
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew."
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Kinaris, and their undisputable authority over their crew."
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/clothing/accessory/medal/gold/captain/family

4
code/modules/clothing/under/jobs/civilian.dm
View File

@@ -340,7 +340,7 @@
/obj/item/clothing/under/lawyer/blacksuit
name = "black suit"
desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
desc = "A professional black suit. Kinaris Investigation Bureau approved!"
icon_state = "blacksuit"
item_state = "bar_suit"
item_color = "blacksuit"
@@ -349,7 +349,7 @@
/obj/item/clothing/under/lawyer/blacksuit/skirt
name = "black suitskirt"
desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
desc = "A professional black suit. Kinaris Investigation Bureau approved!"
icon_state = "blacksuit_skirt"
item_state = "bar_suit"
item_color = "blacksuit_skirt"

4
code/modules/clothing/under/miscellaneous.dm
View File

@@ -61,7 +61,7 @@
can_adjust = FALSE
/obj/item/clothing/under/rank/prisoner
name = "prison jumpsuit"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
desc = "It's standardised Kinaris prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisoner"
item_state = "o_suit"
item_color = "prisoner"
@@ -71,7 +71,7 @@
/obj/item/clothing/under/rank/prisoner/skirt
name = "prison jumpskirt"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
desc = "It's standardised Kinaris prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisoner_skirt"
item_state = "o_suit"
item_color = "prisoner_skirt"

2
code/modules/food_and_drinks/drinks/drinks/bottle.dm
View File

@@ -260,7 +260,7 @@
if("A&A")
fullname = "Ash and Asher"
if("Generic")
fullname = "Nanotrasen Cheap Imitations"
fullname = "Kinariss Cheap Imitations"
var/removals = list("\[REDACTED\]", "\[EXPLETIVE DELETED\]",
"\[EXPUNGED\]", "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]",
"\[MOVE ALONG CITIZEN\]", "\[NOTHING TO SEE HERE\]")

2
code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
View File

@@ -10,7 +10,7 @@
/obj/machinery/icecream_vat
name = "ice cream vat"
desc = "Ding-aling ding dong. Get your Nanotrasen-approved ice cream!"
desc = "Ding-aling ding dong. Get your Kinaris-approved ice cream!"
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_vat"
density = TRUE

2
code/modules/holodeck/computer.dm
View File

@@ -162,7 +162,7 @@
playsound(src, "sparks", 75, 1)
obj_flags |= EMAGGED
to_chat(user, "<span class='warning'>You vastly increase projector power and override the safety and security protocols.</span>")
to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.")
to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Kinaris maintenance and do not use the simulator.")
log_game("[key_name(user)] emagged the Holodeck Control Console")
nerf(!(obj_flags & EMAGGED))

2
code/modules/integrated_electronics/subtypes/time.dm
View File

@@ -143,7 +143,7 @@
/obj/item/integrated_circuit/time/clock
name = "integrated clock (NT Common Time)"
desc = "Tells you what the time is, in Nanotrasen Common Time." //round time
desc = "Tells you what the time is, in Kinaris Common Time." //round time
icon_state = "clock"
inputs = list()
outputs = list(

6
code/modules/mining/aux_base.dm
View File

@@ -137,7 +137,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
/obj/machinery/computer/auxillary_base/proc/set_landing_zone(turf/T, mob/user, no_restrictions)
var/obj/docking_port/mobile/auxillary_base/base_dock = locate(/obj/docking_port/mobile/auxillary_base) in SSshuttle.mobile
if(!base_dock) //Not all maps have an Aux base. This object is useless in that case.
to_chat(user, "<span class='warning'>This station is not equipped with an auxillary base. Please contact your Nanotrasen contractor.</span>")
to_chat(user, "<span class='warning'>This station is not equipped with an auxillary base. Please contact your Kinaris contractor.</span>")
return
if(!no_restrictions)
var/static/list/disallowed_turf_types = typecacheof(list(
@@ -322,7 +322,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
break
if(!Mport)
to_chat(user, "<span class='warning'>This station is not equipped with an appropriate mining shuttle. Please contact Nanotrasen Support.</span>")
to_chat(user, "<span class='warning'>This station is not equipped with an appropriate mining shuttle. Please contact Kinaris Support.</span>")
return
var/obj/docking_port/mobile/mining_shuttle
@@ -336,7 +336,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
break
if(!mining_shuttle) //Not having a mining shuttle is a map issue
to_chat(user, "<span class='warning'>No mining shuttle signal detected. Please contact Nanotrasen Support.</span>")
to_chat(user, "<span class='warning'>No mining shuttle signal detected. Please contact Kinaris Support.</span>")
SSshuttle.stationary.Remove(Mport)
qdel(Mport)
return

4
code/modules/mining/equipment/survival_pod.dm
View File

@@ -266,8 +266,8 @@
//Signs
/obj/structure/sign/mining
name = "nanotrasen mining corps sign"
desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims."
name = "Kinaris mining corps sign"
desc = "A sign of relief for weary miners, and a warning for would-be competitors to Kinaris's mining claims."
icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "ntpod"

2
code/modules/mining/equipment/wormhole_jaunter.dm
View File

@@ -1,7 +1,7 @@
/**********************Jaunter**********************/
/obj/item/wormhole_jaunter
name = "wormhole jaunter"
desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to blue space for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThanks to modifications provided by the Free Golems, this jaunter can be worn on the belt to provide protection from chasms."
desc = "A single use device harnessing outdated wormhole technology, Kinaris has since turned its eyes to blue space for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThanks to modifications provided by the Free Golems, this jaunter can be worn on the belt to provide protection from chasms."
icon = 'icons/obj/mining.dmi'
icon_state = "Jaunter"
item_state = "electronic"

2
code/modules/mining/machine_vending.dm
View File

@@ -56,7 +56,7 @@
new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
new /datum/data/mining_equipment("Deluxe Shelter Capsule", /obj/item/survivalcapsule/deluxe, 2500),
new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 6000),
new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800),
new /datum/data/mining_equipment("Kinaris Minebot", /mob/living/simple_animal/hostile/mining_drone, 800),
new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400),
new /datum/data/mining_equipment("Minebot Cooldown Upgrade", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600),

2
code/modules/mining/minebot.dm
View File

@@ -3,7 +3,7 @@
#define MINEDRONE_ATTACK 2
/mob/living/simple_animal/hostile/mining_drone
name = "nanotrasen minebot"
name = "Kinaris minebot"
desc = "The instructions printed on the side read: This is a small robot used to support miners, can be set to search and collect loose ore, or to help fend off wildlife."
gender = NEUTER
icon = 'icons/mob/aibots.dmi'

2
code/modules/mob/living/brain/MMI.dm
View File

@@ -1,6 +1,6 @@
/obj/item/mmi
name = "Man-Machine Interface"
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity, that nevertheless has become standard-issue on Nanotrasen stations."
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity, that nevertheless has become standard-issue on Kinaris stations."
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_off"
w_class = WEIGHT_CLASS_NORMAL

2
code/modules/mob/living/silicon/silicon.dm
View File

@@ -10,7 +10,7 @@
bubble_icon = "machine"
weather_immunities = list("ash")
possible_a_intents = list(INTENT_HELP, INTENT_HARM)
mob_biotypes = list(MOB_ROBOTIC)
mob_biotypes = list(MOB_SILICON)
rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
speech_span = SPAN_ROBOT

6
code/modules/paperwork/contract.dm
View File

@@ -28,7 +28,7 @@
/obj/item/paper/contract/employment/update_text()
name = "paper- [target] employment contract"
info = "<center>Conditions of Employment</center><BR><BR><BR><BR>This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and Nanotrasen (hereafter referred to as the omnipresent and helpful watcher of humanity).<BR>WITNESSETH:<BR>WHEREAS, SLAVE is a natural born human or humanoid, possessing skills upon which he can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity.<BR>WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude.<BR>NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows:<BR>In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives.<BR>Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity.<BR>Should transfership of a soul not be possible, a lien shall be placed instead.<BR>Signed,<BR><i>[target]</i>"
info = "<center>Conditions of Employment</center><BR><BR><BR><BR>This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and Kinaris (hereafter referred to as the omnipresent and helpful watcher of humanity).<BR>WITNESSETH:<BR>WHEREAS, SLAVE is a natural born human or humanoid, possessing skills upon which he can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity.<BR>WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude.<BR>NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows:<BR>In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives.<BR>Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity.<BR>Should transfership of a soul not be possible, a lien shall be placed instead.<BR>Signed,<BR><i>[target]</i>"
/obj/item/paper/contract/employment/attack(mob/living/M, mob/living/carbon/human/user)
@@ -41,8 +41,8 @@
else
deconvert = prob (5)
if(deconvert)
M.visible_message("<span class='notice'>[user] reminds [M] that [M]'s soul was already purchased by Nanotrasen!</span>")
to_chat(M, "<span class='boldnotice'>You feel that your soul has returned to its rightful owner, Nanotrasen.</span>")
M.visible_message("<span class='notice'>[user] reminds [M] that [M]'s soul was already purchased by Kinaris!</span>")
to_chat(M, "<span class='boldnotice'>You feel that your soul has returned to its rightful owner, Kinaris.</span>")
M.return_soul()
else
M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", \

2
code/modules/paperwork/folders.dm
View File

@@ -83,7 +83,7 @@
/obj/item/folder/documents
name = "folder- 'TOP SECRET'"
desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\""
desc = "A folder stamped \"Top Secret - Property of Kinaris Corporation. Unauthorized distribution is punishable by death.\""
/obj/item/folder/documents/Initialize()
. = ..()

2
code/modules/paperwork/paper_premade.dm
View File

@@ -65,7 +65,7 @@
/obj/item/paper/fluff/stations/centcom/bulletin
name = "paper- 'Official Bulletin'"
info = "<BR>CentCom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>CentCom Port Commissioner"
info = "<BR>CentCom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Kinaris employees only. Deny all other entrants.<BR><BR>CentCom Port Commissioner"
/////////// Lavaland

2
code/modules/power/cell.dm
View File

@@ -167,7 +167,7 @@
charge = 0
/obj/item/stock_parts/cell/crap
name = "\improper Nanotrasen brand rechargeable AA battery"
name = "\improper Kinaris brand rechargeable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
maxcharge = 500
materials = list(MAT_GLASS=40)

2
code/modules/projectiles/guns/misc/chem_gun.dm
View File

@@ -2,7 +2,7 @@
//this is meant to hold reagents/obj/item/gun/syringe
/obj/item/gun/chem
name = "reagent gun"
desc = "A Nanotrasen syringe gun, modified to automatically synthesise chemical darts, and instead hold reagents."
desc = "A Kinaris syringe gun, modified to automatically synthesise chemical darts, and instead hold reagents."
icon_state = "chemgun"
item_state = "chemgun"
w_class = WEIGHT_CLASS_NORMAL

10
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
View File

@@ -1034,7 +1034,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/grog
name = "Grog"
description = "Watered down rum, Nanotrasen approves!"
description = "Watered down rum, Kinaris approves!"
color = "#664300" // rgb: 102, 67, 0
boozepwr = 1 //Basically nothing
taste_description = "a poor excuse for alcohol"
@@ -1088,12 +1088,12 @@ All effects don't start immediately, but rather get worse over time; the rate is
taste_description = "stomach acid"
glass_icon_state = "acidspitglass"
glass_name = "Acid Spit"
glass_desc = "A drink from Nanotrasen. Made from live aliens."
glass_desc = "A drink from Kinaris. Made from live aliens."
value = 3
/datum/reagent/consumable/ethanol/amasec
name = "Amasec"
description = "Official drink of the Nanotrasen Gun-Club!"
description = "Official drink of the Kinaris Gun-Club!"
color = "#664300" // rgb: 102, 67, 0
boozepwr = 35
quality = DRINK_GOOD
@@ -1315,7 +1315,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
taste_description = "da bomb"
glass_icon_state = "atomicbombglass"
glass_name = "Atomic Bomb"
glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
glass_desc = "Kinaris cannot take legal responsibility for your actions after imbibing."
value = 3.56
/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/M)
@@ -1806,7 +1806,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
taste_description = "seduction"
glass_icon_state = "between_the_sheets"
glass_name = "Between the Sheets"
glass_desc = "The only drink that comes with a label reminding you of Nanotrasen's zero-tolerance promiscuity policy."
glass_desc = "The only drink that comes with a label reminding you of Kinaris's high tolerance promiscuity policy."
value = 2
/datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/L)

4
code/modules/research/machinery/_production.dm
View File

@@ -117,10 +117,10 @@
if(!istype(D))
return FALSE
if(!(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
say("Warning: Printing failed: This fabricator does not have the necessary keys to decrypt design schematics. Please update the research data with the on-screen button and contact Nanotrasen Support!")
say("Warning: Printing failed: This fabricator does not have the necessary keys to decrypt design schematics. Please update the research data with the on-screen button and contact Kinaris Support!")
return FALSE
if(D.build_type && !(D.build_type & allowed_buildtypes))
say("This machine does not have the necessary manipulation systems for this design. Please contact Nanotrasen Support!")
say("This machine does not have the necessary manipulation systems for this design. Please contact Kinaris Support!")
return FALSE
if(!materials.mat_container)
say("No connection to material storage, please contact the quartermaster.")

2
code/modules/research/nanites/nanite_chamber_computer.dm
View File

@@ -89,7 +89,7 @@
var/mob/living/L = chamber.occupant
if(!(MOB_ORGANIC in L.mob_biotypes) && !(MOB_UNDEAD in L.mob_biotypes))
if((MOB_SILICON in L.mob_biotypes))
data["status_msg"] = "Occupant not compatible with nanites."
return data

2
code/modules/research/nanites/nanite_programs/utility.dm
View File

@@ -237,7 +237,7 @@
if(prob(10))
var/list/mob/living/target_hosts = list()
for(var/mob/living/L in oview(5, host_mob))
if(!(MOB_ORGANIC in L.mob_biotypes) && !(MOB_UNDEAD in L.mob_biotypes))
if((MOB_SILICON in L.mob_biotypes))
continue
target_hosts += L
if(!target_hosts.len)

2
code/modules/research/nanites/public_chamber.dm
View File

@@ -137,7 +137,7 @@
var/mob/living/L = occupant
if(SEND_SIGNAL(L, COMSIG_HAS_NANITES))
return
if((MOB_ORGANIC in L.mob_biotypes) || (MOB_UNDEAD in L.mob_biotypes))
if((MOB_ORGANIC in L.mob_biotypes) || (MOB_UNDEAD in L.mob_biotypes) || (MOB_ROBOTIC in L.mob_biotypes))
inject_nanites()
/obj/machinery/public_nanite_chamber/open_machine()

2
code/modules/ruins/spaceruin_code/oldstation.dm
View File

@@ -45,7 +45,7 @@
name = "Crew Reawakening Report"
info = "Artificial Program's report to surviving crewmembers.<br><br>Crew were placed into cryostasis on March 10th, 2445.<br><br>Crew were awoken from cryostasis around June, 2557.<br><br> \
<b>SIGNIFICANT EVENTS OF NOTE</b><br>1: The primary radiation detectors were taken offline after 112 years due to power failure, secondary radiation detectors showed no residual \
radiation on station. Deduction, primarily detector was malfunctioning and was producing a radiation signal when there was none.<br><br>2: A data burst from a nearby Nanotrasen Space \
radiation on station. Deduction, primarily detector was malfunctioning and was producing a radiation signal when there was none.<br><br>2: A data burst from a nearby Kinaris Space \
Station was received, this data burst contained research data that has been uploaded to our RnD labs.<br><br>3: Unknown invasion force has occupied Delta station."
/obj/item/paper/fluff/ruins/oldstation/generator_manual

4
code/modules/station_goals/station_goal.dm
View File

@@ -12,8 +12,8 @@
var/report_message = "Complete this goal."
/datum/station_goal/proc/send_report()
priority_announce("Priority Nanotrasen directive received. Project \"[name]\" details inbound.", "Incoming Priority Message", 'sound/ai/commandreport.ogg')
print_command_report(get_report(),"Nanotrasen Directive [pick(GLOB.phonetic_alphabet)] \Roman[rand(1,50)]", announce=FALSE)
priority_announce("Priority Kinaris directive received. Project \"[name]\" details inbound.", "Incoming Priority Message", 'sound/ai/commandreport.ogg')
print_command_report(get_report(),"Kinaris Directive [pick(GLOB.phonetic_alphabet)] \Roman[rand(1,50)]", announce=FALSE)
on_report()
/datum/station_goal/proc/on_report()

Some files were not shown because too many files have changed in this diff Show More