Skip to content

Commit

Permalink
finishing touches
Browse files Browse the repository at this point in the history
  • Loading branch information
rye-rice committed Oct 13, 2023
1 parent 46d204a commit 2464123
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 5 deletions.
9 changes: 9 additions & 0 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@
/obj/item/ammo_box/magazine/m45)
cost = 1500

/datum/supply_pack/ammo/m45_speedloader
name = ".45 ACP Speedloader Crate"
desc = "Contains four .45 ACP speedloaders for revolvers, each containing six rounds."
contains = list(/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader)
cost = 1500

/datum/supply_pack/ammo/c38_mag
name = ".38 Speedloader Crate"
desc = "Contains four .38 speedloaders for revolvers, each containing six rounds."
Expand Down
8 changes: 7 additions & 1 deletion code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,18 @@
/obj/item/gun/ballistic/revolver)

/datum/supply_pack/gun/detrevolver
name = "Revolver crate"
name = "Hunter's Pride Detective Revolver crate"
desc = "Contains two concealable Solarian revolvers, chambered in .38."
cost = 2000
contains = list(/obj/item/gun/ballistic/revolver/detective,
/obj/item/gun/ballistic/revolver/detective)

/datum/supply_pack/gun/cattlemanrevolver
name = "Cattleman Revolver crate"
desc = "Contains two concealable Cattleman revolvers, chambered in .45 ACP."
cost = 2500
contains = list(/obj/item/gun/ballistic/revolver/cattleman,
/obj/item/gun/ballistic/revolver/cattleman)


/*
Expand Down
4 changes: 3 additions & 1 deletion code/modules/projectiles/guns/ballistic/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
spread_unwielded = 4
wield_slowdown = 0.15

muzzleflash_iconstate = "muzzle_flash_light"

/obj/item/gun/ballistic/automatic/pistol/no_mag
spawnwithmagazine = FALSE

Expand Down Expand Up @@ -303,7 +305,7 @@

/obj/item/gun/ballistic/automatic/pistol/himehabu
name = "\improper Himehabu"
desc = "A very small .22 LR pistol, so small even it could fit in your boot. The long awaited successor to the Stechkin. A favorite among syndicate spies. Chambered in .22 LR."
desc = "A very small .22 LR pistol. The long awaited successor to the Stechkin; It has become a favorite among syndicate spies. Chambered in .22 LR."
icon_state = "himehabu"
w_class = WEIGHT_CLASS_TINY
mag_type = /obj/item/ammo_box/magazine/m22lr
Expand Down
5 changes: 4 additions & 1 deletion code/modules/projectiles/guns/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
bolt_wording = "hammer"
wield_slowdown = 0.3

/obj/item/gun/ballistic/revolver/examine(mob/user)
. = ..()
. += "<span class='info'>You can use the revolver with your <b>other empty hand</b> to empty the cylinder.</span>"

/obj/item/gun/ballistic/revolver/attack_hand(mob/user)
if(loc == user && user.is_holding(src))
Expand Down Expand Up @@ -334,7 +337,7 @@

/obj/item/gun/ballistic/revolver/cattleman
name = "\improper Cattleman"
desc = "A strangely ancient revolver. Despite the age, it is a favortie of fast drawing spacers and officers in various militaries, but sometimes very rarely used in small colonial police units. Uses .45 ACP."
desc = "A strangely ancient revolver. Despite the age, it is a favorite of fast drawing spacers and officers in various militaries, but sometimes very rarely used in small colonial police units. Uses .45 ACP."
fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
icon = 'icons/obj/guns/48x32guns.dmi'
icon_state = "cattleman"
Expand Down
34 changes: 33 additions & 1 deletion code/modules/projectiles/guns/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@
rack_sound = 'sound/weapons/gun/shotgun/rack_alt.ogg'
fire_delay = 1

/obj/item/gun/ballistic/shotgun/riot/sawoff(mob/user)
. = ..()
if(.)
weapon_weight = WEAPON_MEDIUM
wield_slowdown = 0.25
wield_delay = 0.3 SECONDS //OP? maybe

spread = 8
spread_unwielded = 15
recoil = 3 //or not
recoil_unwielded = 5

// Automatic Shotguns//
/obj/item/gun/ballistic/shotgun/automatic
spread = 4
Expand Down Expand Up @@ -232,6 +244,13 @@
. = ..()
if(.)
weapon_weight = WEAPON_MEDIUM
wield_slowdown = 0.25
wield_delay = 0.3 SECONDS //OP? maybe

spread = 8
spread_unwielded = 15
recoil = 3 //or not
recoil_unwielded = 5

// IMPROVISED SHOTGUN //

Expand Down Expand Up @@ -505,7 +524,7 @@
inhand_x_dimension = 32
inhand_y_dimension = 32
mag_type = /obj/item/ammo_box/magazine/internal/shot/contender
fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
can_be_sawn_off=TRUE
sawn_desc= "A single-shot pistol. It's hard to aim without a front sight."
w_class = WEIGHT_CLASS_BULKY
Expand All @@ -519,9 +538,22 @@
bolt_type = BOLT_TYPE_NO_BOLT
can_be_sawn_off = TRUE
pb_knockback = 3
wield_slowdown = 0.7
spread_unwielded = 15
spread = 0
recoil = 0
recoil_unwielded = 5



/obj/item/gun/ballistic/shotgun/contender/sawoff(mob/user)
. = ..()
if(.)
item_state = "contender_sawn"
wield_slowdown = 0.5
wield_delay = 0.5 SECONDS

spread_unwielded = 5 //mostly the hunting revolver stats
spread = 2
recoil = 2
recoil_unwielded = 3
4 changes: 4 additions & 0 deletions code/modules/projectiles/guns/energy/kinetic_accelerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
internal_cell = TRUE
custom_price = 750
w_class = WEIGHT_CLASS_BULKY

muzzleflash_iconstate = "muzzle_flash_light"
muzzle_flash_color = COLOR_WHITE

var/overheat_time = 16
var/holds_charge = FALSE
var/unique_frequency = FALSE // modified by KA modkits
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/energy/pulse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

spread_unwielded = 25

muzzleflash_iconstate = "muzzle_flash_pulse"
muzzle_flash_color = COLOR_BRIGHT_BLUE

/obj/item/gun/energy/pulse/emp_act(severity)
return

Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/bullets/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,6 @@
/obj/projectile/bullet/c22lr
name = ".22LR bullet"
damage = 20
armour_penetration = -30
armour_penetration = -45
ricochet_incidence_leeway = 20
ricochet_chance = 45
Binary file modified icons/obj/guns/48x32guns.dmi
Binary file not shown.

0 comments on commit 2464123

Please sign in to comment.