From b93f5a2fa48d62eed2518efbd042cfb4f0a91a7f Mon Sep 17 00:00:00 2001 From: DHA Date: Fri, 27 Dec 2019 08:48:37 -0800 Subject: [PATCH] ML3M and NFSW gun research removal Removed from science research, but they are still in the code. This is to remove them from play. Reasons for removal are too complicated to state here. --- code/modules/research/designs/medical_vr.dm | 6 +++++- code/modules/research/designs/weapons_vr.dm | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/medical_vr.dm b/code/modules/research/designs/medical_vr.dm index 7a0b0aa537..276ea0b66a 100644 --- a/code/modules/research/designs/medical_vr.dm +++ b/code/modules/research/designs/medical_vr.dm @@ -30,7 +30,9 @@ build_path = /obj/item/weapon/reagent_containers/hypospray/science sort_string = "KCAVB" + // ML-3M medigun and cells +/* /datum/design/item/medical/cell_based/AssembleDesignName() ..() name = "Cell-based medical prototype ([item_name])" @@ -241,4 +243,6 @@ req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_BLUESPACE = 3, TECH_BIO = 5, TECH_ILLEGAL = 5) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 2000) build_path = /obj/item/ammo_casing/microbattery/medical/normalsize - sort_string = "KVCOC" \ No newline at end of file + sort_string = "KVCOC" + +Don't even think about it -DHA */ \ No newline at end of file diff --git a/code/modules/research/designs/weapons_vr.dm b/code/modules/research/designs/weapons_vr.dm index 2b81ce34ce..326fca76d9 100644 --- a/code/modules/research/designs/weapons_vr.dm +++ b/code/modules/research/designs/weapons_vr.dm @@ -74,6 +74,7 @@ sort_string = "MAAUC" // NSFW gun and cells +/* /datum/design/item/weapon/cell_based/AssembleDesignName() ..() name = "Cell-based weapon prototype ([item_name])" @@ -145,6 +146,8 @@ materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "silver" = 1000, "gold" = 1000, "uranium" = 1000, "phoron" = 1000) build_path = /obj/item/ammo_casing/microbattery/combat/xray sort_string = "MAVCF" +*/ + // Who the fuck thought this was a good idea? -RadiantFlash /*/datum/design/item/nsfw_cell/stripper @@ -154,7 +157,9 @@ materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "uranium" = 2000, "phoron" = 2000, "diamond" = 500) build_path = /obj/item/ammo_casing/microbattery/combat/stripper sort_string = "MAVCG" -*/ + +None of these for now, too. -DHA */ + /* /datum/design/item/nsfw_cell/final name = "FINAL OPTION"