diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm index 2a9422be7a4..fd6dd45a67c 100644 --- a/code/modules/mob/living/carbon/human/species_types/android.dm +++ b/code/modules/mob/living/carbon/human/species_types/android.dm @@ -17,9 +17,13 @@ for(var/X in C.bodyparts) var/obj/item/bodypart/O = X O.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE) + O.brute_reduction = 5 + O.burn_reduction = 4 /datum/species/android/on_species_loss(mob/living/carbon/C) . = ..() for(var/X in C.bodyparts) var/obj/item/bodypart/O = X O.change_bodypart_status(BODYPART_ORGANIC,FALSE, TRUE) + O.brute_reduction = initial(O.brute_reduction) + O.burn_reduction = initial(O.burn_reduction) diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index ac4a0773f81..05c4fe8656a 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -183,10 +183,10 @@ var/obj/item/stock_parts/cell/the_cell = I if(!istype(the_cell)) //how... return - if(the_cell.charge < 3000) + if(the_cell.charge < 300) to_chat(L,"[GLOB.deity] does not accept pity amounts of power.") return - adjust_favor(round(the_cell.charge/3000), L) + adjust_favor(round(the_cell.charge/300), L) to_chat(L, "You offer [the_cell]'s power to [GLOB.deity], pleasing them.") qdel(I) return TRUE diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index c03bcae7bfc..70c268269a0 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -63,12 +63,12 @@ /datum/religion_rites/synthconversion name = "Synthetic Conversion" desc = "Convert a human-esque individual into a (superior) Android." - ritual_length = 1 MINUTES + ritual_length = 30 SECONDS ritual_invocations = list("By the inner workings of our god...", "... We call upon you, in the face of adversity...", "... to complete us, removing that which is undesirable...") invoke_msg = "... Arise, our champion! Become that which your soul craves, live in the world as your true form!!" - favor_cost = 500 + favor_cost = 1000 /datum/religion_rites/synthconversion/perform_rite(mob/living/user, atom/religious_tool) if(!ismovable(religious_tool))