mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 14:08:44 +01:00
traffic updates
This commit is contained in:
Killian
@@ -51,7 +51,7 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance
|
||||
//VOREStation Add
|
||||
/obj/item/technomancer_catalog/universal
|
||||
name = "universal catalog"
|
||||
desc = "A catalog to be used with the Morpheus 'Universal Core', shamelessly \
|
||||
desc = "A catalog to be used with the 'Universal Core', its contents shamelessly \
|
||||
copied by an unknown designer from some group of 'technomancers' or another.<br>\
|
||||
The back of the book has " + span_italics("'Export Edition'") + " stamped on it."
|
||||
budget = 700
|
||||
|
||||
@@ -104,7 +104,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
|
||||
var/comm_first_name = "[owner] [shipname]" //corpname + shipname for speaker identity in log
|
||||
var/combined_second_name = "[secondprefix] [secondid] |[secondshipname]|"
|
||||
var/comm_second_name = "[secondowner] [secondshipname]"
|
||||
var/short_second_name = "[secondprefix] |[secondshipname]|"
|
||||
//var/short_second_name = "[secondprefix] |[secondshipname]|" //not actually used for now
|
||||
|
||||
var/mission_noun = pick(source.flight_types) //pull from a list of owner-specific flight ops, to allow an extra dash of flavor
|
||||
if(source.complex_tasks) //if our source has the complex_tasks flag, regenerate with a two-stage assignment
|
||||
|
||||
@@ -1822,6 +1822,51 @@
|
||||
"a Chimera research lab"
|
||||
)
|
||||
|
||||
/datum/lore/organization/tsc/kitsuhana //reassigned category
|
||||
name = "Kitsuhana Heavy Industries"
|
||||
short_name = "KHI"
|
||||
desc = "Data pending replacement, please stand by!"
|
||||
history = "Data pending replacement, please stand by!"
|
||||
work = "data pending"
|
||||
headquarters = "Kitsuhana Prime"
|
||||
motto = "Data pending."
|
||||
|
||||
org_type = "neutral" //in lieu of coming up with mottos, for now
|
||||
//Culture ship names!
|
||||
ship_prefixes = list("KHT" = "transport", "KHI" = "general operations")
|
||||
append_ship_names = TRUE
|
||||
added_ship_names = list(
|
||||
"Nervous Energy",
|
||||
"Prosthetic Conscience",
|
||||
"Revisionist",
|
||||
"Trade Surplus",
|
||||
"Flexible Demeanour",
|
||||
"Just Read The Instructions",
|
||||
"Limiting Factor",
|
||||
"Cargo Cult",
|
||||
"Gunboat Diplomat",
|
||||
"A Ship With A View",
|
||||
"Cantankerous",
|
||||
"I Thought He Was With You",
|
||||
"Never Talk To Strangers",
|
||||
"Sacrificial Victim",
|
||||
"Unwitting Accomplice",
|
||||
"Bad For Business",
|
||||
"Just Testing",
|
||||
"Size Isn't Everything",
|
||||
"Yawning Angel",
|
||||
"Liveware Problem",
|
||||
"Very Little Gravitas Indeed",
|
||||
"Zero Gravitas",
|
||||
"Gravitas Free Zone",
|
||||
"Absolutely No You-Know-What"
|
||||
)
|
||||
destination_names = list(
|
||||
"the Kitsuhana Forge",
|
||||
"a KHI supply depot",
|
||||
"a KHI industrial complex"
|
||||
)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Other
|
||||
|
||||
@@ -290,7 +290,6 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
|
||||
full set of prosthetic limbs."
|
||||
value = CATALOGUER_REWARD_TRIVIAL
|
||||
|
||||
|
||||
/datum/category_item/catalogue/information
|
||||
|
||||
// For these we can piggyback off of the lore datums that are already defined and used in some places.
|
||||
@@ -352,6 +351,10 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
|
||||
name = "TSC - Major Bill's Transportation"
|
||||
datum_to_copy = /datum/lore/organization/tsc/mbt
|
||||
|
||||
/datum/category_item/catalogue/information/organization/khi
|
||||
name = "TSC - Kitsuhana Heavy Industries"
|
||||
datum_to_copy = /datum/lore/organization/tsc/kitsuhana
|
||||
|
||||
/datum/category_item/catalogue/information/organization/commonwealth //VS EDIT 1
|
||||
name = "Government - Commonwealth of Sol-Procyon" //VS EDIT 2
|
||||
datum_to_copy = /datum/lore/organization/gov/commonwealth //VS EDIT 3
|
||||
|
||||
@@ -15,9 +15,10 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
|
||||
//Nanotech Implant Foundation
|
||||
/obj/item/nif
|
||||
name = "nanite implant framework"
|
||||
desc = "A somewhat diminished knockoff of a Morpheus nano working surface, in a box. Can print new \
|
||||
desc = "A mass-production model of a KHI nano working surface, in a box. Can print new \
|
||||
implants inside living hosts on the fly based on software uploads. Must be surgically \
|
||||
implanted in the head to work. May eventually wear out and break."
|
||||
implanted in the head to work, and requires periodical maintenance. Warning: this device \
|
||||
is extremely sensitive to electromagnetic pulse waves."
|
||||
|
||||
icon = 'icons/obj/device_alt.dmi'
|
||||
icon_state = "nif_0"
|
||||
@@ -625,14 +626,14 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
|
||||
starting_software = null
|
||||
|
||||
/obj/item/nif/authentic
|
||||
name = "\improper Morpheus NIF"
|
||||
desc = "An actual Morpheus working surface, in a box. From a society slightly less afraid \
|
||||
of self-replicating nanotechnology. Basically just a high-endurance NIF."
|
||||
name = "\improper KHI NIF"
|
||||
desc = "An actual KHI working surface, in a box. These are the high-end models, usually only available to big spenders and those with serious contacts. \
|
||||
Despite the all the marketing speak, they're really just a high-endurance NIF when it comes down to it."
|
||||
durability = 1000
|
||||
|
||||
/obj/item/nif/bioadap
|
||||
name = "bioadaptive NIF"
|
||||
desc = "A NIF that goes out of it's way to accomidate strange body types. \
|
||||
desc = "A NIF that goes out of it's way to accomodate strange body types. \
|
||||
Will function in species where it normally wouldn't."
|
||||
durability = 75
|
||||
bioadap = TRUE
|
||||
|
||||
@@ -382,6 +382,35 @@
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/mining(src)
|
||||
|
||||
// Pilot Disk //
|
||||
/obj/item/disk/nifsoft/pilot
|
||||
name = "NIFSoft Uploader - Pilot"
|
||||
desc = "Contains free NIFSofts useful for pilot members.\n\
|
||||
It has a small label: \n\
|
||||
\"Portable NIFSoft Installation Media. \n\
|
||||
Align ocular port with eye socket and depress red plunger.\""
|
||||
icon = 'icons/obj/nanomods_vr.dmi'
|
||||
icon_state = "pilot"
|
||||
stored_organic = /datum/nifsoft/package/pilot
|
||||
stored_synthetic = /datum/nifsoft/package/pilot_synth
|
||||
|
||||
/datum/nifsoft/package/pilot
|
||||
software = list(/datum/nifsoft/spare_breath)
|
||||
|
||||
/datum/nifsoft/package/pilot_synth
|
||||
software = list(/datum/nifsoft/pressure,/datum/nifsoft/heatsinks)
|
||||
|
||||
/obj/item/storage/box/nifsofts_pilot
|
||||
name = "pilot nifsoft uploaders"
|
||||
desc = "A box of free nifsofts for pilot employees."
|
||||
icon = 'icons/obj/boxes_vr.dmi'
|
||||
icon_state = "nifsoft_kit_pilot"
|
||||
|
||||
/obj/item/storage/box/nifsofts_pilot/New()
|
||||
..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/pilot(src)
|
||||
|
||||
// Mass Alteration Disk //
|
||||
/obj/item/disk/nifsoft/sizechange
|
||||
name = "NIFSoft Uploader - Mass Alteration"
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
// Pilot Disk //
|
||||
/obj/item/disk/nifsoft/pilot
|
||||
name = "NIFSoft Uploader - Pilot"
|
||||
desc = "Contains free NIFSofts useful for pilot members.\n\
|
||||
It has a small label: \n\
|
||||
\"Portable NIFSoft Installation Media. \n\
|
||||
Align ocular port with eye socket and depress red plunger.\""
|
||||
icon = 'icons/obj/nanomods_vr.dmi'
|
||||
icon_state = "pilot"
|
||||
stored_organic = /datum/nifsoft/package/pilot
|
||||
stored_synthetic = /datum/nifsoft/package/pilot_synth
|
||||
|
||||
/datum/nifsoft/package/pilot
|
||||
software = list(/datum/nifsoft/spare_breath)
|
||||
|
||||
/datum/nifsoft/package/pilot_synth
|
||||
software = list(/datum/nifsoft/pressure,/datum/nifsoft/heatsinks)
|
||||
|
||||
/obj/item/storage/box/nifsofts_pilot
|
||||
name = "pilot nifsoft uploaders"
|
||||
desc = "A box of free nifsofts for pilot employees."
|
||||
icon = 'icons/obj/boxes_vr.dmi'
|
||||
icon_state = "nifsoft_kit_pilot"
|
||||
|
||||
/obj/item/storage/box/nifsofts_pilot/New()
|
||||
..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/pilot(src)
|
||||
@@ -921,43 +921,43 @@
|
||||
icon_state = "khi_uniform"
|
||||
|
||||
/obj/item/clothing/under/rank/khi/cmd //Command version
|
||||
name = "sleek command suit"
|
||||
desc = "A sleek, neocorporate style uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason."
|
||||
name = "KHI command suit"
|
||||
desc = "A sleek, neocorporate style uniform. An extra-comfortable command one, at that."
|
||||
icon_state = "khi_uniform_cmd"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/clothing/under/rank/khi/sec //Security version
|
||||
name = "sleek security suit"
|
||||
name = "KHI security suit"
|
||||
desc = "A sleek, neocorporate style uniform. This one has angry red security stripes. Keepin' the peace in style."
|
||||
icon_state = "khi_uniform_sec"
|
||||
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/clothing/under/rank/khi/med //Medical version
|
||||
name = "sleek medical suit"
|
||||
name = "KHI medical suit"
|
||||
desc = "A sleek, neocorporate style uniform. The medical version. Why not just get a new body, anyway?"
|
||||
icon_state = "khi_uniform_med"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
|
||||
|
||||
/obj/item/clothing/under/rank/khi/eng //Engineering version
|
||||
name = "sleek engineering suit"
|
||||
name = "KHI engineering suit"
|
||||
desc = "A sleek, neocorporate style uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time."
|
||||
icon_state = "khi_uniform_eng"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
|
||||
|
||||
/obj/item/clothing/under/rank/khi/sci //Science version
|
||||
name = "sleek science suit"
|
||||
name = "KHI science suit"
|
||||
desc = "A sleek, neocorporate style uniform. For performing science in, based on the color! Only SCIENCE can save us now."
|
||||
icon_state = "khi_uniform_sci"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/clothing/under/rank/khi/crg //Cargo version
|
||||
name = "sleek cargo suit"
|
||||
desc = "A sleek, neocorporate style uniform. Looks like it's in supply and cargo division colors. Even post-scarcity societies need things moved and mined sometimes."
|
||||
name = "KHI cargo suit"
|
||||
desc = "A sleek, neocorporate style uniform. Looks like it's in supply and cargo division colors. Heavy industry means heavy lifting, after all."
|
||||
icon_state = "khi_uniform_crg"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/clothing/under/rank/khi/civ //Science version
|
||||
name = "sleek civilian suit"
|
||||
name = "KHI civilian suit"
|
||||
desc = "A sleek, neocorporate style uniform. Snazzy silver trim marks this is as the general civilian branch. Smells like paperwork and bureaucracy."
|
||||
icon_state = "khi_uniform_civ"
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
|
||||
@@ -3580,7 +3580,6 @@
|
||||
#include "code\modules\nifsoft\nif_softshop.dm"
|
||||
#include "code\modules\nifsoft\nif_tgui.dm"
|
||||
#include "code\modules\nifsoft\nifsoft.dm"
|
||||
#include "code\modules\nifsoft\nifsoft_vr.dm"
|
||||
#include "code\modules\nifsoft\software\01_vision.dm"
|
||||
#include "code\modules\nifsoft\software\05_health.dm"
|
||||
#include "code\modules\nifsoft\software\06_screens.dm"
|
||||
|
||||
Reference in New Issue
Block a user