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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-08-17 17:45:16 -04:00
committed by GitHub
parent f47a993e01
commit f0b51aba36
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,6 @@
build_path = /obj/item/weapon/reagent_containers/hypospray/science
sort_string = "KCAVB"
<<<<<<< HEAD
=======
/datum/design/item/medical/recombobray
name = "recombobulation ray"
desc = "The Type Gamma Medical Recombobulation ray! A mysterious looking ray gun! It works to change people who have had their form significantly altered back into their original forms!"
@@ -40,7 +38,6 @@
materials = list(MAT_STEEL = 1000, MAT_GLASS = 2000, MAT_URANIUM = 500, MAT_PHORON = 1500)
build_path = /obj/item/weapon/gun/energy/mouseray/medical
sort_string = "KCAVC"
>>>>>>> 82ba29d72d... Merge pull request #13524 from Cameron653/SCIENCE-REVERSION-RAY
// ML-3M medigun and cells
// CH edit - turns ML3M to NERD, removes some overtuned cells.