cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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

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)