[MIRROR] August 2024 various fixes (#8766)

Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2025-12-11 10:43:20 +00:00 · 2024-08-13 17:15:42 -07:00
parent f859c5e25f
commit 24658f4b9d
32 changed files with 703 additions and 116 deletions
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
@@ -15,7 +15,7 @@

 	caliber = "nsfw"

-	origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNETS = 4)
+	origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4)

 	fire_sound = 'sound/weapons/Taser.ogg'

@@ -66,8 +66,8 @@
 	chambered = new_batt
 	update_charge()
 	update_icon()
-	var/mob/living/M = loc // TGMC Ammo HUD 
-	if(istype(M)) // TGMC Ammo HUD 
+	var/mob/living/M = loc // TGMC Ammo HUD
+	if(istype(M)) // TGMC Ammo HUD
 		M?.hud_used.update_ammo_hud(M, src)

 /obj/item/weapon/gun/projectile/cell_loaded/attack_self(mob/user)
@@ -144,7 +144,7 @@
 	desc = "A microbattery holder for a cell-based variable weapon."
 	icon = 'icons/obj/ammo_vr.dmi'
 	icon_state = "cell_mag"
-	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_MAGNETS = 3)
+	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_MAGNET = 3)
 	caliber = "nsfw"
 	ammo_type = /obj/item/ammo_casing/microbattery
 	initial_ammo = 0
@@ -285,7 +285,7 @@
 	new /obj/item/ammo_casing/microbattery/medical/stabilize2(src)
 	new /obj/item/ammo_casing/microbattery/medical/haste(src)
 	new /obj/item/ammo_casing/microbattery/medical/resist(src)
-	
+
 // TGMC Ammo HUD: Custom handling for cell-loaded weaponry.
 /*
 /obj/item/weapon/gun/projectile/cell_loaded/get_ammo_type()
@@ -300,7 +300,7 @@
 		return 0 // We're not chambered, so we have 0 rounds loaded.

 	var/obj/item/ammo_casing/microbattery/batt = chambered
-	
+
 	var/shots
 	if(ammo_magazine) // Check how much ammo we have
 		for(var/obj/item/ammo_casing/microbattery/bullet as anything in ammo_magazine.stored_ammo)
@@ -311,4 +311,4 @@
 		else // We're out of shots.
 			return 0
 	else // Else, we're unloaded/don't have a magazine.
-		return 0
+		return 0
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
@@ -0,0 +1,356 @@
+// The Casing //
+/obj/item/ammo_casing/microbattery/medical
+	name = "\'ML-3/M\' nanite cell - UNKNOWN"
+	desc = "A miniature nanite fabricator for a medigun."
+	catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med)
+	icon_state = "ml3m_batt"
+	origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2)
+
+/obj/item/projectile/beam/medical_cell
+	name = "\improper healing beam"
+	icon_state = "medbeam"
+	nodamage = 1
+	damage = 0
+	check_armour = "laser"
+	light_color = "#80F5FF"
+	hud_state = "laser_disabler"
+
+	combustion = FALSE
+
+	can_miss = FALSE
+
+	muzzle_type = /obj/effect/projectile/muzzle/medigun
+	tracer_type = /obj/effect/projectile/tracer/medigun
+	impact_type = /obj/effect/projectile/impact/medigun
+
+/obj/item/projectile/beam/medical_cell/on_hit(var/mob/living/carbon/human/target) //what does it do when it hits someone?
+	return
+
+/obj/item/ammo_casing/microbattery/medical/brute
+	name = "\'ML-3/M\' nanite cell - BRUTE"
+	type_color = "#BF0000"
+	type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/brute
+
+/obj/item/projectile/beam/medical_cell/brute/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-10)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/burn
+	name = "\'ML-3/M\' nanite cell - BURN"
+	type_color = "#FF8000"
+	type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/burn
+
+/obj/item/projectile/beam/medical_cell/burn/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustFireLoss(-10)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/stabilize
+	name = "\'ML-3/M\' nanite cell - STABILIZE" //Disinfects all open wounds, cures oxy damage
+	type_color = "#0080FF"
+	type_name = "<span style='color:#0080FF;font-weight:bold;'>STABILIZE</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/stabilize
+
+/obj/item/projectile/beam/medical_cell/stabilize/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		target.adjustOxyLoss(-30)
+		for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
+			var/obj/item/organ/external/O = target.organs_by_name[name]
+			for (var/datum/wound/W in O.wounds)
+				if (W.internal)
+					continue
+				W.disinfect()
+		target.add_modifier(/datum/modifier/stabilize, 20 SECONDS)
+	else
+		return 1
+
+/datum/modifier/stabilize
+	name = "stabilize"
+	desc = "Your injuries are stabilized and your pain abates!"
+	mob_overlay_state = "cyan_sparkles"
+	stacks = MODIFIER_STACK_EXTEND
+	pain_immunity = TRUE
+	bleeding_rate_percent = 0.1 //only a little
+	incoming_oxy_damage_percent = 0
+
+/obj/item/ammo_casing/microbattery/medical/toxin
+	name = "\'ML-3/M\' nanite cell - TOXIN"
+	type_color = "#00A000"
+	type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/toxin
+
+/obj/item/projectile/beam/medical_cell/toxin/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustToxLoss(-10)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/omni
+	name = "\'ML-3/M\' nanite cell - OMNI"
+	type_color = "#8040FF"
+	type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/omni
+
+/obj/item/projectile/beam/medical_cell/omni/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-5)
+			target.adjustFireLoss(-5)
+			target.adjustToxLoss(-5)
+			target.adjustOxyLoss(-20)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/antirad
+	name = "\'ML-3/M\' nanite cell - ANTIRAD"
+	type_color = "#008000"
+	type_name = "<span style='color:#008000;font-weight:bold;'>ANTIRAD</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/antirad
+
+/obj/item/projectile/beam/medical_cell/antirad/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustToxLoss(-5)
+			target.radiation = max(target.radiation - 350, 0) //same as 5 units of arithrazine, sans the brute damage
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/brute2
+	name = "\'ML-3/M\' nanite cell - BRUTE-II"
+	type_color = "#BF0000"
+	type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE-II</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/brute2
+
+/obj/item/projectile/beam/medical_cell/brute2/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-20)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/burn2
+	name = "\'ML-3/M\' nanite cell - BURN-II"
+	type_color = "#FF8000"
+	type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN-II</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/burn2
+
+/obj/item/projectile/beam/medical_cell/burn2/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustFireLoss(-20)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/stabilize2
+	name = "\'ML-3/M\' nanite cell - STABILIZE-II" //Disinfects and bandages all open wounds, cures all oxy damage
+	type_color = "#0080FF"
+	type_name = "<span style='color:#0080FF;font-weight:bold;'>STABILIZE-II</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/stabilize2
+
+/obj/item/projectile/beam/medical_cell/stabilize2/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		target.adjustOxyLoss(-200)
+		for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
+			var/obj/item/organ/external/O = target.organs_by_name[name]
+			for (var/datum/wound/W in O.wounds)
+				if(W.internal)
+					continue
+				if(O.is_bandaged() == FALSE)
+					W.bandage()
+				if(O.is_salved() == FALSE)
+					W.salve()
+				W.disinfect()
+		target.add_modifier(/datum/modifier/stabilize, 20 SECONDS)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/omni2
+	name = "\'ML-3/M\' nanite cell - OMNI-II"
+	type_color = "#8040FF"
+	type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI-II</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/omni2
+
+/obj/item/projectile/beam/medical_cell/omni2/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-10)
+			target.adjustFireLoss(-10)
+			target.adjustToxLoss(-10)
+			target.adjustOxyLoss(-60)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/toxin2
+	name = "\'ML-3/M\' nanite cell - TOXIN-II"
+	type_color = "#00A000"
+	type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN-II</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/toxin2
+
+/obj/item/projectile/beam/medical_cell/toxin2/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustToxLoss(-20)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/haste
+	name = "\'ML-3/M\' nanite cell - HASTE"
+	type_color = "#FF3300"
+	type_name = "<span style='color:#FF3300;font-weight:bold;'>HASTE</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/haste
+
+/obj/item/projectile/beam/medical_cell/haste/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		target.add_modifier(/datum/modifier/ml3mhaste, 20 SECONDS)
+	else
+		return 1
+
+/datum/modifier/ml3mhaste
+	name = "haste"
+	desc = "You can move much faster!"
+	mob_overlay_state = "haste"
+	stacks = MODIFIER_STACK_EXTEND
+	slowdown = -0.5 //a little faster!
+	evasion = 1.15 //and a little harder to hit!
+
+/obj/item/ammo_casing/microbattery/medical/resist
+	name = "\'ML-3/M\' nanite cell - RESIST"
+	type_color = "#555555"
+	type_name = "<span style='color:#555555;font-weight:bold;'>RESIST</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/resist
+
+/obj/item/projectile/beam/medical_cell/resist/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		target.add_modifier(/datum/modifier/resistance, 20 SECONDS)
+	else
+		return 1
+
+/datum/modifier/resistance
+	name = "resistance"
+	desc = "You resist 15% of all incoming damage and stuns!"
+	mob_overlay_state = "repel_missiles"
+	stacks = MODIFIER_STACK_EXTEND
+	disable_duration_percent = 0.85
+	incoming_damage_percent = 0.85
+
+/obj/item/ammo_casing/microbattery/medical/corpse_mend
+	name = "\'ML-3/M\' nanite cell - CORPSE MEND"
+	type_color = "#669900"
+	type_name = "<span style='color:#669900;font-weight:bold;'>CORPSE MEND</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/corpse_mend
+
+/obj/item/projectile/beam/medical_cell/corpse_mend/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat == DEAD)
+			target.adjustBruteLoss(-50)
+			target.adjustFireLoss(-50)
+			target.adjustToxLoss(-50)
+			target.adjustOxyLoss(-200)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/brute3
+	name = "\'ML-3/M\' nanite cell - BRUTE-III"
+	type_color = "#BF0000"
+	type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE-III</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/brute3
+
+/obj/item/projectile/beam/medical_cell/brute3/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-40)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/burn3
+	name = "\'ML-3/M\' nanite cell - BURN-III"
+	type_color = "#FF8000"
+	type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN-III</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/burn3
+
+/obj/item/projectile/beam/medical_cell/burn3/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustFireLoss(-40)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/toxin3
+	name = "\'ML-3/M\' nanite cell - TOXIN-III"
+	type_color = "#00A000"
+	type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN-III</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/toxin3
+
+/obj/item/projectile/beam/medical_cell/toxin3/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustToxLoss(-40)
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/omni3
+	name = "\'ML-3/M\' nanite cell - OMNI-III"
+	type_color = "#8040FF"
+	type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI-III</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/omni3
+
+/obj/item/projectile/beam/medical_cell/omni3/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-20)
+			target.adjustFireLoss(-20)
+			target.adjustToxLoss(-20)
+			target.adjustOxyLoss(-120)
+	else
+		return 1
+
+// Illegal cells!
+/obj/item/ammo_casing/microbattery/medical/shrink
+	name = "\'ML-3/M\' nanite cell - SHRINK"
+	type_color = "#910ffc"
+	type_name = "<span style='color:#910ffc;font-weight:bold;'>SHRINK</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/shrink
+
+/obj/item/projectile/beam/medical_cell/shrink/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		target.resize(0.5)
+		target.show_message(span_blue("The beam fires into your body, changing your size!"))
+		target.update_icon()
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/grow
+	name = "\'ML-3/M\' nanite cell - GROW"
+	type_color = "#fc0fdc"
+	type_name = "<span style='color:#fc0fdc;font-weight:bold;'>GROW</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/grow
+
+/obj/item/projectile/beam/medical_cell/grow/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		target.resize(2.0)
+		target.show_message(span_blue("The beam fires into your body, changing your size!"))
+		target.update_icon()
+	else
+		return 1
+
+/obj/item/ammo_casing/microbattery/medical/normalsize
+	name = "\'ML-3/M\' nanite cell - NORMALSIZE"
+	type_color = "#C70FEC"
+	type_name = "<span style='color:#C70FEC;font-weight:bold;'>NORMALSIZE</span>"
+	projectile_type = /obj/item/projectile/beam/medical_cell/normalsize
+
+/obj/item/projectile/beam/medical_cell/normalsize/on_hit(var/mob/living/carbon/human/target)
+	if(istype(target, /mob/living/carbon/human))
+		target.resize(1)
+		target.show_message(span_blue("The beam fires into your body, changing your size!"))
+		target.update_icon()
+	else
+		return 1
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd_cells.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd_cells.dm
@@ -4,7 +4,7 @@
 	desc = "A miniature nanite fabricator for a medigun."
 	catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med)
 	icon_state = "nerd_batt" // CH edit - Changes ML3M to NERD
-	origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 1, TECH_MAGNETS = 2)
+	origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2)

 /obj/item/projectile/beam/medical_cell
 	name = "\improper healing beam"
@@ -357,4 +357,4 @@
 		target.show_message(span_blue("The beam fires into your body, changing your size!"))
 		target.update_icon()
 	else
-		return 1
+		return 1
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm
@@ -19,7 +19,7 @@
 	description_antag = ""
 	allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/combat/prototype)

-	origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4, TECH_MAGNETS = 3)
+	origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4, TECH_MAGNET = 3)


 // The Magazine //
@@ -39,7 +39,7 @@
 	max_ammo = 2
 	x_offset = 6
 	catalogue_data = null
-	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_MAGNETS = 2)
+	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_MAGNET = 2)


 // The Pack //
@@ -76,4 +76,4 @@
 	new /obj/item/ammo_casing/microbattery/combat/stun(src)
 	new /obj/item/ammo_casing/microbattery/combat/stun(src)
 	new /obj/item/ammo_casing/microbattery/combat/net(src)
-	new /obj/item/ammo_casing/microbattery/combat/ion(src)
+	new /obj/item/ammo_casing/microbattery/combat/ion(src)
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm
@@ -3,7 +3,7 @@
 	name = "\'NSCW\' microbattery - UNKNOWN"
 	desc = "A miniature battery for an energy weapon."
 	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
-	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 1, TECH_MAGNETS = 2)
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2)

 /obj/item/ammo_casing/microbattery/combat/lethal
 	name = "\'NSCW\' microbattery - LETHAL"
@@ -112,4 +112,4 @@
 			SStranscore.m_backup(L.mind,nif,one_time = TRUE)
 		L.gib()

-	..()
+	..()