diff --git a/code/game/objects/items/devices/radio/radio_vr.dm b/code/game/objects/items/devices/radio/radio_vr.dm index 932229d0ad..523c37644b 100644 --- a/code/game/objects/items/devices/radio/radio_vr.dm +++ b/code/game/objects/items/devices/radio/radio_vr.dm @@ -20,8 +20,8 @@ //Pathfinder's Subspace Radio /obj/item/device/subspaceradio name = "subspace radio" - desc = "A powerful new radio recently gifted to Nanotrasen from KHI, this communications device has the ability to send and recieve transmissions from anywhere." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + desc = "A powerful new radio recently gifted to Nanotrasen from Xion Manufacturing Group, this communications device has the ability to send and recieve transmissions from anywhere." + catalogue_data = list(/datum/category_item/catalogue/information/organization/xion) icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' icon_state = "radiopack" diff --git a/code/modules/busy_space_vr/organizations.dm b/code/modules/busy_space_vr/organizations.dm index 021aef8ff2..c7b8865066 100644 --- a/code/modules/busy_space_vr/organizations.dm +++ b/code/modules/busy_space_vr/organizations.dm @@ -703,7 +703,7 @@ "if told you I'd have to kill you", "... wait, why am I even telling you this? Just let me pass", "stop asking questions") - +/* Space foxes: deleted. Keeping them commented for historical reasons. /datum/lore/organization/gov/kitsuhana name = "Kitsuhana Heavy Industries" short_name = "Kitsuhana" @@ -757,6 +757,7 @@ "a Kitsuhana ringworld in Lund VI", "a Kitsuhana ringworld in Dais IX", "a Kitsuhana ringworld in Leibert II-b") +*/ /datum/lore/organization/gov/ares name = "Ares Confederation" diff --git a/code/modules/catalogue/catalogue_data_vr.dm b/code/modules/catalogue/catalogue_data_vr.dm index ff370bca92..5fa252ea39 100644 --- a/code/modules/catalogue/catalogue_data_vr.dm +++ b/code/modules/catalogue/catalogue_data_vr.dm @@ -71,6 +71,8 @@ desc = "" value = CATALOGUER_REWARD_TRIVIAL +/* /datum/category_item/catalogue/information/organization/khi name = "Government - Kitsuhana Heavy Industries" datum_to_copy = /datum/lore/organization/gov/kitsuhana +*/ \ No newline at end of file diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index dfdd02c461..6183a1d335 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -1,7 +1,6 @@ /obj/item/clothing/glasses/omnihud name = "\improper AR glasses" - desc = "The KHI-62 AR Glasses are a design from Kitsuhana Heavy Industries. These are a cheap export version \ - for Nanotrasen. Probably not as complete as KHI could make them, but more readily available for NT." + desc = "The NT-62 AR Glasses are augmented reality glasses designed and exported by NanoTrasen." origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 3) var/obj/item/clothing/glasses/hud/omni/hud = null var/mode = "civ" @@ -67,7 +66,7 @@ /obj/item/clothing/glasses/omnihud/med name = "\improper AR-M glasses" - desc = "The KHI-62-M AR glasses are a design from Kitsuhana Heavy Industries. \ + desc = "The NT-62-M AR glasses are a design of the Augmented Reality glasses that NanoTrasen produces. \ These have been upgraded with medical records access and virus database integration." mode = "med" action_button_name = "AR Console (Crew Monitor)" @@ -96,7 +95,7 @@ /obj/item/clothing/glasses/omnihud/eng name = "\improper AR-E glasses" - desc = "The KHI-62-E AR glasses are a design from Kitsuhana Heavy Industries. \ + desc = "The NT-62-E AR glasses are a design of the Augmented Reality glasses that NanoTrasen produces. \ These have been upgraded with advanced electrochromic lenses to protect your eyes during welding." mode = "eng" flash_protection = FLASH_PROTECTION_MAJOR @@ -110,8 +109,8 @@ /obj/item/clothing/glasses/omnihud/rnd name = "\improper AR-R glasses" - desc = "The KHI-62-R AR glasses are a design from Kitsuhana Heavy Industries. \ - These have been ... modified ... to fit into a different frame." + desc = "The NT-62-R AR glasses are a design of the Augmented Reality glasses that NanoTrasen produces.\ + These have been ... modified ... to.... well. They're purple." mode = "sci" icon = 'icons/obj/clothing/glasses.dmi' icon_override = null @@ -156,8 +155,8 @@ /obj/item/clothing/glasses/omnihud/all name = "\improper AR-B glasses" - desc = "The KHI-62-B AR glasses are a design from Kitsuhana Heavy Industries. \ - These have been upgraded with every feature the lesser models have. Now we're talkin'." + desc = "The NT-62-B AR glasses are a design of the Augmented Reality glasses that NanoTrasen produces. \ + These have been upgraded with every feature the lesser models have." mode = "best" flash_protection = FLASH_PROTECTION_MAJOR enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED) diff --git a/code/modules/projectiles/guns/energy/netgun_vr.dm b/code/modules/projectiles/guns/energy/netgun_vr.dm index 329b9fcdca..0ed0b9fc51 100644 --- a/code/modules/projectiles/guns/energy/netgun_vr.dm +++ b/code/modules/projectiles/guns/energy/netgun_vr.dm @@ -1,8 +1,8 @@ /obj/item/weapon/gun/energy/netgun name = "energy net gun" - desc = "A Kitsuhana-designed, usually dubbed 'Hunter' or 'non-lethal capture device' stunner and energy net launcher, \ + desc = "A Hephaestus-designed, usually dubbed 'Hunter' or 'non-lethal capture device' stunner and energy net launcher, \ for when you want criminals to stop acting like they're on a 20th century British comedy sketch show." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) icon = 'icons/obj/gun_vr.dmi' icon_state = "hunter" item_state = "gun" // Placeholder diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index 6a83f5dad0..11739438b5 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/transhuman/resleeving name = "resleeving control console" - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, + catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med, /datum/category_item/catalogue/technology/resleeving) icon_keyboard = "med_key" icon_screen = "dna" diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index 4803a9e668..f4dc1e2095 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -3,7 +3,7 @@ /obj/machinery/computer/transhuman/designer name = "body design console" - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, + catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med, /datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/computer_vr.dmi' icon_keyboard = "med_key" diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm index c0cf830e0d..24f35f105a 100644 --- a/code/modules/resleeving/implant.dm +++ b/code/modules/resleeving/implant.dm @@ -7,7 +7,7 @@ /obj/item/weapon/implant/backup name = "backup implant" desc = "A mindstate backup implant that occasionally stores a copy of one's mind on a central server for backup purposes." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, + catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med, /datum/category_item/catalogue/technology/resleeving) icon = 'icons/vore/custom_items_vr.dmi' icon_state = "backup_implant" @@ -17,7 +17,7 @@ Implant Specifications:
Name: [using_map.company_name] Employee Backup Implant
Life: ~8 hours.
-Important Notes: Implant is life-limited due to KHI licensing restrictions. Dissolves into harmless biomaterial after around ~8 hours, the typical work shift.
+Important Notes: Implant is life-limited due to VM licensing restrictions. Dissolves into harmless biomaterial after around ~8 hours, the typical work shift.
Implant Details:
Function: Contains a small swarm of nanobots that perform neuron scanning to create mind-backups.
@@ -39,8 +39,8 @@ //New, modern implanter instead of old style implanter. /obj/item/weapon/backup_implanter name = "backup implanter" - desc = "After discovering that Nanotrasen was just re-using the same implanters over and over again on organics, leading to cross-contamination, Kitsuhana Heavy industries designed this self-cleaning model. Holds four backup implants at a time." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, + desc = "After discovering that Nanotrasen was just re-using the same implanters over and over again on organics, leading to cross-contamination, Vey-Medical designed this self-cleaning model. Holds four backup implants at a time." + catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med, /datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/device_alt.dmi' icon_state = "bimplant" @@ -138,7 +138,8 @@ new /obj/item/weapon/implantcase/backup(src) new /obj/item/weapon/implanter(src) -//Purely for fluff +/* /obj/item/weapon/implant/backup/full name = "khi backup implant" desc = "A normal KHI wireless cortical stack with neutrino and QE transmission for constant-stream consciousness upload." +*/ diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 501a8c8670..769735baa4 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -6,7 +6,7 @@ /////// Grower Pod /////// /obj/machinery/clonepod/transhuman name = "grower pod" - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, + catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med, /datum/category_item/catalogue/technology/resleeving) circuit = /obj/item/weapon/circuitboard/transhuman_clonepod @@ -172,7 +172,7 @@ /obj/machinery/transhuman/synthprinter name = "SynthFab 3000" desc = "A rapid fabricator for synthetic bodies." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, + catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med, /datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/machines/synthpod.dmi' icon_state = "pod_0" @@ -399,7 +399,7 @@ /obj/machinery/transhuman/resleever name = "resleeving pod" desc = "Used to combine mind and body into one unit." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, + catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med, /datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/machines/implantchair.dmi' icon_state = "implantchair" diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index 7da45bbdb1..d7a7ab3c4d 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -3,8 +3,8 @@ /obj/item/device/sleevecard name = "sleevecard" - desc = "This KHI-upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, + desc = "This Vey-Med-upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." + catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med, /datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/pda.dmi' diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 9bba0b3525..cbc9a58b38 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -899,11 +899,11 @@ desc = "ROW ROW, FIGHT THE POWER." flash_prot = 1 //Why not. -//Kitsuhana Uniforms +//Kitsuhana Uniforms - Despite the fact that we removed KHI, we're keeping these. -YW /obj/item/clothing/under/rank/khi name = "Delete Me" desc = "Why did you spawn this one? Dork." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + //catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) sensor_mode = 3 icon = 'icons/vore/custom_clothes_vr.dmi' @@ -914,7 +914,7 @@ /obj/item/clothing/under/rank/khi/cmd //Command version name = "KHI command suit" - desc = "Kitsuhana Heavy Industries uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason." + desc = "An outdated command uniform, branded with the logo of a defunct spacer organization" icon_state = "khi_uniform_cmd_i" item_state = "khi_uniform_cmd" worn_state = "khi_uniform_cmd" @@ -922,7 +922,7 @@ /obj/item/clothing/under/rank/khi/sec //Security version name = "KHI security suit" - desc = "Kitsuhana Heavy Industries uniform. This one has angry red security stripes. Keepin' the peace in style." + desc = "An outdated security uniform, branded with the logo of a defunct spacer organization" icon_state = "khi_uniform_sec_i" item_state = "khi_uniform_sec" worn_state = "khi_uniform_sec" @@ -930,7 +930,7 @@ /obj/item/clothing/under/rank/khi/med //Medical version name = "KHI medical suit" - desc = "Kitsuhana Heavy Industries uniform. The medical version. Why not just get a new body, anyway?" + desc = "An outdated medical uniform, branded with the logo of a defunct spacer organization" icon_state = "khi_uniform_med_i" item_state = "khi_uniform_med" worn_state = "khi_uniform_med" @@ -938,7 +938,7 @@ /obj/item/clothing/under/rank/khi/eng //Engineering version name = "KHI engineering suit" - desc = "Kitsuhana Heavy Industries uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time." + desc = "An outdated engineer uniform, branded with the logo of a defunct spacer organization." icon_state = "khi_uniform_eng_i" item_state = "khi_uniform_eng" worn_state = "khi_uniform_eng" @@ -946,7 +946,7 @@ /obj/item/clothing/under/rank/khi/sci //Science version name = "KHI science suit" - desc = "Kitsuhana Heavy Industries uniform. For performing science in, based on the color! Only SCIENCE can save us now." + desc = "An outdated science uniform, branded with the logo of a defunct spacer organization" icon_state = "khi_uniform_sci_i" item_state = "khi_uniform_sci" worn_state = "khi_uniform_sci" @@ -954,7 +954,7 @@ /obj/item/clothing/under/rank/khi/fluff/aronai //Aro fluff version name = "KHI meditech suit" - desc = "Kitsuhana Heavy Industries uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top." + desc = "An outdated uniform of some sort. You get the sense that whoever wore this must've been very full of themselves" icon_state = "khi_uniform_aro_i" item_state = "khi_uniform_aro" worn_state = "khi_uniform_aro" diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm index 514fee5014..a597894a4f 100644 --- a/code/modules/vore/fluffstuff/guns/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -4,7 +4,8 @@ desc = "Variety is the spice of life! This weapon is a hybrid of the KHI-102b 'Nanotech Selectable-Fire Weapon' and the Vey-Med ML-3 'Medigun', dubbed the 'NSFW-ML3M'. \ It can fire both harmful and healing cells with an internal nanite fabricator and energy weapon cell loader. Up to three combinations of \ energy beams can be configured at once. Ammo not included." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus, + /datum/category_item/catalogue/information/organization/vey_med) icon = 'icons/vore/custom_guns_vr.dmi' icon_state = "nsfw" @@ -140,13 +141,13 @@ /obj/item/weapon/gun/projectile/nsfw/combat name = "cell-loaded revolver" - desc = "Variety is the spice of life! The KHI-102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ + desc = "Variety is the spice of life! The HI-102b 'Nanotech Selectable-Fire Weapon', is an unholy hybrid of an ammo-driven \ energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of \ energy beams can be configured at once. Ammo not included." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) description_info = "This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type." - description_fluff = "The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding." + description_fluff = "The Hephaestus Industries 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding." description_antag = "" allowed_magazines = list(/obj/item/ammo_magazine/nsfw_mag/combat) @@ -215,7 +216,7 @@ /obj/item/ammo_magazine/nsfw_mag/combat //security name = "microbattery magazine" desc = "A microbattery holder for the \'NSFW\'" - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) description_info = "This magazine holds NSFW microbatteries to power the NSFW handgun. Up to three can be loaded at once, and each provides four shots of their respective energy type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger." ammo_type = /obj/item/ammo_casing/nsfw_batt/combat @@ -238,7 +239,7 @@ /obj/item/ammo_casing/nsfw_batt name = "\'NSFW\' microbattery - UNKNOWN" desc = "A miniature battery for an energy weapon." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) icon = 'icons/obj/ammo_vr.dmi' icon_state = "nsfw_batt" slot_flags = SLOT_BELT | SLOT_EARS @@ -274,7 +275,7 @@ /obj/item/ammo_casing/nsfw_batt/combat name = "\'NSFW\' microbattery - UNKNOWN" desc = "A miniature battery for an energy weapon." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) /obj/item/ammo_casing/nsfw_batt/combat/lethal name = "\'NSFW\' microbattery - LETHAL" diff --git a/code/modules/vore/fluffstuff/guns/protector.dm b/code/modules/vore/fluffstuff/guns/protector.dm index c66a8fb7d2..d2105b3650 100644 --- a/code/modules/vore/fluffstuff/guns/protector.dm +++ b/code/modules/vore/fluffstuff/guns/protector.dm @@ -1,12 +1,12 @@ // -------------- Protector ------------- /obj/item/weapon/gun/energy/protector name = "small energy gun" - desc = "The KHI-98a 'Protector' is the first firearm custom-designed for Nanotrasen by KHI. It features a powerful stun mode, and \ + desc = "The HI-98a 'Protector' is the first firearm custom-designed for Nanotrasen by KHI. It features a powerful stun mode, and \ an alert-level-locked lethal mode, only usable on code blue and higher. It also features an integrated flashlight!" - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi) + catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) description_info = "This gun can only be fired in lethal mode while on higher security alert levels. It is legal for sec to carry for this reason, since it cannot be used for lethal force until SOP allows it, in essence." - description_fluff = "The first 'commission' from a Kitsuhana citizen for NanoTrasen, this gun has a wireless connection to the computer's datacore to ensure it can't be used without authorization from heads of staff who have raised the alert level. Until then, *click*!" + description_fluff = "The first 'commission' from Hephaestus Industries for NanoTrasen, this gun has a wireless connection to the computer's datacore to ensure it can't be used without authorization from heads of staff who have raised the alert level. Until then, *click*!" description_antag = "The gun can be emagged to remove the lethal security level restriction, allowing it to be fired on lethal mode at all times." icon = 'icons/vore/custom_guns_vr.dmi' diff --git a/vorestation.dme b/vorestation.dme index cd7a1e1089..943d2c66e4 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -690,8 +690,8 @@ #include "code\game\jobs\whitelist.dm" #include "code\game\jobs\whitelist_vr.dm" #include "code\game\jobs\job\assistant.dm" -#include "code\game\jobs\job\blueshield.dm" #include "code\game\jobs\job\assistant_vr.dm" +#include "code\game\jobs\job\blueshield.dm" #include "code\game\jobs\job\captain.dm" #include "code\game\jobs\job\captain_vr.dm" #include "code\game\jobs\job\civilian.dm"