diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme index e864e0ac0c9..b1e0bd19291 100644 --- a/mods/persistence/_persistence.dme +++ b/mods/persistence/_persistence.dme @@ -133,6 +133,7 @@ #include "modules\fabrication\fabricator_build.dm" #include "modules\fabrication\fabricator_intake.dm" #include "modules\fabrication\designs\textile\space.dm" +#include "modules\fabrication\designs\protolathe\designs_weapons.dm" #include "modules\hydroponics\grown.dm" #include "modules\hydroponics\grown_indedible.dm" #include "modules\hydroponics\seed_machines.dm" @@ -234,6 +235,7 @@ #include "modules\projectiles\guns\projectile\tier1\revolver.dm" #include "modules\projectiles\guns\projectile\tier1\shotgun_db.dm" #include "modules\projectiles\guns\projectile\tier1\shotgun_pump.dm" +#include "modules\projectiles\overrides.dm" #include "modules\reagents\Chemistry-Holder.dm" #include "modules\reagents\chems\chems.dm" #include "modules\reagents\chems\recipes.dm" diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm new file mode 100644 index 00000000000..f426b92c8cf --- /dev/null +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm @@ -0,0 +1,35 @@ +/datum/fabricator_recipe/protolathe/weapon/tier0/bolt_action + path = /obj/item/gun/projectile/bolt_action/handmade/empty + +/datum/fabricator_recipe/protolathe/weapon/tier0/revolver + path = /obj/item/gun/projectile/revolver/handmade/empty + +/datum/fabricator_recipe/protolathe/weapon/tier0/shotgun + path = /obj/item/gun/projectile/shotgun/handmade/empty + +/datum/fabricator_recipe/protolathe/weapon/tier0/laser_rifle + path = /obj/item/gun/energy/laser/rifle/handmade + +/datum/fabricator_recipe/protolathe/weapon/tier1/bolt_action + path = /obj/item/gun/projectile/bolt_action/simple/empty + +/datum/fabricator_recipe/protolathe/weapon/tier1/pistol + path = /obj/item/gun/projectile/pistol/simple/empty + +/datum/fabricator_recipe/protolathe/weapon/tier1/pistol_golden + path = /obj/item/gun/projectile/pistol/simple/golden/empty + +/datum/fabricator_recipe/protolathe/weapon/tier1/revolver + path = /obj/item/gun/projectile/revolver/simple/empty + +/datum/fabricator_recipe/protolathe/weapon/tier1/shotgun_double + path = /obj/item/gun/projectile/shotgun/simple/empty + +/datum/fabricator_recipe/protolathe/weapon/tier1/shotgun_pump + path = /obj/item/gun/projectile/shotgun/pump/simple/empty + +/datum/fabricator_recipe/protolathe/weapon/tier1/laser_rifle + path = /obj/item/gun/energy/laser/rifle/simple + +/datum/fabricator_recipe/protolathe/weapon/tier1/laser_pistol + path = /obj/item/gun/energy/laser/pistol/simple \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm index 4283c223ffd..b21a7d41bc6 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser/rifle/handmade - name = "HM LR 'Tagger'" - desc = "A cobbled-together mass of electronic components, duct tape, and hope. However, unlike most laser rifles, this model is small enough to wear around the waist. Sports dreadful ammo capacity compared to ballistic weapons but its ease of recharging makes it favored among the poor." + name = "Laser 'Tagger' EG" + desc = "Laser rifle of dubious origin. Shoddy craftsmanship results in low charge capacity and weak output. Fires Alpha-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier0/lasrifle.dmi' slot_flags = SLOT_LOWER_BODY|SLOT_BACK w_class = ITEM_SIZE_LARGE @@ -10,3 +10,8 @@ fire_delay = 15 origin_tech = "{'combat':2,'magnets':1,'engineering':1,'materials':2}" projectile_type = /obj/item/projectile/beam/smalllaser + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/silver = MATTER_AMOUNT_TRACE + ) diff --git a/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm b/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm index 3a095b14a59..aafb4f6cda7 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser/pistol/simple - name = "ZSS LP 'Settler'" - desc = "The Settler model is one of the first ever mass-produced laser weapons intended for civilian use. It has an impressive capacity for its low cost and is small enough to be slung around the belt. Its low stopping power didn't deter most civilians from purchasing the pistol en masse." + name = "Laser 'Settler' EG" + desc = "Laser pistol used by modern spacers. Compact, but suffers from low charge capacity because of this. Fires Alpha-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier1/laspistol.dmi' slot_flags = SLOT_LOWER_BODY w_class = ITEM_SIZE_NORMAL @@ -9,4 +9,10 @@ fire_delay = 5 force = 3 // made of light-ish plastics rather than wood and metal origin_tech = "{'combat':3,'magnets':2,'engineering':2,'materials':3}" - projectile_type = /obj/item/projectile/beam/smalllaser \ No newline at end of file + projectile_type = /obj/item/projectile/beam/smalllaser + material = /decl/material/solid/metal/aluminium + matter = list( + /decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/silver = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE + ) diff --git a/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm index 1a3c883d9c1..ba591e5bf84 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm @@ -1,12 +1,18 @@ /obj/item/gun/energy/laser/rifle/simple - name = "ZSS LR 'Marine'" - desc = "The Marine model is one of the more ubiquitous energy weapon designs. While its capacity leaves something to be desired, it is incredibly easy to mass-produce and has great beam strength for its low manufacturing cost. It is often seen in the hands of corporate space marines, hence the name." + name = "Laser 'Marine' EG" + desc = "Laser rifle used by modern spacers. Powerful, but bulky and suffers from low charge capacity. Fires Beta-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier1/lasrifle.dmi' slot_flags = SLOT_BACK - w_class = ITEM_SIZE_LARGE + w_class = ITEM_SIZE_HUGE one_hand_penalty = 3 max_shots = 5 fire_delay = 12 force = 10 origin_tech = "{'combat':3,'magnets':2,'engineering':2,'materials':3}" - projectile_type = /obj/item/projectile/beam/midlaser \ No newline at end of file + projectile_type = /obj/item/projectile/beam/midlaser + material = /decl/material/solid/metal/aluminium + matter = list( + /decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/silver = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT + ) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm index a54db04459e..e4c46f05a91 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/bolt_action/handmade - name = "HM BA 'Minuteman'" - desc = "A homemade bolt-action rifle of dubious quality. While it can chamber high-damage ammunition, it's difficult to load and rather inaccurate for a rifle. It's still favored by colonists for being effective for its low cost. Chambered in 5.56mm rounds." + name = "5.56 'Minuteman' BA" + desc = "Bolt-action rifle of dubious origin. Shoddy craftsmanship results in extremely low ammo capacity. Chambered in 5.56." icon = 'mods/persistence/icons/obj/guns/tier0/boltaction.dmi' force = 10 slot_flags = SLOT_BACK @@ -13,6 +13,10 @@ one_hand_penalty = 20 fire_delay = 20 accuracy = -1 + material = /decl/material/solid/wood + matter = list( + /decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT + ) /obj/item/gun/projectile/bolt_action/handmade/empty - starts_loaded = FALSE \ No newline at end of file + starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm index 6095e40e669..028176b03c7 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm @@ -1,15 +1,20 @@ /obj/item/gun/projectile/revolver/handmade - name = "HM R 'Underdog'" - desc = "A jury-rigged weapon fashioned not too dissimilarly to a revolver. While usable one-handed, it doesn't lend itself to it. Chambered in 10mm rounds." + name = "10mm 'Underdog' RV" + desc = "Revolver of dubious origin. Shoddy craftsmanship results in low ammo capacity and high recoil. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier0/revolver.dmi' origin_tech = "{'combat':2,'engineering':1,'materials':1}" caliber = CALIBER_PISTOL ammo_type = /obj/item/ammo_casing/pistol max_shells = 3 + w_class = ITEM_SIZE_NORMAL fire_delay = 12 accuracy = -1 one_hand_penalty = 2 force = 5 + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT + ) /obj/item/gun/projectile/revolver/handmade/empty starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm index 1310d792a58..839c2a8d6f1 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/handmade - name = "HM SG 'Slider'" - desc = "A simple single-barrel shotgun made from a pipe and some spare parts. Inaccurate and sports nigh-unmanageable recoil. Chambered in 12g shells." + name = "12g 'Slider' SG" + desc = "Break-action shotgun of dubious origin. Shoddy craftsmanship results in extremely low ammo capacity and high recoil. Chambered in 12 gauge." icon = 'mods/persistence/icons/obj/guns/tier0/shotgun.dmi' load_method = SINGLE_CASING handle_casings = HOLD_CASINGS @@ -14,6 +14,10 @@ screen_shake = 2 accuracy = -1 one_hand_penalty = 10 + material = /decl/material/solid/wood + matter = list( + /decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT + ) /obj/item/gun/projectile/shotgun/handmade/empty starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm index cbff7bedd63..202c4d3451d 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/bolt_action/simple - name = "ZSS BA 'Mosin'" - desc = "The Mosin model is a particularly ancient design. Very little is known about its origins, but in the modern day Mosin models are mostly produced for hunting purposes. However, due to its ease of production and decent loading capacity, many colonist and rebel groups use Mosin rifles in their armies. Chambered in 5.56mm rounds." + name = "5.56 'Mosin' BA" + desc = "Bolt-action rifle of ancient design. Reliable, but slow-firing. Chambered in 5.56." icon = 'mods/persistence/icons/obj/guns/tier1/boltaction.dmi' force = 10 slot_flags = SLOT_BACK @@ -9,10 +9,16 @@ handle_casings = HOLD_CASINGS load_method = SINGLE_CASING max_shells = 5 + w_class = ITEM_SIZE_HUGE ammo_type = /obj/item/ammo_casing/rifle one_hand_penalty = 10 fire_delay = 12 accuracy = 0 + material = /decl/material/solid/wood + matter = list( + /decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) /obj/item/gun/projectile/bolt_action/simple/empty - starts_loaded = FALSE \ No newline at end of file + starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm index 6f0059ef1b8..517db03dcd5 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/pistol/simple - name = "ZSS HG 'Colt'" - desc = "Nobody knows who 'Colt' actually was, but historians generally believe he was a master gunsmith from the ancient past. The 'Colt' pistol is one of his most well-known designs. Because the design to make this model was cracked decades ago, many groups have made their own bastardized versions of the firearm. This one in particular is chambered in 10mm rounds." + name = "10mm 'Colt' HG" + desc = "Pistol of ancient design. Reliable, but struggles against armored targets. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier1/pistol.dmi' fire_delay = 5 force = 5 @@ -8,6 +8,12 @@ one_hand_penalty = 0 origin_tech = "{'combat':3,'engineering':2,'materials':2}" ammo_indicator = FALSE + w_class = ITEM_SIZE_NORMAL + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) /obj/item/gun/projectile/pistol/simple/empty - starts_loaded = FALSE \ No newline at end of file + starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm index e7f7f8527cf..13b63862984 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm @@ -1,8 +1,14 @@ /obj/item/gun/projectile/pistol/simple/golden - name = "ZSS HG 'Midas'" - desc = "This particular 'Colt' handgun has been made using an alloy of gold and an unknown material. It's been handmade by an expert artisan who has been lost to time. This gun isn't so much a weapon as it is a piece of art. This one in particular is chambered in 10mm rounds and is functionally identical to a normal 'Colt' handgun." + name = "10mm 'Colt-M' HG" + desc = "Luxurious pistol of ancient design. Reliable and fabulous, but struggles against armored targets. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier1/pistol_gold.dmi' - origin_tech = "{'combat':3,'engineering':2,'materials':10}" // very high material tech because it has rare components inside + origin_tech = "{'combat':3,'engineering':2,'materials':5}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/gold = MATTER_AMOUNT_REINFORCEMENT + ) /obj/item/gun/projectile/pistol/simple/golden/empty - starts_loaded = FALSE \ No newline at end of file + starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm index 7d261d8c42f..4369159ffa4 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm @@ -1,15 +1,21 @@ /obj/item/gun/projectile/revolver/simple - name = "ZSS R 'Chief'" - desc = "A pocket revolver of ancient design intended for use by ground police forces and for civilian self-defense. The Chief model is known as a reliable weapon galaxy-wide, though its use of pistol rounds leaves it lacking in stopping power. Chambered in 10mm rounds." + name = "10mm 'Chief' RV" + desc = "Revolver of ancient design. Reliable, but struggles against armored targets. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier1/revolver.dmi' origin_tech = "{'combat':3,'engineering':2,'materials':2}" caliber = CALIBER_PISTOL ammo_type = /obj/item/ammo_casing/pistol max_shells = 5 + w_class = ITEM_SIZE_NORMAL fire_delay = 10 accuracy = 0 one_hand_penalty = 0 force = 5 + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) /obj/item/gun/projectile/revolver/simple/empty - starts_loaded = FALSE \ No newline at end of file + starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm index d486ad8cb3c..90e12a57390 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/simple - name = "ZSS SG 'Bouncer'" - desc = "The Bouncer, also known simply as 'the Double-Barrel', is essentially a rifle butt with two pipes attached to it. Somehow, this proved to be an immensely effective, powerful, and decidedly badass weapon. This model can be configured to fire one or both barrels at a time, and cannot be sawn off due to sporting reinforced barrels. It's often used by angry barkeeps and deranged space marines. Chambered in 12g shells." + name = "12g 'Bouncer' SG" + desc = "Break-action shotgun of ancient design. Powerful, but struggles in prolonged engagements due to low ammo capacity. Can fire one or both chambers at a time. Chambered in 12 gauge." icon = 'mods/persistence/icons/obj/guns/tier1/shotgun_db.dmi' load_method = SINGLE_CASING handle_casings = HOLD_CASINGS @@ -13,13 +13,17 @@ ammo_type = /obj/item/ammo_casing/shotgun/beanbag screen_shake = 1 accuracy = 0 - one_hand_penalty = 10 // doesnt improve over handmade shotgun penalty because you really should not be one-handing a shotgun - + one_hand_penalty = 10 + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) burst_delay = 0 firemodes = list( list(mode_name="fire one barrel at a time", burst=1), - list(mode_name="fire both barrels at once", burst=2), - ) + list(mode_name="fire both barrels at once", burst=2) + ) /obj/item/gun/projectile/shotgun/simple/empty - starts_loaded = FALSE \ No newline at end of file + starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm index a71ae112ee1..2a3034cb96d 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/pump/simple - name = "ZSS SG 'Teufort'" - desc = "A straightforward pump-action shotgun intended for hunting medium-sized game. The Teufort isn't one of the first or best pump shotguns to exist, but its fairly cheap for how effective it is. Chambered in 12g shells." + name = "12g 'Teufort' SG" + desc = "Pump-action shotgun of ancient design. Powerful, but fires slowly due to pump-action mechanism and high recoil. Chambered in 12 gauge." icon = 'mods/persistence/icons/obj/guns/tier1/shotgun_pump.dmi' max_shells = 5 fire_delay = 12 @@ -13,6 +13,11 @@ ammo_type = /obj/item/ammo_casing/shotgun/beanbag handle_casings = HOLD_CASINGS one_hand_penalty = 10 + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/wood = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/titanium = MATTER_AMOUNT_TRACE + ) /obj/item/gun/projectile/shotgun/pump/simple/empty starts_loaded = FALSE diff --git a/mods/persistence/modules/projectiles/overrides.dm b/mods/persistence/modules/projectiles/overrides.dm new file mode 100644 index 00000000000..03882b5ed51 --- /dev/null +++ b/mods/persistence/modules/projectiles/overrides.dm @@ -0,0 +1,35 @@ +/datum/fabricator_recipe/protolathe/weapon/rapidsyringe + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/temp_gun + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/confuseray + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/nuclear_gun + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/lasercannon + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/xrayrifle + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/grenadelauncher + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/flechette + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/radpistol + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/decloner + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/wt550 + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/weapon/bullpup + research_excluded = TRUE