cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take two

Browse Source
This commit is contained in:
LunarFleet
2020-08-13 09:54:11 -04:00
parent e0afe3e113
commit 5e22710209
6 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
View File

@@ -1,7 +1,7 @@
// The Gun // // The Gun //
/obj/item/weapon/gun/projectile/cell_loaded //this one can load both medical and security cells! for ERT/admin use. /obj/item/weapon/gun/projectile/cell_loaded //this one can load both medical and security cells! for ERT/admin use.
name = "multipurpose cell-loaded revolver" name = "multipurpose cell-loaded revolver" // CH edit - Changes ML-3 to NERD
desc = "Variety is the spice of life! This weapon is a hybrid of the HI-102b 'Nanotech Selectable-Cell Weapon' and the Vey-Med ML-3 'Medigun'. \ desc = "Variety is the spice of life! This weapon is a hybrid of the HI-102b 'Nanotech Selectable-Cell Weapon' and the Vey-Med NERD 'Medigun'. \
It can fire both harmful and healing cells with an internal nanite fabricator and energy weapon cell loader. Up to three combinations of \ It can fire both harmful and healing cells with an internal nanite fabricator and energy weapon cell loader. Up to three combinations of \
energy beams can be configured at once. Ammo not included." energy beams can be configured at once. Ammo not included."
catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus, catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus,

4
code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm
View File

@@ -5,9 +5,9 @@
desc = "A cannon developed by Curabitur Scimed, this weapon incorporates both Vey-Med and precursor technology to create a medical alternative to chemicals on the field." desc = "A cannon developed by Curabitur Scimed, this weapon incorporates both Vey-Med and precursor technology to create a medical alternative to chemicals on the field."
icon = 'icons/vore/custom_guns_vr.dmi' icon = 'icons/vore/custom_guns_vr.dmi'
icon_state = "healcannon" icon_state = "healcannon"
// 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. \ 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 ML-3 'Medigun' microbattery technology, combining the effects of multiple 'microbatteries' into single 'macrobatteries' that are built around precursor void cores, \ 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, \ 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." which lead to the Healcannon becoming a very bulky tool. Fortunately, it's not as heavy as it looks."

34
code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm → code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm
View File

@@ -1,54 +1,54 @@
// The Gun // // The Gun //
/obj/item/weapon/gun/projectile/cell_loaded/medical /obj/item/weapon/gun/projectile/cell_loaded/medical
name = "cell-loaded medigun" name = "cell-loaded medigun"
desc = "The ML-3 'Medigun', or ML3 for short, is a powerful cell-based ranged healing device based on the HI-102b NSCW. \ desc = "The Nanite Emergency Response Device 'medigun', or NERD for short, is a powerful cell-based ranged healing device based on the HI-102b NSCW. \
It uses an internal nanite fabricator, powered and controlled by discrete cells, to deliver a variety of effects at range. Up to six combinations of \ It uses an internal nanite fabricator, powered and controlled by discrete cells, to deliver a variety of effects at range. Up to six combinations of \
healing beams can be configured at once, depending on cartridge used. Ammo not included." healing beams can be configured at once, depending on cartridge used. Ammo not included."
catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med) catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med)
icon_state = "ml3m" icon_state = "nerd"
description_info = "This is a ranged healing device that uses interchangable nanite discharge cells in a magazine. Each cell is a different healing beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type." description_info = "This is a ranged healing device that uses interchangable nanite discharge cells in a magazine. Each cell is a different healing beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
description_fluff = "The Vey-Med ML-3 'Medigun' allows one to customize their loadout in the field, or before deploying, to allow emergency response personnel to deliver a variety of ranged healing options." description_fluff = "The Vey-Med NERD 'Medigun' allows one to customize their loadout in the field, or before deploying, to allow emergency response personnel to deliver a variety of ranged healing options."
description_antag = "" description_antag = ""
origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 2, TECH_BIO = 5) origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 2, TECH_BIO = 5)
allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/medical) allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/medical)
/obj/item/weapon/gun/projectile/cell_loaded/medical/cmo /obj/item/weapon/gun/projectile/cell_loaded/medical/cmo
name = "advanced cell-loaded medigun" name = "advanced cell-loaded medigun"
desc = "This is a variation on the ML-3 'Medigun', a powerful cell-based ranged healing device based on the HI-102b NSCW. \ desc = "This is a variation on the NERD 'Medigun', a powerful cell-based ranged healing device based on the HI-102b NSCW. \
It has an extended sight for increased accuracy, and much more comfortable grip. Ammo not included." It has an extended sight for increased accuracy, and much more comfortable grip. Ammo not included."
icon_state = "ml3m_cmo" icon_state = "nerd_cmo"
// The Magazine // // The Magazine // // CH edit - Changes ML3M to NERD
/obj/item/ammo_magazine/cell_mag/medical //medical /obj/item/ammo_magazine/cell_mag/medical //medical
name = "nanite magazine" name = "nanite magazine"
desc = "A nanite fabrication magazine for the \'ML-3\'" desc = "A nanite fabrication magazine for the \'NERD\'"
catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med) catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med)
description_info = "This magazine holds self-charging nanite fabricators to power the ML-3 'Medigun'. Up to three can be loaded at once, and each provides four shots of their respective healing type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger." description_info = "This magazine holds self-charging nanite fabricators to power the NERD 'Medigun'. Up to three can be loaded at once, and each provides four shots of their respective healing type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger."
ammo_type = /obj/item/ammo_casing/microbattery/medical ammo_type = /obj/item/ammo_casing/microbattery/medical
icon_state = "ml3m_mag" icon_state = "nerd_mag"
origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3) origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3)
/obj/item/ammo_magazine/cell_mag/medical/advanced /obj/item/ammo_magazine/cell_mag/medical/advanced
name = "advanced nanite magazine" name = "advanced nanite magazine"
desc = "A nanite discharge cell for the \'ML-3\'. This one is a more advanced version which can hold six individual nanite discharge cells." desc = "A nanite discharge cell for the \'NERD\'. This one is a more advanced version which can hold six individual nanite discharge cells."
max_ammo = 6 max_ammo = 6
x_offset = 3 x_offset = 3
icon_state = "ml3m_mag_extended" icon_state = "nerd_mag_extended"
origin_tech = list(TECH_MATERIAL = 5, TECH_BIO = 5) origin_tech = list(TECH_MATERIAL = 5, TECH_BIO = 5)
// The Pack // // The Pack //
/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med /obj/item/weapon/storage/secure/briefcase/nerd_pack_med
name = "\improper ML-3 \'Medigun\' kit" name = "\improper NERD \'Medigun\' kit"
desc = "A storage case for a multi-purpose healing gun. Variety hour!" desc = "A storage case for a multi-purpose healing gun. Variety hour!"
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
max_w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL
/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med/New() /obj/item/weapon/storage/secure/briefcase/nerd_pack_med/New()
..() ..()
new /obj/item/weapon/gun/projectile/cell_loaded/medical(src) new /obj/item/weapon/gun/projectile/cell_loaded/medical(src)
new /obj/item/ammo_magazine/cell_mag/medical(src) new /obj/item/ammo_magazine/cell_mag/medical(src)
@@ -56,13 +56,13 @@
new /obj/item/ammo_casing/microbattery/medical/burn(src) new /obj/item/ammo_casing/microbattery/medical/burn(src)
new /obj/item/ammo_casing/microbattery/medical/stabilize(src) new /obj/item/ammo_casing/microbattery/medical/stabilize(src)
/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo /obj/item/weapon/storage/secure/briefcase/nerd_pack_cmo
name = "\improper Advanced ML-3 \'Medigun\' kit" name = "\improper Advanced NERD \'Medigun\' kit"
desc = "A storage case for a multi-purpose healing gun. Variety hour!" desc = "A storage case for a multi-purpose healing gun. Variety hour!"
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
max_w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL
/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo/New() /obj/item/weapon/storage/secure/briefcase/nerd_pack_cmo/New()
..() ..()
new /obj/item/weapon/gun/projectile/cell_loaded/medical/cmo(src) new /obj/item/weapon/gun/projectile/cell_loaded/medical/cmo(src)
new /obj/item/ammo_magazine/cell_mag/medical(src) new /obj/item/ammo_magazine/cell_mag/medical(src)

50
code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm → code/modules/projectiles/guns/energy/cell_loaded_vr/nerd_cells.dm
View File

@@ -1,9 +1,9 @@
// The Casing // // The Casing //
/obj/item/ammo_casing/microbattery/medical /obj/item/ammo_casing/microbattery/medical
name = "\'ML-3\' nanite cell - UNKNOWN" name = "\'NERD\' nanite cell - UNKNOWN"
desc = "A miniature nanite fabricator for a medigun." desc = "A miniature nanite fabricator for a medigun."
catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med) catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med)
icon_state = "ml3m_batt" 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_MAGNETS = 2)
/obj/item/projectile/beam/medical_cell /obj/item/projectile/beam/medical_cell
@@ -24,7 +24,7 @@
return return
/obj/item/ammo_casing/microbattery/medical/brute /obj/item/ammo_casing/microbattery/medical/brute
name = "\'ML-3\' nanite cell - BRUTE" name = "\'NERD\' nanite cell - BRUTE"
type_color = "#BF0000" type_color = "#BF0000"
type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE</span>" type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/brute projectile_type = /obj/item/projectile/beam/medical_cell/brute
@@ -36,7 +36,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/burn /obj/item/ammo_casing/microbattery/medical/burn
name = "\'ML-3\' nanite cell - BURN" name = "\'NERD\' nanite cell - BURN"
type_color = "#FF8000" type_color = "#FF8000"
type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN</span>" type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/burn projectile_type = /obj/item/projectile/beam/medical_cell/burn
@@ -48,7 +48,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/stabilize /obj/item/ammo_casing/microbattery/medical/stabilize
name = "\'ML-3\' nanite cell - STABILIZE" //Disinfects all open wounds, cures oxy damage name = "\'NERD\' nanite cell - STABILIZE" //Disinfects all open wounds, cures oxy damage
type_color = "#0080FF" type_color = "#0080FF"
type_name = "<span style='color:#0080FF;font-weight:bold;'>STABILIZE</span>" type_name = "<span style='color:#0080FF;font-weight:bold;'>STABILIZE</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/stabilize projectile_type = /obj/item/projectile/beam/medical_cell/stabilize
@@ -76,7 +76,7 @@
incoming_oxy_damage_percent = 0 incoming_oxy_damage_percent = 0
/obj/item/ammo_casing/microbattery/medical/toxin /obj/item/ammo_casing/microbattery/medical/toxin
name = "\'ML-3\' nanite cell - TOXIN" name = "\'NERD\' nanite cell - TOXIN"
type_color = "#00A000" type_color = "#00A000"
type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN</span>" type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin projectile_type = /obj/item/projectile/beam/medical_cell/toxin
@@ -88,7 +88,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/omni /obj/item/ammo_casing/microbattery/medical/omni
name = "\'ML-3\' nanite cell - OMNI" name = "\'NERD\' nanite cell - OMNI"
type_color = "#8040FF" type_color = "#8040FF"
type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI</span>" type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/omni projectile_type = /obj/item/projectile/beam/medical_cell/omni
@@ -103,7 +103,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/antirad /obj/item/ammo_casing/microbattery/medical/antirad
name = "\'ML-3\' nanite cell - ANTIRAD" name = "\'NERD\' nanite cell - ANTIRAD"
type_color = "#008000" type_color = "#008000"
type_name = "<span style='color:#008000;font-weight:bold;'>ANTIRAD</span>" type_name = "<span style='color:#008000;font-weight:bold;'>ANTIRAD</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/antirad projectile_type = /obj/item/projectile/beam/medical_cell/antirad
@@ -116,7 +116,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/brute2 /obj/item/ammo_casing/microbattery/medical/brute2
name = "\'ML-3\' nanite cell - BRUTE-II" name = "\'NERD\' nanite cell - BRUTE-II"
type_color = "#BF0000" type_color = "#BF0000"
type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE-II</span>" type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE-II</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/brute2 projectile_type = /obj/item/projectile/beam/medical_cell/brute2
@@ -128,7 +128,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/burn2 /obj/item/ammo_casing/microbattery/medical/burn2
name = "\'ML-3\' nanite cell - BURN-II" name = "\'NERD\' nanite cell - BURN-II"
type_color = "#FF8000" type_color = "#FF8000"
type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN-II</span>" type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN-II</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/burn2 projectile_type = /obj/item/projectile/beam/medical_cell/burn2
@@ -140,7 +140,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/stabilize2 /obj/item/ammo_casing/microbattery/medical/stabilize2
name = "\'ML-3\' nanite cell - STABILIZE-II" //Disinfects and bandages all open wounds, cures all oxy damage name = "\'NERD\' nanite cell - STABILIZE-II" //Disinfects and bandages all open wounds, cures all oxy damage
type_color = "#0080FF" type_color = "#0080FF"
type_name = "<span style='color:#0080FF;font-weight:bold;'>STABILIZE-II</span>" type_name = "<span style='color:#0080FF;font-weight:bold;'>STABILIZE-II</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/stabilize2 projectile_type = /obj/item/projectile/beam/medical_cell/stabilize2
@@ -163,7 +163,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/omni2 /obj/item/ammo_casing/microbattery/medical/omni2
name = "\'ML-3\' nanite cell - OMNI-II" name = "\'NERD\' nanite cell - OMNI-II"
type_color = "#8040FF" type_color = "#8040FF"
type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI-II</span>" type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI-II</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/omni2 projectile_type = /obj/item/projectile/beam/medical_cell/omni2
@@ -178,7 +178,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/toxin2 /obj/item/ammo_casing/microbattery/medical/toxin2
name = "\'ML-3\' nanite cell - TOXIN-II" name = "\'NERD\' nanite cell - TOXIN-II"
type_color = "#00A000" type_color = "#00A000"
type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN-II</span>" type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN-II</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin2 projectile_type = /obj/item/projectile/beam/medical_cell/toxin2
@@ -190,18 +190,18 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/haste /obj/item/ammo_casing/microbattery/medical/haste
name = "\'ML-3\' nanite cell - HASTE" name = "\'NERD\' nanite cell - HASTE"
type_color = "#FF3300" type_color = "#FF3300"
type_name = "<span style='color:#FF3300;font-weight:bold;'>HASTE</span>" type_name = "<span style='color:#FF3300;font-weight:bold;'>HASTE</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/haste projectile_type = /obj/item/projectile/beam/medical_cell/haste
/obj/item/projectile/beam/medical_cell/haste/on_hit(var/mob/living/carbon/human/target) /obj/item/projectile/beam/medical_cell/haste/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human)) if(istype(target, /mob/living/carbon/human))
target.add_modifier(/datum/modifier/ml3mhaste, 20 SECONDS) target.add_modifier(/datum/modifier/nerdhaste, 20 SECONDS)
else else
return 1 return 1
/datum/modifier/ml3mhaste /datum/modifier/nerdhaste
name = "haste" name = "haste"
desc = "You can move much faster!" desc = "You can move much faster!"
mob_overlay_state = "haste" mob_overlay_state = "haste"
@@ -210,7 +210,7 @@
evasion = 1.15 //and a little harder to hit! evasion = 1.15 //and a little harder to hit!
/obj/item/ammo_casing/microbattery/medical/resist /obj/item/ammo_casing/microbattery/medical/resist
name = "\'ML-3\' nanite cell - RESIST" name = "\'NERD\' nanite cell - RESIST"
type_color = "#555555" type_color = "#555555"
type_name = "<span style='color:#555555;font-weight:bold;'>RESIST</span>" type_name = "<span style='color:#555555;font-weight:bold;'>RESIST</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/resist projectile_type = /obj/item/projectile/beam/medical_cell/resist
@@ -230,7 +230,7 @@
incoming_damage_percent = 0.85 incoming_damage_percent = 0.85
/obj/item/ammo_casing/microbattery/medical/corpse_mend /obj/item/ammo_casing/microbattery/medical/corpse_mend
name = "\'ML-3\' nanite cell - CORPSE MEND" name = "\'NERD\' nanite cell - CORPSE MEND"
type_color = "#669900" type_color = "#669900"
type_name = "<span style='color:#669900;font-weight:bold;'>CORPSE MEND</span>" type_name = "<span style='color:#669900;font-weight:bold;'>CORPSE MEND</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/corpse_mend projectile_type = /obj/item/projectile/beam/medical_cell/corpse_mend
@@ -246,7 +246,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/brute3 /obj/item/ammo_casing/microbattery/medical/brute3
name = "\'ML-3\' nanite cell - BRUTE-III" name = "\'NERD\' nanite cell - BRUTE-III"
type_color = "#BF0000" type_color = "#BF0000"
type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE-III</span>" type_name = "<span style='color:#BF0000;font-weight:bold;'>BRUTE-III</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/brute3 projectile_type = /obj/item/projectile/beam/medical_cell/brute3
@@ -258,7 +258,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/burn3 /obj/item/ammo_casing/microbattery/medical/burn3
name = "\'ML-3\' nanite cell - BURN-III" name = "\'NERD\' nanite cell - BURN-III"
type_color = "#FF8000" type_color = "#FF8000"
type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN-III</span>" type_name = "<span style='color:#FF8000;font-weight:bold;'>BURN-III</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/burn3 projectile_type = /obj/item/projectile/beam/medical_cell/burn3
@@ -270,7 +270,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/toxin3 /obj/item/ammo_casing/microbattery/medical/toxin3
name = "\'ML-3\' nanite cell - TOXIN-III" name = "\'NERD\' nanite cell - TOXIN-III"
type_color = "#00A000" type_color = "#00A000"
type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN-III</span>" type_name = "<span style='color:#00A000;font-weight:bold;'>TOXIN-III</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin3 projectile_type = /obj/item/projectile/beam/medical_cell/toxin3
@@ -282,7 +282,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/omni3 /obj/item/ammo_casing/microbattery/medical/omni3
name = "\'ML-3\' nanite cell - OMNI-III" name = "\'NERD\' nanite cell - OMNI-III"
type_color = "#8040FF" type_color = "#8040FF"
type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI-III</span>" type_name = "<span style='color:#8040FF;font-weight:bold;'>OMNI-III</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/omni3 projectile_type = /obj/item/projectile/beam/medical_cell/omni3
@@ -298,7 +298,7 @@
// Illegal cells! // Illegal cells!
/obj/item/ammo_casing/microbattery/medical/shrink /obj/item/ammo_casing/microbattery/medical/shrink
name = "\'ML-3\' nanite cell - SHRINK" name = "\'NERD\' nanite cell - SHRINK"
type_color = "#910ffc" type_color = "#910ffc"
type_name = "<span style='color:#910ffc;font-weight:bold;'>SHRINK</span>" type_name = "<span style='color:#910ffc;font-weight:bold;'>SHRINK</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/shrink projectile_type = /obj/item/projectile/beam/medical_cell/shrink
@@ -312,7 +312,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/grow /obj/item/ammo_casing/microbattery/medical/grow
name = "\'ML-3\' nanite cell - GROW" name = "\'NERD\' nanite cell - GROW"
type_color = "#fc0fdc" type_color = "#fc0fdc"
type_name = "<span style='color:#fc0fdc;font-weight:bold;'>GROW</span>" type_name = "<span style='color:#fc0fdc;font-weight:bold;'>GROW</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/grow projectile_type = /obj/item/projectile/beam/medical_cell/grow
@@ -326,7 +326,7 @@
return 1 return 1
/obj/item/ammo_casing/microbattery/medical/normalsize /obj/item/ammo_casing/microbattery/medical/normalsize
name = "\'ML-3\' nanite cell - NORMALSIZE" name = "\'NERD\' nanite cell - NORMALSIZE"
type_color = "#C70FEC" type_color = "#C70FEC"
type_name = "<span style='color:#C70FEC;font-weight:bold;'>NORMALSIZE</span>" type_name = "<span style='color:#C70FEC;font-weight:bold;'>NORMALSIZE</span>"
projectile_type = /obj/item/projectile/beam/medical_cell/normalsize projectile_type = /obj/item/projectile/beam/medical_cell/normalsize

4
code/modules/projectiles/guns/energy/special_vr.dm
View File

@@ -4,9 +4,9 @@
/obj/item/weapon/gun/energy/ionrifle/weak /obj/item/weapon/gun/energy/ionrifle/weak
projectile_type = /obj/item/projectile/ion/small projectile_type = /obj/item/projectile/ion/small
/obj/item/weapon/gun/energy/medigun //Adminspawn/ERT etc /obj/item/weapon/gun/energy/medigun //Adminspawn/ERT etc // CH edit - Changes ML3M to NERD
name = "directed restoration system" name = "directed restoration system"
desc = "The BL-3 'Phoenix' is an adaptation on the ML-3 'Medbeam' design that channels the power of the beam into a single healing laser. It is highly energy-inefficient, but its medical power cannot be denied." desc = "The BL-3 'Phoenix' is an adaptation on the NERD 'Medbeam' design that channels the power of the beam into a single healing laser. It is highly energy-inefficient, but its medical power cannot be denied."
force = 5 force = 5
icon_state = "medbeam" icon_state = "medbeam"
item_state = "medbeam" item_state = "medbeam"

21
code/modules/research/designs/medical_vr.dm
View File

@@ -32,7 +32,7 @@
// ML-3M medigun and cells // ML-3M medigun and cells
/* // CH edit - turns ML3M to NERD, removes some overtuned cells.
/datum/design/item/medical/cell_based/AssembleDesignName() /datum/design/item/medical/cell_based/AssembleDesignName()
..() ..()
name = "Cell-based medical prototype ([item_name])" name = "Cell-based medical prototype ([item_name])"
@@ -123,7 +123,7 @@
name = "BRUTE-II" name = "BRUTE-II"
id = "ml3m_cell_brute2" id = "ml3m_cell_brute2"
req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5) req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 1000) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 4000)
build_path = /obj/item/ammo_casing/microbattery/medical/brute2 build_path = /obj/item/ammo_casing/microbattery/medical/brute2
sort_string = "KVCCA" sort_string = "KVCCA"
@@ -131,7 +131,7 @@
name = "BURN-II" name = "BURN-II"
id = "ml3m_cell_burn2" id = "ml3m_cell_burn2"
req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5) req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 1000) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 4000)
build_path = /obj/item/ammo_casing/microbattery/medical/burn2 build_path = /obj/item/ammo_casing/microbattery/medical/burn2
sort_string = "KVCCB" sort_string = "KVCCB"
@@ -139,7 +139,7 @@
name = "STABILIZE-II" name = "STABILIZE-II"
id = "ml3m_cell_stabilize2" id = "ml3m_cell_stabilize2"
req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5) req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "silver" = 1000) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "silver" = 4000)
build_path = /obj/item/ammo_casing/microbattery/medical/stabilize2 build_path = /obj/item/ammo_casing/microbattery/medical/stabilize2
sort_string = "KVCCC" sort_string = "KVCCC"
@@ -147,7 +147,7 @@
name = "OMNI-II" name = "OMNI-II"
id = "ml3m_cell_omni2" id = "ml3m_cell_omni2"
req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5) req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 1000) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 4000)
build_path = /obj/item/ammo_casing/microbattery/medical/omni2 build_path = /obj/item/ammo_casing/microbattery/medical/omni2
sort_string = "KVCCD" sort_string = "KVCCD"
@@ -157,10 +157,10 @@
name = "TOXIN-II" name = "TOXIN-II"
id = "ml3m_cell_toxin2" id = "ml3m_cell_toxin2"
req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6) req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6)
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 1000, "silver" = 1000, "diamond" = 500) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 4000, "silver" = 4000, "diamond" = 2000)
build_path = /obj/item/ammo_casing/microbattery/medical/toxin2 build_path = /obj/item/ammo_casing/microbattery/medical/toxin2
sort_string = "KVCDA" sort_string = "KVCDA"
/*
/datum/design/item/ml3m_cell/haste /datum/design/item/ml3m_cell/haste
name = "HASTE" name = "HASTE"
id = "ml3m_cell_haste" id = "ml3m_cell_haste"
@@ -176,7 +176,7 @@
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 1000, "uranium" = 1000, "diamond" = 1000) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 1000, "uranium" = 1000, "diamond" = 1000)
build_path = /obj/item/ammo_casing/microbattery/medical/resist build_path = /obj/item/ammo_casing/microbattery/medical/resist
sort_string = "KVCDC" sort_string = "KVCDC"
*/
/datum/design/item/ml3m_cell/corpse_mend /datum/design/item/ml3m_cell/corpse_mend
name = "CORPSE MEND" name = "CORPSE MEND"
id = "ml3m_cell_corpse_mend" id = "ml3m_cell_corpse_mend"
@@ -186,7 +186,7 @@
sort_string = "KVCDD" sort_string = "KVCDD"
//Tier 4 //Tier 4
/*
/datum/design/item/ml3m_cell/brute3 /datum/design/item/ml3m_cell/brute3
name = "BRUTE-III" name = "BRUTE-III"
id = "ml3m_cell_brute3" id = "ml3m_cell_brute3"
@@ -244,5 +244,4 @@
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 2000) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 2000)
build_path = /obj/item/ammo_casing/microbattery/medical/normalsize build_path = /obj/item/ammo_casing/microbattery/medical/normalsize
sort_string = "KVCOC" sort_string = "KVCOC"
*/
Don't even think about it -DHA */