cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert some

Browse Source
This commit is contained in:
Kashargul
2024-10-01 21:41:07 +02:00
parent 2261062f09
commit ded60639bc
10 changed files with 157 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/mining_toys.dm
+16 -9
View File
@@ -1,45 +1,45 @@
/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.
build_path = /obj/item/pickaxe/drill
sort_string = "FAAAA"
/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.
build_path = /obj/item/pickaxe/advdrill
sort_string = "FAAAB"
/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)
build_path = /obj/item/pickaxe/jackhammer
sort_string = "FAAAC"
/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)
build_path = /obj/item/pickaxe/plasmacutter
sort_string = "FAAAD"
/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)
build_path = /obj/item/pickaxe/diamond
sort_string = "FAAAE"
/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)
@@ -48,7 +48,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)
@@ -56,7 +56,14 @@
build_path = /obj/item/depth_scanner
sort_string = "FBAAA"
/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"
/datum/design/item/weapon/mining/upgradeAOE
name = "Mining Explosion Upgrade"
desc = "An area of effect upgrade for the Proto-Kinetic Accelerator."
id = "pka_mineaoe"
code/modules/research/designs/misc.dm
+81 -1
View File
@@ -89,4 +89,84 @@
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 5, TECH_BIO = 1)
materials = list(MAT_STEEL = 5000, MAT_GLASS = 2000, MAT_GOLD = 1000)
build_path = /obj/item/mop/advanced
sort_string = "TBAAE"
sort_string = "TBAAE"
/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"
/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"
/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"
/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"
/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"
/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"
/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"
/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"
/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"
/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"
code/modules/research/designs/misc_vr.dm
-86
View File
@@ -1,86 +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"
/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"
/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"
/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"
/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"
/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"
/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"
/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"
/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"
/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"
/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"
code/modules/research/designs/weapons.dm
+37 -37
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,32 +15,32 @@
// 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)
build_path = /obj/item/gun/energy/stunrevolver
sort_string = "MAAAA"
/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)
build_path = /obj/item/gun/energy/gun/nuclear
sort_string = "MAAAB"
/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)
build_path = /obj/item/gun/energy/toxgun
sort_string = "MAAAC"
/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)
@@ -48,14 +48,14 @@
build_path = /obj/item/gun/energy/lasercannon
sort_string = "MAAAD"
/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)
build_path = /obj/item/gun/energy/decloner
sort_string = "MAAAE"
/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)
@@ -63,14 +63,14 @@
build_path = /obj/item/gun/energy/temperature
sort_string = "MAAAF"
/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)
build_path = /obj/item/gun/energy/floragun
sort_string = "MAAAG"
/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)
@@ -79,11 +79,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)
@@ -93,11 +93,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."
@@ -106,7 +106,7 @@
build_path = /obj/item/ammo_magazine/m9mmAdvanced
sort_string = "MABBA"
/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"
@@ -115,7 +115,7 @@
build_path = /obj/item/ammo_magazine/ammo_box/b12g/stunshell
sort_string = "MABBB"
/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"
@@ -126,33 +126,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)
@@ -162,14 +162,14 @@
// 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)
build_path = /obj/item/gun/launcher/syringe/rapid
sort_string = "MADAA"
/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)
@@ -177,7 +177,7 @@
build_path = /obj/item/gun/projectile/dartgun/research
sort_string = "MADAB"
/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)
@@ -185,7 +185,7 @@
build_path = /obj/item/reagent_containers/spray/chemsprayer
sort_string = "MADAC"
/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)
@@ -194,35 +194,35 @@
// 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)
build_path = /obj/item/ammo_magazine/chemdart/small
sort_string = "MADBA"
/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)
build_path = /obj/item/ammo_casing/chemdart/small
sort_string = "MADBB"
/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)
build_path = /obj/item/ammo_magazine/chemdart
sort_string = "MADBC"
/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)
build_path = /obj/item/ammo_casing/chemdart
sort_string = "MADBD"
/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)
@@ -231,11 +231,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)
@@ -243,7 +243,7 @@
build_path = /obj/item/melee/energy/sword/charge
sort_string = "MBAAA"
/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)
@@ -252,11 +252,11 @@
sort_string = "MBAAB"
// 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)
code/modules/research/designs/weapons_vr.dm
+12 -12
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)
@@ -17,7 +17,7 @@
build_path = /obj/item/gun/energy/gun/protector
sort_string = "MAAVA"
/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)
@@ -25,7 +25,7 @@
build_path = /obj/item/gun/energy/sickshot
sort_string = "MAAVB"
/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)
@@ -35,7 +35,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)
@@ -45,11 +45,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)
@@ -57,7 +57,7 @@
build_path = /obj/item/gun/energy/particle/advanced
sort_string = "MAAUA"
/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)
@@ -65,7 +65,7 @@
build_path = /obj/item/gun/energy/particle/cannon
sort_string = "MAAUB"
/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)
@@ -74,11 +74,11 @@
sort_string = "MAAUC"
// 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)
@@ -86,7 +86,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)
@@ -154,7 +154,7 @@
build_path = /obj/item/ammo_casing/microbattery/combat/stripper
sort_string = "MAVCG"
/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"
code/modules/research/designs/xenoarch_toys.dm
+4 -4
View File
@@ -1,10 +1,10 @@
/datum/design/item/xenoarch/AssembleDesignName()
/datum/design/item/weapon/xenoarch/AssembleDesignName()
..()
name = "Xenoarcheology equipment design ([item_name])"
// Xenoarch tools
/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."
@@ -13,7 +13,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)
@@ -21,7 +21,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)
code/modules/research/designs/xenobio_toys.dm
+4 -4
View File
@@ -1,17 +1,17 @@
/datum/design/item/xenobio/AssembleDesignName()
/datum/design/item/weapon/xenobio/AssembleDesignName()
..()
name = "Xenobiology equipment design ([item_name])"
// Xenobio Weapons
/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)
@@ -20,7 +20,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"
code/modules/research/designs/xenobio_toys_vr.dm
+2 -2
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"
tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyDescriptions.tsx
+1
View File
@@ -17,6 +17,7 @@ const DescriptionSyntaxHighlighting = (props: { desc: string }) => {
useEffect(() => {
if (!desc || desc.length === 0) {
setHtmlDesc([]);
return;
}
vorestation.dme
-1
View File
@@ -3915,7 +3915,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\power_cells.dm"