balance: nutrition pump implant nerf (ss220-space#3943)

SS13-Extended · Dec 22, 2023 · f785ab2 · f785ab2
1 parent a9486ee
commit f785ab2
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 30 deletions.
diff --git a/_maps/map_files/generic/CentComm.dmm b/_maps/map_files/generic/CentComm.dmm
@@ -29964,8 +29964,8 @@
 /obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened,
 /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
 /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 /obj/item/organ/internal/cyberimp/chest/reviver/hardened,
 /obj/item/organ/internal/cyberimp/chest/reviver/hardened,
 /obj/item/organ/internal/cyberimp/eyes/hud/medical,
@@ -40900,8 +40900,8 @@
 /obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened,
 /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
 /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 /obj/item/organ/internal/cyberimp/chest/reviver/hardened,
 /obj/item/organ/internal/cyberimp/chest/reviver/hardened,
 /obj/item/organ/internal/cyberimp/eyes/hud/medical,
@@ -41218,8 +41218,8 @@
 /obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened,
 /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
 /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 /obj/item/organ/internal/cyberimp/chest/reviver/hardened,
 /obj/item/organ/internal/cyberimp/chest/reviver/hardened,
 /obj/item/organ/internal/cyberimp/eyes/hud/medical,

diff --git a/_maps/map_files/generic/z2_old.dmm b/_maps/map_files/generic/z2_old.dmm
@@ -22065,8 +22065,8 @@
 /obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened,
 /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
 /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 /obj/item/organ/internal/cyberimp/chest/reviver/hardened,
 /obj/item/organ/internal/cyberimp/chest/reviver/hardened,
 /obj/item/organ/internal/cyberimp/eyes/hud/medical,

diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
@@ -352,7 +352,7 @@
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
 		/obj/item/organ/internal/cyberimp/eyes/xray,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/arm/combat/centcom
 	)
 
@@ -875,7 +875,7 @@
 	)
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/arm/flash,
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/eyes/hud/security
 	)
 	var/is_tsf_lieutenant = FALSE
@@ -905,7 +905,7 @@
 	)
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
 		/obj/item/organ/internal/cyberimp/arm/flash,
 		/obj/item/organ/internal/cyberimp/eyes/shield

diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm
@@ -41,7 +41,7 @@
 	)
 	box = /obj/item/storage/box/centcomofficer
 	cybernetic_implants = list(
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus
 	)
 
 /datum/outfit/job/ntnavyofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -110,7 +110,7 @@
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/eyes/xray,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/arm/combat/centcom
 	)
 

diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
@@ -95,7 +95,7 @@
 
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
-		/obj/item/organ/internal/cyberimp/chest/nutriment
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old
 	)
 
 	implants = list(
@@ -127,7 +127,7 @@
 		)
 
 	cybernetic_implants = list(
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
 		/obj/item/organ/internal/cyberimp/arm/flash
@@ -194,7 +194,7 @@
 
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/arm/flash,
-		/obj/item/organ/internal/cyberimp/chest/nutriment,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old,
 		/obj/item/organ/internal/cyberimp/eyes/hud/security
 	)
 
@@ -232,7 +232,7 @@
 	)
 
 	cybernetic_implants = list(
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
 		/obj/item/organ/internal/cyberimp/arm/telebaton,
@@ -310,7 +310,7 @@
 
 	cybernetic_implants = list(
 	/obj/item/organ/internal/cyberimp/eyes/shield,
-	/obj/item/organ/internal/cyberimp/chest/nutriment
+	/obj/item/organ/internal/cyberimp/chest/nutriment_old
 	)
 
 	implants = list(
@@ -344,7 +344,7 @@
 	)
 
 	cybernetic_implants = list(
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
 		/obj/item/organ/internal/cyberimp/eyes/shield,
@@ -433,7 +433,7 @@
 
 	cybernetic_implants = list(
 	/obj/item/organ/internal/cyberimp/arm/surgery,
-	/obj/item/organ/internal/cyberimp/chest/nutriment
+	/obj/item/organ/internal/cyberimp/chest/nutriment_old
 	)
 
 	implants = list(
@@ -473,7 +473,7 @@
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/arm/surgery/l,
 		/obj/item/organ/internal/cyberimp/arm/medibeam,
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/eyes/hud/medical,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened
 	)
@@ -545,7 +545,7 @@
 
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
-		/obj/item/organ/internal/cyberimp/chest/nutriment
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old
 	)
 
 	implants = list(
@@ -574,7 +574,7 @@
 	)
 
 	cybernetic_implants = list(
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened
 	)
@@ -640,7 +640,7 @@
 
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/arm/janitorial,
-		/obj/item/organ/internal/cyberimp/chest/nutriment
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old
 	)
 
 /datum/outfit/job/centcom/response_team/janitorial/gamma
@@ -667,7 +667,7 @@
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/arm/advmop,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus
+		/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus
 	)
 
 	implants = list(

diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
@@ -276,13 +276,46 @@
 	desc = "This implant will synthesize a small amount of nutriment and pumps it directly into your bloodstream when you are starving."
 	icon_state = "chest_implant"
 	implant_color = "#00AA00"
+	var/hunger_modificator = 0.7
+	var/poison_amount = 5
+	slot = "stomach"
+	origin_tech = "materials=2;powerstorage=2;biotech=2"
+
+/obj/item/organ/internal/cyberimp/chest/nutriment/insert(mob/living/carbon/M, special, dont_remove_slot)
+	M.hunger_drain *= hunger_modificator
+	. = ..()
+
+/obj/item/organ/internal/cyberimp/chest/nutriment/remove(mob/living/carbon/M, special)
+	M.hunger_drain /= hunger_modificator
+	. = ..()
+
+/obj/item/organ/internal/cyberimp/chest/nutriment/emp_act(severity)
+	if(!owner || emp_proof)
+		return
+	owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning
+	to_chat(owner, "<span class='warning'>You feel like your insides are burning.</span>")
+
+/obj/item/organ/internal/cyberimp/chest/nutriment/plus
+	name = "Nutriment pump implant PLUS"
+	desc = "This implant will synthesize a small amount of nutriment and pumps it directly into your bloodstream when you are hungry."
+	icon_state = "chest_implant"
+	implant_color = "#006607"
+	hunger_modificator = 0.5
+	poison_amount = 10
+	origin_tech = "materials=4;powerstorage=3;biotech=3"
+
+/obj/item/organ/internal/cyberimp/chest/nutriment_old
+	name = "Nutriment pump implant"
+	desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
+	icon_state = "chest_implant"
+	implant_color = "#00AA00"
 	var/hunger_threshold = NUTRITION_LEVEL_STARVING
 	var/synthesizing = 0
 	var/poison_amount = 5
 	slot = "stomach"
 	origin_tech = "materials=2;powerstorage=2;biotech=2"
 
-/obj/item/organ/internal/cyberimp/chest/nutriment/on_life()
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/on_life()
 	if(!owner)
 		return
 	if(synthesizing)
@@ -299,18 +332,18 @@
 		owner.adjust_nutrition(50)
 		addtimer(CALLBACK(src, PROC_REF(synth_cool)), 50)
 
-/obj/item/organ/internal/cyberimp/chest/nutriment/proc/synth_cool()
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/proc/synth_cool()
 	synthesizing = FALSE
 
-/obj/item/organ/internal/cyberimp/chest/nutriment/emp_act(severity)
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/emp_act(severity)
 	if(!owner || emp_proof)
 		return
 	owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning
 	to_chat(owner, "<span class='warning'>You feel like your insides are burning.</span>")
 
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus
+/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus
 	name = "Nutriment pump implant PLUS"
-	desc = "This implant will synthesize a small amount of nutriment and pumps it directly into your bloodstream when you are hungry."
+	desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are hungry."
 	icon_state = "chest_implant"
 	implant_color = "#006607"
 	hunger_threshold = NUTRITION_LEVEL_HUNGRY