diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm index fa09eaea5c..513311313e 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm @@ -8,8 +8,8 @@ // CH edit - Changes ML-3 to NERD description_info = "Created to fulfill the needs and wants of the Curabitur Scimed personell during rescue operations, the Healcannon is a marvel of reverse-engineering and utilization of unknown technologies. \ It makes use of the Vey-Med NERD 'Medigun' microbattery technology, combining the effects of multiple 'microbatteries' into single 'macrobatteries' that are built around precursor void cores, \ - allowing for the batteries to self-charge for prolonged field use. However, the weakened beams caused by the use of ununderstood technology created a need for a VERY strong focus, \ - which lead to the Healcannon becoming a very bulky tool. Fortunately, it's not as heavy as it looks." + allowing for the batteries to self-charge for prolonged field use. However, the weakened beams caused by the use of misunderstood technology created a need for a VERY strong focus, \ + which lead to the Healcannon becoming a very bulky tool. Fortunately, it's not as heavy as it looks." // CHOMPedit: Spellcheck w_class = ITEMSIZE_LARGE load_method = SINGLE_CASING @@ -58,7 +58,7 @@ .=..() update_icon() chambered = null - + /obj/item/weapon/gun/projectile/multi_cannon/get_ammo_count() // Custom handling for the Curabitur. if(istype(chambered, /obj/item/ammo_casing/macrobattery)) var/obj/item/ammo_casing/macrobattery/battery = chambered diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm index d333081c37..2394a7d9f7 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm @@ -3,7 +3,7 @@ name = "macrobattery" icon = 'icons/obj/ammo_vr.dmi' icon_state = "macrobat_wtf" - desc = "A large nanite fabricator for a medigun. Powered by a mix of precursor and modern tech, this fancy device recharges without an outside power source." + desc = "A large nanite fabricator for a Curabitur cannon. Powered by a mix of precursor and modern tech, this fancy device recharges without an outside power source. Takes approximately three seconds to charge one shot." // CHOMPedit: Clearer charge time projectile_type = /obj/item/projectile/beam/chain_lightning //why the hell not @@ -11,7 +11,7 @@ var/charge var/max_charge = 10 var/ticks = 1 - var/ticks_to_charge = 15 //10 secs per shot charged + var/ticks_to_charge = 3 // CHOMPedit: Reduced from 15 ticks to 3 for a faster recharge, which comes out to around 3 seconds on a localhost. These things are VERY rare. /obj/item/ammo_casing/macrobattery/Initialize(mapload, ...) . = ..() @@ -21,7 +21,7 @@ /obj/item/ammo_casing/macrobattery/Destroy() STOP_PROCESSING(SSobj, src) . = ..() - + /obj/item/ammo_casing/macrobattery/process() ticks++ if(ticks%ticks_to_charge == 0) @@ -44,7 +44,7 @@ var/mob/living/user = multi_cannon.loc if(istype(user)) user?.hud_used.update_ammo_hud(user, multi_cannon) - return + return else BB = null return null @@ -57,8 +57,8 @@ if(charge >= max_charge) STOP_PROCESSING(SSobj, src) if(istype(loc,/obj/item/weapon/gun/projectile/multi_cannon)) - loc.update_icon() - + loc.update_icon() + // TGMC Ammo HUD - Update the HUD every time we're called to recharge. if(istype(loc, /obj/item/weapon/gun/projectile/multi_cannon)) var/obj/item/weapon/gun/projectile/multi_cannon = loc @@ -71,30 +71,46 @@ /obj/item/ammo_casing/macrobattery/stabilize name = "Macrobattery - STABILIZE" icon_state = "macrobat_stabilize" + desc = "A large nanite fabricator for a Curabitur cannon. Powered by a mix of precursor and modern tech, \ + this fancy device recharges without an outside power source. This one alleviates oxygen loss, disinfects and closes open wounds, \ + salves burn wounds and stabilizes the patient's heartrate. Takes approximately three \ + seconds to charge one shot." // CHOMPedit: Clearer applied effects bat_colour = "#3399ff" projectile_type = /obj/item/projectile/beam/medical_cell/stabilize2 /obj/item/ammo_casing/macrobattery/buff name = "Macrobattery - BOOSTER" icon_state = "macrobat_uber" + desc = "A large nanite fabricator for a Curabitur cannon. Powered by a mix of precursor and modern tech, \ + this fancy device recharges without an outside power source. This one provides patients with a 15% resistance to incoming damage \ + and reduces stun effect times by 15% for 20 seconds. Takes approximately three seconds to charge one shot." // CHOMPedit: Clearer applied effects bat_colour = "#993300" projectile_type = /obj/item/projectile/beam/medical_cell/resist /obj/item/ammo_casing/macrobattery/detox name = "Macrobattery - DETOX" icon_state = "macrobat_purifier" + desc = "A large nanite fabricator for a Curabitur cannon. Powered by a mix of precursor and modern tech, \ + this fancy device recharges without an outside power source. This one removes toxins and radiation buildup from a patient. \ + Takes approximately three seconds to charge one shot." // CHOMPedit: Clearer applied effects bat_colour = "#339933" projectile_type = /obj/item/projectile/beam/medical_cell/detox /obj/item/ammo_casing/macrobattery/ouchie name = "Macrobattery - LETHAL" icon_state = "macrobat_ouchie" + desc = "A large nanite fabricator for a Curabitur cannon. Powered by a mix of precursor and modern tech, \ + this fancy device recharges without an outside power source. This one deals damage. \ + Takes approximately three seconds to charge one shot." // CHOMPedit: Clearer applied effects bat_colour = "#cc3300" projectile_type = /obj/item/projectile/beam/heavylaser/lessheavy /obj/item/ammo_casing/macrobattery/healie name = "Macrobattery - RESTORE" icon_state = "macrobat_inverseouchie" + desc = "A large nanite fabricator for a Curabitur cannon. Powered by a mix of precursor and modern tech, \ + this fancy device recharges without an outside power source. This one alleviates burn and brute trauma. \ + Takes approximately three seconds to charge one shot." // CHOMPedit: Clearer applied effects bat_colour = "#ff9966" projectile_type = /obj/item/projectile/beam/medical_cell/phys_heal @@ -103,7 +119,7 @@ target.adjustBruteLoss(-20) target.adjustFireLoss(-20) else - return 1 + return 1 /obj/item/projectile/beam/medical_cell/detox/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) diff --git a/code/modules/reagents/reagents/vore_ch.dm b/code/modules/reagents/reagents/vore_ch.dm index f4e9b1b661..1532fad17e 100644 --- a/code/modules/reagents/reagents/vore_ch.dm +++ b/code/modules/reagents/reagents/vore_ch.dm @@ -40,3 +40,45 @@ //absorption reagent production if(B.reagent_mode_flags & DM_FLAG_REAGENTSABSORB && B.reagents.total_volume < B.reagents.maximum_volume) B.GenerateBellyReagents_absorbed() + +/datum/reagent/radium/concentrated + name = "Concentrated Radium" + id = "concentrated_radium" + description = "Concentrated Radium is a more potent variant of regular radium, able to pierce and irradiate a subject through their skin." + taste_mult = 0 //Apparently radium is tasteless + reagent_state = SOLID + color = "#C7C7C7" + +/datum/reagent/radium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(issmall(M)) removed *= 2 + M.apply_effect(10 * removed, IRRADIATE, 0) // Radium may increase your chances to cure a disease + if(M.virus2.len) + for(var/ID in M.virus2) + var/datum/disease2/disease/V = M.virus2[ID] + if(prob(5)) + M.antibodies |= V.antigen + if(prob(50)) + M.apply_effect(50, IRRADIATE, check_protection = 0) // curing it that way may kill you instead + var/absorbed = 0 + var/obj/item/organ/internal/diona/nutrients/rad_organ = locate() in M.internal_organs + if(rad_organ && !rad_organ.is_broken()) + absorbed = 1 + if(!absorbed) + M.adjustToxLoss(100) + +/datum/reagent/radium/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) + if(issmall(M)) removed *= 2 + M.apply_effect(10 * removed, IRRADIATE, 0) // Radium may increase your chances to cure a disease + if(M.virus2.len) + for(var/ID in M.virus2) + var/datum/disease2/disease/V = M.virus2[ID] + if(prob(5)) + M.antibodies |= V.antigen + if(prob(50)) + M.apply_effect(50, IRRADIATE, check_protection = 0) // curing it that way may kill you instead + var/absorbed = 0 + var/obj/item/organ/internal/diona/nutrients/rad_organ = locate() in M.internal_organs + if(rad_organ && !rad_organ.is_broken()) + absorbed = 1 + if(!absorbed) + M.adjustToxLoss(100) \ No newline at end of file diff --git a/code/modules/vore/eating/belly_obj_ch.dm b/code/modules/vore/eating/belly_obj_ch.dm index a71ca34bb7..f7f08eed06 100644 --- a/code/modules/vore/eating/belly_obj_ch.dm +++ b/code/modules/vore/eating/belly_obj_ch.dm @@ -90,7 +90,9 @@ "Digestive acid", "Diluted digestive acid", "Lube", - "Biomass" + "Biomass", + "Concentrated Radium", + "Tricordrazine" ) //CHOMP - vore sprites @@ -340,6 +342,21 @@ gen_cost = 10 reagentid = "biomass" reagentcolor = "#DF9FBF" + if("Concentrated Radium") + generated_reagents = list("concentrated_radium" = 1) + reagent_name = "concentrated radium" + gen_amount = 1 + gen_cost = 1 + reagentid = "concentrated_radium" + reagentcolor = "#C7C7C7" + if("Tricordrazine") + generated_reagents = list("tricordrazine" = 1) + reagent_name = "tricordrazine" + gen_amount = 1 + gen_cost = 10 + reagentid = "tricordrazine" + reagentcolor = "#8040FF" + /////////////////////// FULLNESS MESSAGES //////////////////////