diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index 5ea1a370a4f..1e641e23c26 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -157,6 +157,10 @@ #define BP_AUG_LANGUAGE "integrated language processor" #define BP_AUG_PSI "psionic receiver" #define BP_AUG_CALF_OVERRIDE "calf overdrive" +#define BP_AUG_MEMORY "memory inhibitor" +#define BP_AUG_EMOTION "emotional manipulator" +#define BP_AUG_ENCHANED_VISION "vision enhanced retinas" +#define BP_AUG_SIGHTLIGHTS "ocular installed sightlights" //Organ defines #define PROCESS_ACCURACY 10 diff --git a/code/modules/background/accent/tajara.dm b/code/modules/background/accent/tajara.dm index ab802bc0843..37729c3904f 100644 --- a/code/modules/background/accent/tajara.dm +++ b/code/modules/background/accent/tajara.dm @@ -69,7 +69,7 @@ /datum/accent/northrasnrr name = ACCENT_NORTHRASNRR - description = "While similar to the Republican Siik'maas, Northern Ras'nrr Siik’maas is relatively free from the Hadiist additions. It is known for its \ + description = "While similar to the Republican Siik'maas, Northern Ras'nrr Siik'maas is relatively free from the Hadiist additions. It is known for its \ short, sharp vowel sounds and clear pronunciation. Most speakers are found in the DPRA controlled area of the region, but some do exist within the PRA borders." tag_icon = "tajara_northrasnrr" diff --git a/code/modules/client/preference_setup/loadout/loadout_augments.dm b/code/modules/client/preference_setup/loadout/loadout_augments.dm index 7e888bb964f..a1579572768 100644 --- a/code/modules/client/preference_setup/loadout/loadout_augments.dm +++ b/code/modules/client/preference_setup/loadout/loadout_augments.dm @@ -12,18 +12,15 @@ display_name = "integrated eye sensors" description = "An eye augment that allows the user to deploy medical or security sensors." path = /obj/item/organ/internal/augment/eye_sensors - cost = 4 + cost = 3 whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) - /datum/gear/augment/cyber_hair display_name = "synthetic hair extensions" description = "A hair augment that allows the user to change the shape and color of their hair." path = /obj/item/organ/internal/augment/cyber_hair - cost = 2 whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_IPC_SHELL) - /datum/gear/augment/combitool display_name = "retractable combitool" description = "An augment that allows the user to deploy a robotic combitool." @@ -53,7 +50,6 @@ display_name = "taste booster selection" description = "A selection of augments that modify the user's taste sensitivity." path = /obj/item/organ/internal/augment/taste_booster - cost = 3 /datum/gear/augment/taste_boosters/New() ..() @@ -66,11 +62,47 @@ display_name = "integrated fuel cell" description = "An augment that allows the user to synthetize welding fuel into nutrients." path = /obj/item/organ/internal/augment/fuel_cell - cost = 3 + cost = 2 /datum/gear/augment/psiaug display_name = "psionic receiver" description = "An augment installed into the head that functions as a surrogate for a missing zona bovinae, also functioning as a filter for the psionically-challenged." path = /obj/item/organ/internal/augment/psi - cost = 1 whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + +/datum/gear/augment/memory_inhibitor + display_name = "memory inhibitor" + description = "A Zeng Hu implant that allows one to have control over their memories, allowing you to set a timer and remove any memories developed within it." + path = /obj/item/organ/internal/augment/memory_inhibitor + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL) + faction = "Zeng-Hu Pharmaceuticals" + +/datum/gear/augment/emotional_manipulator + display_name = "emotional manipulator" + description = "A Zeng Hu brain implant to manipulate the brain's chemicals to induce a calming or happy feeling." + path = /obj/item/organ/internal/augment/emotional_manipulator + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL) + faction = "Zeng-Hu Pharmaceuticals" + +/datum/gear/augment/enhanced_vision + display_name = "vision enhanced retinas" + description = "Zeng Hu implants given to EMTs to assist with finding the injured. These eye implants allow one to see further than you normally could." + path = /obj/item/organ/internal/augment/enhanced_vision + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + faction = "Zeng-Hu Pharmaceuticals" + cost = 3 + +/datum/gear/augment/sightlights + display_name = "ocular installed sightlights" + description = "Designed to assist Zeng-Hu medical personnel in darker areas or places experiencing periodic power issues, Sightlights will allow one to be able to use their eyes as a flashlight." + path = /obj/item/organ/internal/augment/sightlights + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + faction = "Zeng-Hu Pharmaceuticals" + cost = 3 + +/datum/gear/augment/zenghu_plate + display_name = "zeng-hu veterancy plate" + description = "A clear sign of Zeng-Hu's best, this plate bearing the company's symbol is installed on those who prove themselves in the hyper-competitive environment" + path = /obj/item/organ/internal/augment/zenghu_plate + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + faction = "Zeng-Hu Pharmaceuticals" diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 9a6d5bb5b08..46f078dc677 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -328,7 +328,7 @@ slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING /obj/item/clothing/head/beret/dominia - name = "tribunal initiate’s beret" + name = "tribunal initiate's beret" desc = "A simple red beret with a golden badge marking its wearer as an initiate of the Moroz Holy Tribunal." desc_fluff = " While initiates dress humbly in white and red clothing, this does not mean that House Caladius - the primary source of the Holy Tribunal's \ funding - spares any expenses funding them, and these berets are made of luxurious velvet." @@ -337,8 +337,8 @@ item_state = "dominia_beret" /obj/item/clothing/head/beret/dominia/priest - name = "tribunalist’s beret" - desc = " black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal’s clergy." + name = "tribunalist's beret" + desc = " black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy." desc_fluff = "With their black and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \ are a sight to behold both inside and outside of the Empire of Dominia. This beret features an emblem luxuriously and painstakingly crafted out of real gold." icon = 'icons/clothing/head/dominia_beret_priest.dmi' diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index 5d766775299..9707e033f84 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -178,7 +178,7 @@ if(actual_charges > 0) addtimer(CALLBACK(src, .proc/disarm), recharge_time MINUTES) if(is_broken()) - visible_message(SPAN_DANGER("\The [owner] crackles with energy!")) + owner.visible_message(SPAN_DANGER("\The [owner] crackles with energy!")) playsound(owner, 'sound/magic/LightningShock.ogg', 75, 1) tesla_zap(owner, 7, 1500) @@ -197,7 +197,7 @@ if(!.) return FALSE - visible_message(SPAN_DANGER("\The [owner] crackles with energy!")) + owner.visible_message(SPAN_DANGER("\The [owner] crackles with energy!")) playsound(owner, 'sound/magic/LightningShock.ogg', 75, 1) tesla_zap(owner, 7, 1500) @@ -207,6 +207,7 @@ cooldown = 25 activable = TRUE organ_tag = BP_AUG_EYE_SENSORS + parent_organ = BP_HEAD action_button_name = "Toggle Eye Sensors" var/active_hud = "disabled" @@ -353,4 +354,164 @@ name = "psionic receiver" desc = "An augment installed into the head that functions as a surrogate for a missing zona bovinae, also functioning as a filter for the psionically-challenged." organ_tag = BP_AUG_PSI + parent_organ = BP_HEAD + +/obj/item/organ/internal/augment/memory_inhibitor + name = "memory inhibitor" + desc = "A Zeng Hu implant that allows one to have control over their memories, allowing you to set a timer and remove any memories developed within it. This is most popular in Zeng Hu labs within Eridani." + icon_state = "memory_inhibitor" + organ_tag = BP_AUG_MEMORY + parent_organ = BP_HEAD + activable = TRUE + cooldown = 20 + action_button_icon = "memory_inhibitor" + action_button_name = "Activate Memory Inhibitor" + var/ready_to_erase = FALSE + +/obj/item/organ/internal/augment/memory_inhibitor/attack_self(var/mob/user) + . = ..() + + if(!.) + return FALSE + + if(!ready_to_erase) + to_chat(owner, SPAN_NOTICE("Your memories following this point will be deleted on the following activation.")) + ready_to_erase = TRUE + else + to_chat(owner, SPAN_WARNING("You do not recall the events since the last time you activated your memory inhibitor!")) + ready_to_erase = FALSE + +/obj/item/organ/internal/augment/memory_inhibitor/do_broken_act() + if(owner) + to_chat(owner, SPAN_WARNING("You forgot everything that happened today!")) + return TRUE + +/obj/item/organ/internal/augment/memory_inhibitor/emp_act(severity) + ..() + if(prob(25)) + do_broken_act() + +/obj/item/organ/internal/augment/emotional_manipulator + name = "emotional manipulator" + desc = "A Zeng Hu brain implant to manipulate the brain's chemicals to induce a calming or happy feeling. This is one of the most popular implants across the company." + icon_state = "emotional_manipulator" + organ_tag = BP_AUG_EMOTION + parent_organ = BP_HEAD + action_button_name = "Activate Emotional Manipulator" + activable = TRUE + action_button_icon = "emotional_manipulator" + cooldown = 10 + var/set_emotion = "Disabled" + + var/list/possible_emotions = list( + "Disabled", + "Happiness", + "Calmness") + +/obj/item/organ/internal/augment/emotional_manipulator/attack_self(var/mob/user) + . = ..() + + if(!.) + return FALSE + + var/choice = input("Select the Emotional Choice.", "Emotional Manipulator") as null|anything in capitalize_list(possible_emotions) + + set_emotion = lowertext(choice) + +/obj/item/organ/internal/augment/emotional_manipulator/process() + ..() + + if(!owner) + return + + if(prob(1)) + + switch(set_emotion) + + if("Happiness") + + to_chat(owner, SPAN_NOTICE("You feel happy.")) + + if("Calmness") + to_chat(owner, SPAN_NOTICE("You feel calm.")) + + if(is_broken()) + do_broken_act() + +/obj/item/organ/internal/augment/emotional_manipulator/do_broken_act() + if(owner) + owner.hallucination += 20 + return TRUE + + +/obj/item/organ/internal/augment/enhanced_vision + name = "vision enhanced retinas" + desc = "Zeng Hu implants given to EMTs to assist with finding the injured. These eye implants allow one to see further than you normally could." + icon_state = "enhanced_vision" + organ_tag = BP_AUG_ENCHANED_VISION + parent_organ = BP_HEAD + action_button_name = "Activate Vision Enhanced Retinas" + action_button_icon = "enhanced_vision" + cooldown = 30 + activable = TRUE + +/obj/item/organ/internal/augment/enhanced_vision/Initialize() + . = ..() + set_light(3, 2, LIGHT_COLOR_TUNGSTEN, uv = 0, angle = LIGHT_WIDE) + +/obj/item/organ/internal/augment/enhanced_vision/attack_self(var/mob/user) + . = ..() + + if(!.) + return FALSE + + zoom(owner,7,3, FALSE) + +/obj/item/organ/internal/augment/enhanced_vision/emp_act(severity) + ..() + var/obj/item/organ/internal/eyes/E = owner.get_eyes() + if(!E) + return + E.take_damage(5) + +/obj/item/organ/internal/augment/sightlights + name = "ocular installed sightlights " + desc = "Designed to assist medical personnel in darker areas or places experiencing periodic power issues, Sightlights will allow one to be able to use their eyes as a flashlight." + icon_state = "sightlights" + organ_tag = BP_AUG_SIGHTLIGHTS + parent_organ = BP_HEAD + action_button_name = "Activate Ocular Installed Sightlights " + action_button_icon = "sightlights" + cooldown = 30 + activable = TRUE + var/lights_on = FALSE + +/obj/item/organ/internal/augment/sightlights/attack_self(var/mob/user) + . = ..() + + if(!.) + return FALSE + + if(lights_on) + set_light(5, 2, LIGHT_COLOR_TUNGSTEN, uv = 0, angle = LIGHT_WIDE) + else + set_light(0) + +/obj/item/organ/internal/augment/sightlights/emp_act(severity) + ..() + set_light(0) + +/obj/item/organ/internal/augment/sightlights/take_damage(var/amount, var/silent = 0) + ..() + set_light(0) + +/obj/item/organ/internal/augment/sightlights/take_internal_damage(var/amount, var/silent = 0) + ..() + set_light(0) + +/obj/item/organ/internal/augment/zenghu_plate + name = "zeng-hu veterancy plate " + desc = " A clear sign of Zeng-Hu's best, this plate bearing the company's symbol is installed on those who prove themselves in the hyper-competitive environment." + icon_state = "zenghu_plate" + on_mob_icon = 'icons/mob/human_races/augments_external.dmi' parent_organ = BP_HEAD \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 4c41f7e95ae..00a5679cddd 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2501,14 +2501,14 @@ /decl/reagent/alcohol/jovian_storm name = "Jovian Storm" - description = "Named after Jupiter’s storm. It’ll blow you away." + description = "Named after Jupiter's storm. It'll blow you away." color = "#AA856A" strength = 15 taste_description = "stormy sweetness" glass_icon_state = "jovianstormglass" glass_name = "glass of Jovian Storm" - glass_desc = "A classic Callistean drink named after Jupiter’s storm. It’ll blow you away." + glass_desc = "A classic Callistean drink named after Jupiter's storm. It'll blow you away." glass_center_of_mass = list("x"=16, "y"=5) /decl/reagent/alcohol/bananahonk diff --git a/html/changelogs/alberyk-zenghu.yml b/html/changelogs/alberyk-zenghu.yml new file mode 100644 index 00000000000..2bb12a41238 --- /dev/null +++ b/html/changelogs/alberyk-zenghu.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added new Zeng Hu exclusive augments to the custom loadout." \ No newline at end of file diff --git a/icons/mob/human_races/augments_external.dmi b/icons/mob/human_races/augments_external.dmi index 74c345f5a7b..4f9fb0fea51 100644 Binary files a/icons/mob/human_races/augments_external.dmi and b/icons/mob/human_races/augments_external.dmi differ diff --git a/icons/obj/action_buttons/organs.dmi b/icons/obj/action_buttons/organs.dmi index 698fa8ea49d..bc4acf729d4 100644 Binary files a/icons/obj/action_buttons/organs.dmi and b/icons/obj/action_buttons/organs.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index ef59396ff65..b7baa9f5d59 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ