Skip to content

Commit

Permalink
Revolver fixes (#540)
Browse files Browse the repository at this point in the history
  • Loading branch information
EgorDinamit authored Feb 11, 2024
1 parent 61da470 commit ac5b2e5
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion code/datums/outfits/horror_killers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@
new /obj/item/spacecash/bundle/c1000(sec_briefcase)
new /obj/item/gun/energy/crossbow(sec_briefcase)
new /obj/item/gun/projectile/revolver(sec_briefcase)
new /obj/item/ammo_magazine/speedloader/magnum(sec_briefcase)
new /obj/item/ammo_magazine/speedloader(sec_briefcase)
new /obj/item/plastique(sec_briefcase)
H.equip_to_slot_or_del(sec_briefcase, slot_l_hand)
8 changes: 4 additions & 4 deletions code/datums/uplink/ammunition.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@
item_cost = 8
path = /obj/item/ammo_magazine/magnum

/datum/uplink_item/item/ammo/speedloader_magnum
name = "Magnum Speedloader"
desc = "A speedloader for magnum revolvers. Contains 6 rounds."
/datum/uplink_item/item/ammo/speedloader
name = "Revolver Speedloader"
desc = "A speedloader for revolvers. Contains 6 rounds."
item_cost = 8
path = /obj/item/ammo_magazine/speedloader/magnum
path = /obj/item/ammo_magazine/speedloader

/datum/uplink_item/item/ammo/flechette
name = "Flechette Rifle Magazine"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
/obj/item/storage/backpack/satchel/syndie_kit/revolver
startswith = list(
/obj/item/gun/projectile/revolver,
/obj/item/ammo_magazine/speedloader/magnum
/obj/item/ammo_magazine/speedloader
)

/obj/item/storage/box/syndie_kit/toxin
Expand Down
6 changes: 3 additions & 3 deletions code/modules/fabrication/designs/general/designs_arms_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
name = "ammunition (speedloader, holdout)"
path = /obj/item/ammo_magazine/speedloader/small

/datum/fabricator_recipe/arms_ammo/hidden/speedloader_magnum
name = "ammunition (speedloader, magnum)"
path = /obj/item/ammo_magazine/speedloader/magnum
/datum/fabricator_recipe/arms_ammo/hidden/speedloader_medium
name = "ammunition (speedloader, medium)"
path = /obj/item/ammo_magazine/speedloader/medium

/datum/fabricator_recipe/arms_ammo/hidden/magazine_pistol
name = "ammunition (pistol)"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/psionics/equipment/foundation_weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
icon = 'icons/obj/guns/foundation.dmi'
icon_state = "foundation"
desc = "The CF 'Troubleshooter', a compact plastic-composite weapon designed for concealed carry by Cuchulain Foundation field agents. Smells faintly of copper."
ammo_type = /obj/item/ammo_casing/pistol/magnum/nullglass
ammo_type = /obj/item/ammo_casing/revolver/medium/nullglass

/obj/item/gun/projectile/revolver/foundation/disrupts_psionics()
return FALSE
Expand All @@ -20,9 +20,9 @@
/obj/item/storage/briefcase/foundation/revolver/New()
..()
new /obj/item/gun/projectile/revolver/foundation(src)
new /obj/item/ammo_magazine/speedloader/magnum/nullglass(src)
new /obj/item/ammo_magazine/speedloader/magnum/nullglass(src)
new /obj/item/ammo_magazine/speedloader/magnum/nullglass(src)
new /obj/item/ammo_magazine/speedloader/medium/nullglass(src)
new /obj/item/ammo_magazine/speedloader/medium/nullglass(src)
new /obj/item/ammo_magazine/speedloader/medium/nullglass(src)
make_exact_fit()

/obj/item/storage/briefcase/foundation/jerraman
Expand Down
17 changes: 9 additions & 8 deletions code/modules/psionics/equipment/null_ammo.dm
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
/obj/item/projectile/bullet/nullglass
/obj/item/projectile/revolver/medium/nullglass
name = "nullglass bullet"
damage = 20
shrapnel_type = /obj/item/material/shard/nullglass

/obj/item/projectile/bullet/nullglass/on_hit(atom/target, blocked = 0, def_zone = null)
/obj/item/projectile/revolver/medium/nullglass/on_hit(atom/target, blocked = 0, def_zone = null)
. = ..()
var/mob/living/L = target
if(L.psi)
L.psi.stamina = max(0, L.psi.stamina - rand(15,20))
to_chat(L, SPAN_DANGER("You feel your psi-power leeched away by \the [src]..."))

/obj/item/ammo_casing/pistol/magnum/nullglass
/obj/item/ammo_casing/revolver/medium/nullglass
desc = "A revolver bullet casing with a nullglass coating."
projectile_type = /obj/item/projectile/bullet/nullglass
projectile_type = /obj/item/projectile/revolver/medium/nullglass

/obj/item/ammo_casing/pistol/magnum/nullglass/disrupts_psionics()
/obj/item/ammo_casing/revolver/medium/nullglass/disrupts_psionics()
return src

/obj/item/ammo_magazine/speedloader/magnum/nullglass
ammo_type = /obj/item/ammo_casing/pistol/magnum/nullglass
/obj/item/ammo_magazine/speedloader/medium/nullglass
ammo_type = /obj/item/ammo_casing/revolver/medium/nullglass


0 comments on commit ac5b2e5

Please sign in to comment.