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

[MIRROR] revert datum changes for now and fixes vorebelly descriptions getting stuck (#9116)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-02 07:25:33 -07:00
committed by GitHub
parent 45526dfe4e
commit 07c3627fbf
13 changed files with 184 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/modules/research/designs/mining_toys.dm
View File

@@ -1,10 +1,10 @@
/datum/design/item/mining/AssembleDesignName()
/datum/design/item/weapon/mining/AssembleDesignName()
..()
name = "Mining equipment design ([item_name])"
// Mining digging devices
/datum/design/item/mining/drill
/datum/design/item/weapon/mining/drill
id = "drill"
req_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 500) //expensive, but no need for miners.
@@ -12,7 +12,7 @@
sort_string = "FAAAA"
department = LATHE_ALL | LATHE_CARGO // CHOMPAdd
/datum/design/item/mining/advdrill
/datum/design/item/weapon/mining/advdrill
id = "advanced_drill"
req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners.
@@ -20,7 +20,7 @@
sort_string = "FAAAB"
department = LATHE_ALL | LATHE_CARGO // CHOMPAdd
/datum/design/item/mining/jackhammer
/datum/design/item/weapon/mining/jackhammer
id = "jackhammer"
req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_SILVER = 500)
@@ -28,7 +28,7 @@
sort_string = "FAAAC"
department = LATHE_ALL | LATHE_CARGO // CHOMPAdd
/datum/design/item/mining/plasmacutter
/datum/design/item/weapon/mining/plasmacutter
id = "plasmacutter"
req_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3)
materials = list(MAT_STEEL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PHORON = 500)
@@ -36,7 +36,7 @@
sort_string = "FAAAD"
department = LATHE_ALL | LATHE_CARGO // CHOMPAdd
/datum/design/item/mining/pick_diamond
/datum/design/item/weapon/mining/pick_diamond
id = "pick_diamond"
req_tech = list(TECH_MATERIAL = 6)
materials = list(MAT_DIAMOND = 3000)
@@ -44,7 +44,7 @@
sort_string = "FAAAE"
department = LATHE_ALL | LATHE_CARGO // CHOMPAdd
/datum/design/item/mining/drill_diamond
/datum/design/item/weapon/mining/drill_diamond
id = "drill_diamond"
req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000)
@@ -54,7 +54,7 @@
// Mining other equipment
/datum/design/item/mining/depth_scanner
/datum/design/item/weapon/mining/depth_scanner
desc = "Used to check spatial depth and density of rock outcroppings."
id = "depth_scanner"
req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2)
@@ -63,7 +63,15 @@
sort_string = "FBAAA"
department = LATHE_ALL | LATHE_CARGO // CHOMPAdd
/datum/design/item/mining/upgradeAOE
/datum/design/item/weapon/mining/mining_scanner
id = "mining_scanner"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1)
materials = list(MAT_STEEL = 1000,MAT_GLASS = 500)
build_path = /obj/item/mining_scanner/advanced
sort_string = "FBAAB"
department = LATHE_ALL | LATHE_CARGO // CHOMPAdd
/datum/design/item/weapon/mining/upgradeAOE
name = "Mining Explosion Upgrade"
desc = "An area of effect upgrade for the Proto-Kinetic Accelerator."
id = "pka_mineaoe"

90
code/modules/research/designs/misc.dm
View File

@@ -96,3 +96,93 @@
build_path = /obj/item/mop/advanced
sort_string = "TBAAE"
department = LATHE_ALL | LATHE_SERVICE // CHOMPAdd
/datum/design/item/general/hyperfiber_jumpsuit
name = "HYPER jumpsuit"
id = "hfjumpsuit"
req_tech = list(TECH_BLUESPACE = 2)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/clothing/under/hyperfiber
sort_string = "TAVAA"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/bluespace_jumpsuit
name = "Bluespace jumpsuit"
id = "bsjumpsuit"
req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000)
build_path = /obj/item/clothing/under/hyperfiber/bluespace
sort_string = "TAVAB"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/sizegun
name = "Size gun"
id = "sizegun"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000)
build_path = /obj/item/gun/energy/sizegun
sort_string = "TAVBA"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/sizegun_gradual
name = "Gradual size gun"
id = "gradsizegun"
req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000)
build_path = /obj/item/slow_sizegun
sort_string = "TAVBB"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/bluespace_collar
name = "Bluespace collar"
id = "bluespacecollar"
req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000)
build_path = /obj/item/clothing/accessory/collar/shock/bluespace
sort_string = "TAVBC"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/bodysnatcher
name = "Body Snatcher"
id = "bodysnatcher"
req_tech = list(TECH_MAGNET = 3, TECH_BIO = 3, TECH_ILLEGAL = 2)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000)
build_path = /obj/item/bodysnatcher
sort_string = "TBVAA"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/inducer_sci
name = "Inducer (Scientific)"
id = "inducersci"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 5, TECH_POWER = 6)
materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_PHORON = 4000)
build_path = /obj/item/inducer/sci
sort_string = "TCVAA"
department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd
/datum/design/item/general/inducer_eng
name = "Inducer (Industrial)"
id = "inducerind"
req_tech = list(TECH_BLUESPACE = 5, TECH_MATERIAL = 7, TECH_POWER = 7)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 2000)
build_path = /obj/item/inducer/unloaded
sort_string = "TCVAB"
department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd
/datum/design/item/general/walkpod
name = "PodZu Music Player"
id = "walkpod"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000)
build_path = /obj/item/walkpod
sort_string = "TCVAD"
department = LATHE_ALL | LATHE_SERVICE | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/juke_remote
name = "BoomTown Cordless Speaker"
id = "juke_remote"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000)
build_path = /obj/item/juke_remote
sort_string = "TCVAE"
department = LATHE_ALL | LATHE_SERVICE | LATHE_PUBLIC // CHOMPAdd

97
code/modules/research/designs/misc_vr.dm
View File

@@ -1,97 +0,0 @@
/datum/design/item/general/hyperfiber_jumpsuit
name = "HYPER jumpsuit"
id = "hfjumpsuit"
req_tech = list(TECH_BLUESPACE = 2)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/clothing/under/hyperfiber
sort_string = "TAVAA"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/bluespace_jumpsuit
name = "Bluespace jumpsuit"
id = "bsjumpsuit"
req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000)
build_path = /obj/item/clothing/under/hyperfiber/bluespace
sort_string = "TAVAB"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/sizegun
name = "Size gun"
id = "sizegun"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000)
build_path = /obj/item/gun/energy/sizegun
sort_string = "TAVBA"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/sizegun_gradual
name = "Gradual size gun"
id = "gradsizegun"
req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000)
build_path = /obj/item/slow_sizegun
sort_string = "TAVBB"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/bluespace_collar
name = "Bluespace collar"
id = "bluespacecollar"
req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000)
build_path = /obj/item/clothing/accessory/collar/shock/bluespace
sort_string = "TAVBC"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/bodysnatcher
name = "Body Snatcher"
id = "bodysnatcher"
req_tech = list(TECH_MAGNET = 3, TECH_BIO = 3, TECH_ILLEGAL = 2)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000)
build_path = /obj/item/bodysnatcher
sort_string = "TBVAA"
department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/inducer_sci
name = "Inducer (Scientific)"
id = "inducersci"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 5, TECH_POWER = 6)
materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_PHORON = 4000)
build_path = /obj/item/inducer/sci
sort_string = "TCVAA"
department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd
/datum/design/item/general/inducer_eng
name = "Inducer (Industrial)"
id = "inducerind"
req_tech = list(TECH_BLUESPACE = 5, TECH_MATERIAL = 7, TECH_POWER = 7)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 2000)
build_path = /obj/item/inducer/unloaded
sort_string = "TCVAB"
department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd
/datum/design/item/mining/mining_scanner
id = "mining_scanner"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1)
materials = list(MAT_STEEL = 1000,MAT_GLASS = 500)
build_path = /obj/item/mining_scanner/advanced
sort_string = "FBAAB"
department = LATHE_ALL | LATHE_CARGO // CHOMPAdd
/datum/design/item/general/walkpod
name = "PodZu Music Player"
id = "walkpod"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000)
build_path = /obj/item/walkpod
sort_string = "TCVAD"
department = LATHE_ALL | LATHE_SERVICE | LATHE_PUBLIC // CHOMPAdd
/datum/design/item/general/juke_remote
name = "BoomTown Cordless Speaker"
id = "juke_remote"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000)
build_path = /obj/item/juke_remote
sort_string = "TCVAE"
department = LATHE_ALL | LATHE_SERVICE | LATHE_PUBLIC // CHOMPAdd

74
code/modules/research/designs/weapons.dm
View File

@@ -1,12 +1,12 @@
/datum/design/item/AssembleDesignName()
/datum/design/item/weapon/AssembleDesignName()
..()
name = "Weapon prototype ([item_name])"
/datum/design/item/ammo/AssembleDesignName()
/datum/design/item/weapon/ammo/AssembleDesignName()
..()
name = "Weapon ammo prototype ([item_name])"
/datum/design/item/AssembleDesignDesc()
/datum/design/item/weapon/AssembleDesignDesc()
if(!desc)
if(build_path)
var/obj/item/I = build_path
@@ -15,11 +15,11 @@
// Energy weapons
/datum/design/item/energy/AssembleDesignName()
/datum/design/item/weapon/energy/AssembleDesignName()
..()
name = "Energy weapon prototype ([item_name])"
/datum/design/item/energy/stunrevolver
/datum/design/item/weapon/energy/stunrevolver
id = "stunrevolver"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 4000)
@@ -27,7 +27,7 @@
sort_string = "MAAAA"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/energy/nuclear_gun
/datum/design/item/weapon/energy/nuclear_gun
id = "nuclear_gun"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 500)
@@ -35,7 +35,7 @@
sort_string = "MAAAB"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/energy/phoronpistol
/datum/design/item/weapon/energy/phoronpistol
id = "ppistol"
req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_PHORON = 3000)
@@ -43,7 +43,7 @@
sort_string = "MAAAC"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/energy/lasercannon
/datum/design/item/weapon/energy/lasercannon
desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
id = "lasercannon"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
@@ -52,7 +52,7 @@
sort_string = "MAAAD"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/energy/decloner
/datum/design/item/weapon/energy/decloner
id = "decloner"
req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6)
materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000)
@@ -60,7 +60,7 @@
sort_string = "MAAAE"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/energy/temp_gun
/datum/design/item/weapon/energy/temp_gun
desc = "A gun that shoots high-powered glass-encased energy temperature bullets."
id = "temp_gun"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2)
@@ -69,7 +69,7 @@
sort_string = "MAAAF"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/energy/flora_gun
/datum/design/item/weapon/energy/flora_gun
id = "flora_gun"
req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 500)
@@ -77,7 +77,7 @@
sort_string = "MAAAG"
department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd
/datum/design/item/energy/vinstunrevolver
/datum/design/item/weapon/energy/vinstunrevolver
id = "vinstunrevolver"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
materials = list(MAT_STEEL = 4000)
@@ -87,11 +87,11 @@
// Ballistic weapons
/datum/design/item/ballistic/AssembleDesignName()
/datum/design/item/weapon/ballistic/AssembleDesignName()
..()
name = "Ballistic weapon prototype ([item_name])"
/datum/design/item/ballistic/advanced_smg
/datum/design/item/weapon/ballistic/advanced_smg
id = "smg"
desc = "An advanced 9mm SMG with a reflective laser optic."
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3)
@@ -102,11 +102,11 @@
// Ballistic ammo
/datum/design/item/ballistic/ammo/AssembleDesignName()
/datum/design/item/weapon/ballistic/ammo/AssembleDesignName()
..()
name = "Ballistic weapon ammo prototype ([name])"
/datum/design/item/ballistic/ammo/ammo_9mmAdvanced
/datum/design/item/weapon/ballistic/ammo/ammo_9mmAdvanced
name = "9mm magazine"
id = "ammo_9mm"
desc = "A 21 round magazine for an advanced 9mm SMG."
@@ -116,7 +116,7 @@
sort_string = "MABBA"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/ballistic/ammo/stunshell
/datum/design/item/weapon/ballistic/ammo/stunshell
name = "stun shells"
desc = "A stunning shell for a shotgun."
id = "stunshell"
@@ -126,7 +126,7 @@
sort_string = "MABBB"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/ballistic/ammo/empshell
/datum/design/item/weapon/ballistic/ammo/empshell
name = "emp shells"
desc = "An electromagnetic shell for a shotgun."
id = "empshell"
@@ -138,33 +138,33 @@
// Phase weapons
/datum/design/item/phase/AssembleDesignName()
/datum/design/item/weapon/phase/AssembleDesignName()
..()
name = "Phase weapon prototype ([item_name])"
/* //VOREStation Removal Start
/datum/design/item/phase/phase_pistol
/datum/design/item/weapon/phase/phase_pistol
id = "phasepistol"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2, TECH_POWER = 2)
materials = list(MAT_STEEL = 4000)
build_path = /obj/item/gun/energy/phasegun/pistol
sort_string = "MACAA"
/datum/design/item/phase/phase_carbine
/datum/design/item/weapon/phase/phase_carbine
id = "phasecarbine"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_POWER = 2)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 1500)
build_path = /obj/item/gun/energy/phasegun
sort_string = "MACAB"
/datum/design/item/phase/phase_rifle
/datum/design/item/weapon/phase/phase_rifle
id = "phaserifle"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
materials = list(MAT_STEEL = 7000, MAT_GLASS = 2000, MAT_SILVER = 500)
build_path = /obj/item/gun/energy/phasegun/rifle
sort_string = "MACAC"
/datum/design/item/phase/phase_cannon
/datum/design/item/weapon/phase/phase_cannon
id = "phasecannon"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_POWER = 4)
materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_SILVER = 1000, MAT_DIAMOND = 750)
@@ -174,7 +174,7 @@
// Other weapons
/datum/design/item/rapidsyringe
/datum/design/item/weapon/rapidsyringe
id = "rapidsyringe"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000)
@@ -182,7 +182,7 @@
sort_string = "MADAA"
department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd
/datum/design/item/dartgun
/datum/design/item/weapon/dartgun
desc = "A gun that fires small hollow chemical-payload darts."
id = "dartgun_r"
req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 1)
@@ -191,7 +191,7 @@
sort_string = "MADAB"
department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd
/datum/design/item/chemsprayer
/datum/design/item/weapon/chemsprayer
desc = "An advanced chem spraying device."
id = "chemsprayer"
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
@@ -200,7 +200,7 @@
sort_string = "MADAC"
department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd
/datum/design/item/fuelrod
/datum/design/item/weapon/fuelrod
id = "fuelrod_gun"
req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ILLEGAL = 5, TECH_MAGNET = 5)
materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_URANIUM = 1000, MAT_PHORON = 3000, MAT_DIAMOND = 1000)
@@ -210,7 +210,7 @@
// Ammo for those
/datum/design/item/ammo/dartgunmag_small
/datum/design/item/weapon/ammo/dartgunmag_small
id = "dartgun_mag_s"
req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
materials = list(MAT_STEEL = 300, MAT_GOLD = 100, MAT_SILVER = 100, MAT_GLASS = 300)
@@ -218,7 +218,7 @@
sort_string = "MADBA"
department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd
/datum/design/item/ammo/dartgun_ammo_small
/datum/design/item/weapon/ammo/dartgun_ammo_small
id = "dartgun_ammo_s"
req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
materials = list(MAT_STEEL = 50, MAT_GOLD = 30, MAT_SILVER = 30, MAT_GLASS = 50)
@@ -226,7 +226,7 @@
sort_string = "MADBB"
department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd
/datum/design/item/ammo/dartgunmag_med
/datum/design/item/weapon/ammo/dartgunmag_med
id = "dartgun_mag_m"
req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
materials = list(MAT_STEEL = 500, MAT_GOLD = 150, MAT_SILVER = 150, MAT_DIAMOND = 200, MAT_GLASS = 400)
@@ -234,7 +234,7 @@
sort_string = "MADBC"
department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd
/datum/design/item/ammo/dartgun_ammo_med
/datum/design/item/weapon/ammo/dartgun_ammo_med
id = "dartgun_ammo_m"
req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
materials = list(MAT_STEEL = 80, MAT_GOLD = 40, MAT_SILVER = 40, MAT_GLASS = 60)
@@ -242,7 +242,7 @@
sort_string = "MADBD"
department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd
/datum/design/item/ammo/flechette
/datum/design/item/weapon/ammo/flechette
id = "magnetic_ammo"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4)
materials = list(MAT_STEEL = 500, MAT_GOLD = 300, MAT_GLASS = 150, MAT_PHORON = 100)
@@ -252,11 +252,11 @@
// Melee weapons
/datum/design/item/melee/AssembleDesignName()
/datum/design/item/weapon/melee/AssembleDesignName()
..()
name = "Melee weapon prototype ([item_name])"
/datum/design/item/melee/esword
/datum/design/item/weapon/melee/esword
name = "Portable Energy Blade"
id = "chargesword"
req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4, TECH_ENGINEERING = 5, TECH_ILLEGAL = 4, TECH_ARCANE = 1)
@@ -265,7 +265,7 @@
sort_string = "MBAAA"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/melee/eaxe
/datum/design/item/weapon/melee/eaxe
name = "Energy Axe"
id = "chargeaxe"
req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_ENGINEERING = 4, TECH_ILLEGAL = 4)
@@ -275,11 +275,11 @@
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
// Grenade stuff
/datum/design/item/grenade/AssembleDesignName()
/datum/design/item/weapon/grenade/AssembleDesignName()
..()
name = "Grenade casing prototype ([item_name])"
/datum/design/item/grenade/large_grenade
/datum/design/item/weapon/grenade/large_grenade
id = "large_Grenade"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
materials = list(MAT_STEEL = 3000)

24
code/modules/research/designs/weapons_vr.dm
View File

@@ -9,7 +9,7 @@
// Energy Weapons
/datum/design/item/energy/protector
/datum/design/item/weapon/energy/protector
desc = "The 'Protector' is an advanced energy gun that cannot be fired in lethal mode on low security alert levels, but features DNA locking and a powerful stun."
id = "protector"
req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2)
@@ -18,7 +18,7 @@
sort_string = "MAAVA"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/energy/sickshot
/datum/design/item/weapon/energy/sickshot
desc = "A 'Sickshot' is a 4-shot energy revolver that causes nausea and confusion."
id = "sickshot"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 2)
@@ -27,7 +27,7 @@
sort_string = "MAAVB"
department = LATHE_ALL | LATHE_SECURITY | LATHE_MEDICAL // CHOMPAdd
/datum/design/item/energy/netgun
/datum/design/item/weapon/energy/netgun
desc = "The \"Varmint Catcher\" is an energy net projector designed to immobilize dangerous wildlife."
id = "netgun"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3)
@@ -38,7 +38,7 @@
// Misc weapons
/datum/design/item/pummeler
/datum/design/item/weapon/pummeler
desc = "With the 'Pummeler', punt anyone you don't like out of the room!"
id = "pummeler"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 5)
@@ -49,11 +49,11 @@
// Anti-particle stuff
/datum/design/item/particle/AssembleDesignName()
/datum/design/item/weapon/particle/AssembleDesignName()
..()
name = "Anti-particle weapon prototype ([item_name])"
/datum/design/item/particle/advparticle
/datum/design/item/weapon/particle/advparticle
name = "Advanced anti-particle rifle"
id = "advparticle"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 5, TECH_POWER = 3, TECH_MAGNET = 3)
@@ -62,7 +62,7 @@
sort_string = "MAAUA"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/particle/particlecannon
/datum/design/item/weapon/particle/particlecannon
name = "Anti-particle cannon"
id = "particlecannon"
req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_POWER = 4, TECH_MAGNET = 4)
@@ -71,7 +71,7 @@
sort_string = "MAAUB"
department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd
/datum/design/item/particle/pressureinterlock
/datum/design/item/weapon/particle/pressureinterlock
name = "APP pressure interlock"
id = "pressureinterlock"
req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
@@ -82,11 +82,11 @@
// NSFW gun and cells
/*
/datum/design/item/cell_based/AssembleDesignName()
/datum/design/item/weapon/cell_based/AssembleDesignName()
..()
name = "Cell-based weapon prototype ([item_name])"
/datum/design/item/cell_based/prototype_nsfw
/datum/design/item/weapon/cell_based/prototype_nsfw
name = "cell-loaded revolver"
id = "nsfw_prototype"
req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7)
@@ -94,7 +94,7 @@
build_path = /obj/item/gun/projectile/cell_loaded/combat/prototype
sort_string = "MAVAA"
/datum/design/item/cell_based/prototype_nsfw_mag
/datum/design/item/weapon/cell_based/prototype_nsfw_mag
name = "combat cell magazine"
id = "nsfw_mag_prototype"
req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7)
@@ -166,7 +166,7 @@
sort_string = "MAVCG"
None of these for now, too. -DHA */
/datum/design/item/ballistic/ammo/ptrshell
/datum/design/item/weapon/ballistic/ammo/ptrshell
name = "14.5mm shell"
desc = "A dense-core projectile fired from a small cannon."
id = "ptrshell"

2
code/modules/research/designs/weapons_yw.dm
View File

@@ -1,4 +1,4 @@
/datum/design/item/energy/hunter
/datum/design/item/weapon/energy/hunter
name = "Hybrid 'Hunter' net gun"
id = "huntergun"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 6, TECH_MAGNET = 4)

10
code/modules/research/designs/xenoarch_toys.dm
View File

@@ -1,13 +1,13 @@
/datum/design/item/xenoarch/AssembleDesignName()
/datum/design/item/weapon/xenoarch/AssembleDesignName()
..()
name = "Xenoarcheology equipment design ([item_name])"
// Xenoarch tools
/datum/design/item/xenoarch // CHOMPAdd
/datum/design/item/weapon/xenoarch // CHOMPAdd
department = LATHE_ALL | LATHE_SCIENCE
/datum/design/item/xenoarch/ano_scanner
/datum/design/item/weapon/xenoarch/ano_scanner
name = "Alden-Saraspova counter"
id = "ano_scanner"
desc = "Aids in triangulation of exotic particles."
@@ -16,7 +16,7 @@
build_path = /obj/item/ano_scanner
sort_string = "GAAAA"
/datum/design/item/xenoarch/xenoarch_multi_tool
/datum/design/item/weapon/xenoarch/xenoarch_multi_tool
name = "xenoarcheology multitool"
id = "xenoarch_multitool"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3)
@@ -24,7 +24,7 @@
materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_URANIUM = 500, MAT_PHORON = 500)
sort_string = "GAAAB"
/datum/design/item/xenoarch/excavationdrill
/datum/design/item/weapon/xenoarch/excavationdrill
name = "Excavation Drill"
id = "excavationdrill"
req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3)

8
code/modules/research/designs/xenobio_toys.dm
View File

@@ -1,4 +1,4 @@
/datum/design/item/xenobio/AssembleDesignName()
/datum/design/item/weapon/xenobio/AssembleDesignName()
..()
name = "Xenobiology equipment design ([item_name])"
@@ -6,14 +6,14 @@
/datum/design/item/xenobio // CHOMPAdd
department = LATHE_ALL | LATHE_SCIENCE
/datum/design/item/xenobio/slimebaton
/datum/design/item/weapon/xenobio/slimebaton
id = "slimebaton"
req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2, TECH_POWER = 3, TECH_COMBAT = 3)
materials = list(MAT_STEEL = 5000)
build_path = /obj/item/melee/baton/slime
sort_string = "HAAAA"
/datum/design/item/xenobio/slimetaser
/datum/design/item/weapon/xenobio/slimetaser
id = "slimetaser"
req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4)
materials = list(MAT_STEEL = 5000)
@@ -22,7 +22,7 @@
// Other
/datum/design/item/xenobio/slime_scanner
/datum/design/item/weapon/xenobio/slime_scanner
name = "slime scanner"
desc = "A hand-held body scanner able to learn information about slimes."
id = "slime_scanner"

4
code/modules/research/designs/xenobio_toys_vr.dm
View File

@@ -1,4 +1,4 @@
/datum/design/item/xenobio/monkey_gun
/datum/design/item/weapon/xenobio/monkey_gun
name = "bluespace monkey deployment system"
desc = "An Advanced monkey teleportation and rehydration system. For serious monkey business."
id = "monkey_gun"
@@ -7,7 +7,7 @@
build_path = /obj/item/xenobio/monkey_gun
sort_string = "HBBA"
/datum/design/item/xenobio/grinder
/datum/design/item/weapon/xenobio/grinder
name = "portable slime processor"
desc = "This high tech device combines the slime processor with the latest in woodcutting technology."
id = "slime_grinder"

28
modular_chomp/code/modules/research/designs/weapons.dm
View File

@@ -1,5 +1,5 @@
//Misc weapons
/datum/design/item/gun/launcher/confetti_cannon
/datum/design/item/weapon/gun/launcher/confetti_cannon
desc = "Stuff it with paper and shoot! You'll be a hit at every party."
id = "confetti_cannon"
req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -8,7 +8,7 @@
sort_string = "MAAVD"
department = LATHE_ALL | LATHE_SERVICE
/datum/design/item/energy/metamorphosisray
/datum/design/item/weapon/energy/metamorphosisray
name = "metamorphosis ray"
id = "metamorphosisray"
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_POWER = 4, TECH_BIO = 5, TECH_BLUESPACE = 4, TECH_ILLEGAL = 5)
@@ -17,7 +17,7 @@
sort_string = "MAAVE"
//Phase weapon with lock safeties.
/datum/design/item/phase/phase_pistol
/datum/design/item/weapon/phase/phase_pistol
id = "phasepistol"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2, TECH_POWER = 2)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 500)
@@ -25,7 +25,7 @@
sort_string = "MACAA"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/phase/phase_carbine
/datum/design/item/weapon/phase/phase_carbine
id = "phasecarbine"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_POWER = 2)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 500)
@@ -33,7 +33,7 @@
sort_string = "MACAB"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/phase/phase_rifle
/datum/design/item/weapon/phase/phase_rifle
id = "phaserifle"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
materials = list(MAT_STEEL = 7000, MAT_GLASS = 500, MAT_SILVER = 500)
@@ -41,7 +41,7 @@
sort_string = "MACAC"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/phase/phase_cannon
/datum/design/item/weapon/phase/phase_cannon
id = "phasecannon"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_POWER = 4)
materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_DIAMOND = 750)
@@ -49,7 +49,7 @@
sort_string = "MACAD"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/phase/frontier_holdout
/datum/design/item/weapon/phase/frontier_holdout
id = "holdout frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 100, MAT_PHORON = 1000)
@@ -57,7 +57,7 @@
sort_string = "MACAE"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/phase/frontier_phaser
/datum/design/item/weapon/phase/frontier_phaser
id = "frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 7000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 150, MAT_PHORON = 2000)
@@ -65,7 +65,7 @@
sort_string = "MACAF"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/phase/frontier_carbine
/datum/design/item/weapon/phase/frontier_carbine
id = "carbine frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 8, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 6500, MAT_GLASS = 900, MAT_DURASTEEL = 150, MAT_VERDANTIUM = 200, MAT_PHORON = 4000)
@@ -73,7 +73,7 @@
sort_string = "MACAG"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/phase/frontier_rifle
/datum/design/item/weapon/phase/frontier_rifle
id = "marksman rifle frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 8000, MAT_GLASS = 900, MAT_DURASTEEL = 200, MAT_VERDANTIUM = 250, MAT_PHORON = 2000)
@@ -81,7 +81,7 @@
sort_string = "MACAH"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/phase/frontier_handbow
/datum/design/item/weapon/phase/frontier_handbow
id = "handbow frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 5000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 150, MAT_PHORON = 1000)
@@ -90,7 +90,7 @@
department = LATHE_ALL | LATHE_SECURITY
//Leathals And any new CHOMP weapons.
/datum/design/item/gun/projectile/caseless/prototype
/datum/design/item/weapon/gun/projectile/caseless/prototype
id = "caselessrifle"
req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_PHORON = 5)
materials = list(MAT_STEEL = 7000, MAT_TITANIUM = 4000)
@@ -98,7 +98,7 @@
sort_string = "MACBA"
department = LATHE_ALL | LATHE_SECURITY
/datum/design/item/energy/lasercannon
/datum/design/item/weapon/energy/lasercannon
desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
id = "lasercannon"
req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 6, TECH_POWER = 5)
@@ -108,7 +108,7 @@
department = LATHE_ALL | LATHE_SECURITY
//Wierd weapon time
/datum/design/item/energy/cyrogun
/datum/design/item/weapon/energy/cyrogun
desc = "An improperly researched and poorly built weapon, specialized in utlizing frost offensively.."
id = "cryogun"
req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 8, TECH_POWER = 7, TECH_PRECURSOR = 4, TECH_ILLEGAL = 8)

1
tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyDescriptions.tsx
View File

@@ -17,6 +17,7 @@ const DescriptionSyntaxHighlighting = (props: { desc: string }) => {
useEffect(() => {
if (!desc || desc.length === 0) {
setHtmlDesc([]);
return;
}

1
tgui/packages/tgui/interfaces/chompstation/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyDescriptions.tsx
View File

@@ -17,6 +17,7 @@ const DescriptionSyntaxHighlighting = (props: { desc: string }) => {
useEffect(() => {
if (!desc || desc.length === 0) {
setHtmlDesc([]);
return;
}

1
vorestation.dme
View File

@@ -4230,7 +4230,6 @@
#include "code\modules\research\designs\medical_vr.dm"
#include "code\modules\research\designs\mining_toys.dm"
#include "code\modules\research\designs\misc.dm"
#include "code\modules\research\designs\misc_vr.dm"
#include "code\modules\research\designs\modular_computer.dm"
#include "code\modules\research\designs\pdas.dm"
#include "code\modules\research\designs\precursor.dm"