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

Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak

Browse Source 
Kinaris Corp 1.1.9
This commit is contained in:
Dahlular
2020-11-27 07:40:04 -07:00
committed by GitHub
parent bc047f081b e6cc206c12
commit 238ab653c4
17 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/export_scanner.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/export_scanner
name = "export scanner"
desc = "A device used to check objects against Nanotrasen exports and bounty database. Sadly can not scan reagents vaule."
desc = "A device used to check objects against exports and bounties. Sadly can not scan reagents value."
icon = 'icons/obj/device.dmi'
icon_state = "export_scanner"
item_state = "radio"
code/modules/clothing/under/jobs/security.dm
+5 -5
View File
@@ -9,7 +9,7 @@
*/
/obj/item/clothing/under/rank/security
name = "security jumpsuit"
desc = "A tactical security jumpsuit for officers complete with Nanotrasen belt buckle."
desc = "A tactical security jumpsuit for officers complete with Kinaris PMC belt buckle."
icon_state = "rsecurity"
item_state = "r_suit"
item_color = "rsecurity"
@@ -20,7 +20,7 @@
random_sensor = FALSE
/obj/item/clothing/under/rank/security/grey
name = "grey security jumpsuit"
desc = "A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
desc = "A tactical relic of years past before it was agreed upon that it was cheaper to just dye the suits red instead of washing out the blood."
icon_state = "security"
item_state = "gy_suit"
item_color = "security"
@@ -63,7 +63,7 @@
/obj/item/clothing/under/rank/warden
name = "security suit"
desc = "A formal security suit for officers complete with Nanotrasen belt buckle."
desc = "A formal security suit for officers complete with Kinaris PMC belt buckle."
icon_state = "rwarden"
item_state = "r_suit"
item_color = "rwarden"
@@ -74,14 +74,14 @@
random_sensor = FALSE
/obj/item/clothing/under/rank/warden/grey
name = "grey security suit"
desc = "A formal relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
desc = "A formal relic of years past before it was decided it was cheaper to dye the suits red instead of washing out the blood."
icon_state = "warden"
item_state = "gy_suit"
item_color = "warden"
/obj/item/clothing/under/rank/warden/skirt
name = "warden's suitskirt"
desc = "A formal security suitskirt for officers complete with Nanotrasen belt buckle."
desc = "A formal security suitskirt for officers complete with Kinaris PMC belt buckle."
icon_state = "rwarden_skirt"
item_state = "r_suit"
item_color = "rwarden_skirt"
code/modules/library/lib_machines.dm
+3 -3
View File
@@ -439,12 +439,12 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
alert("No news network found on station. Aborting.")
var/channelexists = 0
for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
if(FC.channel_name == "Nanotrasen Book Club")
if(FC.channel_name == "Radiance Book Club")
channelexists = 1
break
if(!channelexists)
GLOB.news_network.CreateFeedChannel("Nanotrasen Book Club", "Library", null)
GLOB.news_network.SubmitArticle(scanner.cache.dat, "[scanner.cache.name]", "Nanotrasen Book Club", null)
GLOB.news_network.CreateFeedChannel("Radiance Book Club", "Library", null)
GLOB.news_network.SubmitArticle(scanner.cache.dat, "[scanner.cache.name]", "Radiance Book Club", null)
alert("Upload complete. Your uploaded title is now available on station newscasters.")
if(href_list["orderbyid"])
if(cooldown > world.time)
code/modules/ruins/lavaland_ruin_code.dm
+2 -2
View File
@@ -114,7 +114,7 @@
job_description = "Off-station Syndicate Scientist"
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Continue your research as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!</b>"
flavour_text = "<span class='big bold'>You are a Cybersun branch syndicate agent,</span><b> employed in a top secret research facility developing biological weapons plants and toys. Fortunately, your hated enemy, Nanotrasen activity in this sector of space is minimal. <b>Continue your research as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands! If discovered by Kinaris Corp, consider trade negotiations</b>"
outfit = /datum/outfit/lavaland_syndicate
assignedrole = "Lavaland Syndicate"
mirrorcanloadappearance = TRUE
@@ -142,7 +142,7 @@
/obj/effect/mob_spawn/human/lavaland_syndicate/comms
name = "Syndicate Comms Agent"
job_description = "Off-station Syndicate Comms Agent"
flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Monitor enemy activity as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!</b>"
flavour_text = "<span class='big bold'>You are a Donk.Co branch syndicate agent,</span><b> employed in a top secret research facility developing biological weapons plants and toys. Fortunately, your hated enemy, Nanotrasen activity in this sector of space is minimal. <b>Continue your research as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands! If discovered by Kinaris Corp, consider trade negotiations</b>"
outfit = /datum/outfit/lavaland_syndicate/comms
mirrorcanloadappearance = TRUE
code/modules/station_goals/bsa.dm
+2 -2
View File
@@ -10,7 +10,7 @@
We need you to construct BSA-[rand(1,99)] Artillery position aboard your station.
Base parts are available for shipping via cargo.
-Nanotrasen Naval Command"}
Naval Command"}
/datum/station_goal/bluespace_cannon/on_report()
//Unlock BSA parts
@@ -64,7 +64,7 @@
/obj/machinery/bsa/middle
name = "Bluespace Artillery Fusor"
desc = "Contents classified by Nanotrasen Naval Command. Needs to be linked with the other BSA parts using multitool."
desc = "Contents classified by Naval Command. Needs to be linked with the other BSA parts using multitool."
icon_state = "fuel_chamber"
var/obj/machinery/bsa/back/back
var/obj/machinery/bsa/front/front
code/modules/vending/cigarette.dm
+1
View File
@@ -6,6 +6,7 @@
icon_state = "cigs"
products = list(/obj/item/storage/fancy/cigarettes = 5,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
/obj/item/storage/fancy/cigarettes/smokekins = 3,
/obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 3,