Skip to content

Commit

Permalink
fixes hopefully the last of frameless weapons. (#4961)
Browse files Browse the repository at this point in the history
* fixes hopefully the last of frameless weapons.

most likely fixes the last of the deconstructable frameless weapons. Being the pilgrim and the many bluecrosses that needed it.

* Update breakaction.dm

* Update flaregun.dm

REALLY!?
  • Loading branch information
benj8560 authored Jan 22, 2024
1 parent 345afa7 commit 5c4afa5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
7 changes: 7 additions & 0 deletions code/modules/projectiles/guns/oddity_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
max_shells = 60
init_recoil = RIFLE_RECOIL(1.1)
price_tag = 3000
gun_parts = null
serial_type = "BlueCross"

/obj/item/gun/projectile/revolver/mistral/elite/New()
Expand All @@ -44,6 +45,7 @@
penetration_multiplier = 2
init_recoil = RIFLE_RECOIL(4)
price_tag = 3250
gun_parts = null
gun_tags = list(GUN_PROJECTILE, GUN_INTERNAL_MAG) //Regains its internal mag due to its more annoying way of reloading
serial_type = "BlueCross"
icon = 'icons/obj/guns/projectile/sawnoff/bluecross_shotgun.dmi'
Expand Down Expand Up @@ -155,6 +157,7 @@
penetration_multiplier = 2
max_shells = 1
price_tag = 2750
gun_parts = null
sharp = FALSE
saw_off = FALSE
serial_type = "BlueCross"
Expand All @@ -165,6 +168,7 @@
A small red eye has been painted onto the firing pin of this formerly undepowered pistol, this one has been modified with a better feed mechanism to allow \
for deadlier shots. Uses 9mm rounds and can take standard pistol magazines, high cap magazines, or submachine gun mags."
price_tag = 2000
gun_parts = null
mag_well = MAG_WELL_PISTOL | MAG_WELL_H_PISTOL | MAG_WELL_SMG
damage_multiplier = 1.5
icon = 'icons/obj/guns/projectile/clarissa.dmi'
Expand All @@ -187,6 +191,7 @@
max_shells = 4
init_recoil = HMG_RECOIL(2)
price_tag = 3000
gun_parts = null
serial_type = "BlueCross"

/obj/item/gun/projectile/automatic/slaught_o_matic/lockpickomatic
Expand Down Expand Up @@ -250,6 +255,7 @@
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
matter = list(MATERIAL_PLASTEEL = 12, MATERIAL_PLASTIC = 6)
price_tag = 1420
gun_parts = null
fire_sound = 'sound/weapons/guns/fire/9mm_pistol.ogg'
can_dual = TRUE
load_method = MAGAZINE
Expand Down Expand Up @@ -291,6 +297,7 @@
origin_tech = list(TECH_MAGNET = 10) //3500 points for rnd, eh its meant to stay in player hands not be deconned
matter = list(MATERIAL_PLASTEEL = 20, MATERIAL_GOLD = 10, MATERIAL_SILVER = 10, MATERIAL_GLASS = 10, MATERIAL_PLATINUM = 8)
price_tag = 2450
gun_parts = null
fire_sound = 'sound/weapons/guns/fire/9mm_pistol.ogg'
can_dual = TRUE
load_method = MAGAZINE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
eject_animatio = FALSE //TODO: this
gun_tags = list(GUN_PROJECTILE, GUN_SCOPE) //We cant be overshooter or sharpened, but we can take a scope!
price_tag = 30
gun_parts = null //no free mosin!
serial_type = "H&S"


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
max_shells = 6
matter = list(MATERIAL_PLASTEEL = 14, MATERIAL_WOOD = 6)
price_tag = 700
gun_parts = null
damage_multiplier = 1.4
penetration_multiplier = 1.3
init_recoil = HANDGUN_RECOIL(1.2)
Expand Down Expand Up @@ -53,6 +54,7 @@
fire_sound = 'sound/weapons/guns/fire/9mm_revolver.ogg'
matter = list(MATERIAL_PLASTEEL = 10, MATERIAL_WOOD = 6)
price_tag = 300
gun_parts = null
damage_multiplier = 1.2
penetration_multiplier = 1.3
init_recoil = HANDGUN_RECOIL(1.1)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/guns/projectile/revolver/lemant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
max_shells = 9
matter = list(MATERIAL_PLASTEEL = 15, MATERIAL_PLASTIC = 8)
price_tag = 450
gun_parts = null
damage_multiplier = 1.2
penetration_multiplier = 1.1
init_recoil = HANDGUN_RECOIL(0.8)
Expand Down Expand Up @@ -181,6 +182,7 @@
max_shells = 9
matter = list(MATERIAL_PLASTEEL = 15, MATERIAL_PLASTIC = 8)
price_tag = 700
gun_parts = null
damage_multiplier = 1.3
penetration_multiplier = 1.2
init_recoil = HANDGUN_RECOIL(1.1)
Expand Down

0 comments on commit 5c4afa5

Please sign in to comment.