Minor balance changes to Cancer

code/modules/organs/organ.dm

@@ -230,12 +230,12 @@
 	//List of reagents which will affect cancerous growth
 	//Phalanximine and Medical Nanobots are the only reagent which can reverse cancerous growth in high doses, the others can stall it, some can even accelerate it
 	//Every "unit" here corresponds to a tick of cancer growth, so for example 20 units of Phalanximine counters one unit of cancer growth
-	var/phalanximine = owner.reagents.get_reagent_amount("phalanximine") / 20 //Phalanximine only works in large doses, but can actually cure cancer past the threshold unlike all other reagents below
-	var/medbots = owner.reagents.get_reagent_amount("mednanobots") //Medical nanobots for a cancer-free future tomorrow. Try not to overdose them, powerful enough to not risk going above 5u
+	var/phalanximine = owner.reagents.get_reagent_amount("phalanximine") / 5 //Phalanximine only works in large doses, but can actually cure cancer past the threshold unlike all other reagents below
+	var/medbots = owner.reagents.get_reagent_amount("mednanobots") * 2 //Medical nanobots for a cancer-free future tomorrow. Try not to overdose them, powerful enough to not risk going above 5u
 	var/hardcores = owner.reagents.get_reagent_amount("bustanut") //Bustanuts contain the very essence of Bustatime, stalling even the most robust ailments with a small dose
 	var/ryetalyn = owner.reagents.get_reagent_amount("ryetalyn") //Ryetalin will very easily suppress the rogue DNA in cancer cells, but cannot actually cure it, you need to destroy the cells
 	var/holywater = owner.reagents.get_reagent_amount("holywater") / 10 //Holy water has very potent effects with stalling cancer
-	var/mutagen = owner.reagents.get_reagent_amount("mutagen") / 10 //Mutagen will cause disastrous cancer growth if there already is one. It's the virus food of tumors
+	var/mutagen = owner.reagents.get_reagent_amount("mutagen") / 5 //Mutagen will cause disastrous cancer growth if there already is one. It's the virus food of tumors
 
 	var/cancerous_growth = 1 //Every tick, cancer grows by one tick, without any external factors
 

code/modules/surgery/generic.dm

@@ -338,6 +338,7 @@
 	"<span class='warning'>Your hand slips, leaving a small burn on [target]'s [affected.display_name] with \the [tool]!</span>")
 	target.apply_damage(3, BURN, affected)
 
+/*
 ////////FIX LIMB CANCER////////
 
 /datum/surgery_step/generic/fix_limb_cancer
@@ -394,6 +395,7 @@
 	user.visible_message("<span class='warning'>[user]'s hand slips, getting mess in and tearing the inside of [target]'s [affected.display_name] with \the [tool]!</span>", \
 	"<span class='warning'>Your hand slips, getting mess in and tearing the inside of [target]'s [affected.display_name] with \the [tool]!</span>")
 	affected.createwound(CUT, 10)
+*/
 
 ////////CUT LIMB/////////
 /datum/surgery_step/generic/cut_limb

code/modules/surgery/organs_internal.dm

@@ -150,6 +150,7 @@
 		if(I && I.damage > 0)
 			I.take_damage(dam_amt,0)
 
+/*
 //////FIX ORGAN CANCER////
 /datum/surgery_step/internal/fix_organ_cancer
 	allowed_tools = list(
@@ -210,6 +211,7 @@
 	user.visible_message("<span class='warning'>[user]'s hand slips, getting mess on and tearing the inside of [target]'s [affected.display_name] with \the [tool]!</span>", \
 	"<span class='warning'>Your hand slips, getting mess on and tearing the inside of [target]'s [affected.display_name] with \the [tool]!</span>")
 	affected.createwound(CUT, 10)
+*/
 
 //////FIX ORGAN ROBOTIC/////
 /datum/surgery_step/internal/fix_organ_robotic //For artificial organs

code/setup.dm

@@ -1482,5 +1482,5 @@ var/proccalls = 1
 //Cancer defines for the scanners
 #define CANCER_STAGE_BENIGN 1 //Not 100 % medically correct, but we'll assume benign cancer never fails to worsen. No effect, but can be detected before it fucks you up. Instant
 #define CANCER_STAGE_SMALL_TUMOR 300 //Cancer starts to have small effects depending on what the affected limb is, generally inconclusive ones. 5 minutes
-#define CANCER_STAGE_LARGE_TUMOR 900 //Cancer starts to have serious effects depending on what the affected limb is, generally obvious one, up to visible tumor growth. 15 minutes
-#define CANCER_STAGE_METASTASIS 1800 //Cancer has maximal effects, growing out of control in the organ, and can start "colonizing" other organs very quickly, dooming the patient. 30 minutes
+#define CANCER_STAGE_LARGE_TUMOR 600 //Cancer starts to have serious effects depending on what the affected limb is, generally obvious one, up to visible tumor growth. 15 minutes
+#define CANCER_STAGE_METASTASIS 1200 //Cancer has maximal effects, growing out of control in the organ, and can start "colonizing" other organs very quickly, dooming the patient. 30 minutes

vgstation13.dme

@@ -1054,7 +1054,6 @@
 #include "code\modules\events\carp_migration.dm"
 #include "code\modules\events\comms_blackout.dm"
 #include "code\modules\events\communications_blackout.dm"
-#include "code\modules\events\mob_swarm.dm"
 #include "code\modules\events\disease_outbreak.dm"
 #include "code\modules\events\electrical_storm.dm"
 #include "code\modules\events\event.dm"
@@ -1069,6 +1068,7 @@
 #include "code\modules\events\link_with_centcomm.dm"
 #include "code\modules\events\masshallucination.dm"
 #include "code\modules\events\meteors.dm"
+#include "code\modules\events\mob_swarm.dm"
 #include "code\modules\events\money_hacker.dm"
 #include "code\modules\events\money_lotto.dm"
 #include "code\modules\events\money_spam.dm"