Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slavanka 500 #146

Merged
merged 7 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,7 @@
can_hold = list(
/obj/item/weapon/gun/revolver/t500,
/obj/item/ammo_magazine/revolver/t500,
/obj/item/ammo_magazine/revolver/t500/slavs,
/obj/item/ammo_magazine/packet/t500,
)

Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/machinery/vending/marine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
/obj/item/ammo_magazine/revolver/standard_revolver = -1,
/obj/item/storage/box/t500case = 10,
/obj/item/ammo_magazine/revolver/t500 = -1,
/obj/item/ammo_magazine/revolver/t500/slavs = -1,
/obj/item/weapon/gun/pistol/standard_pocketpistol = -1,
/obj/item/ammo_magazine/pistol/standard_pocketpistol = -1,
/obj/item/weapon/gun/pistol/vp70 = -1,
Expand Down Expand Up @@ -163,6 +164,7 @@
/obj/item/ammo_magazine/packet/magnum = -1,
/obj/item/ammo_magazine/packet/t500 = -1,
/obj/item/ammo_magazine/packet/t500/qk = -1,
/obj/item/ammo_magazine/packet/t500/slavs = -1,
/obj/item/ammo_magazine/packet/p10x20mm = -1,
/obj/item/ammo_magazine/packet/p10x24mm = -1,
/obj/item/ammo_magazine/packet/p10x24mm/ap = -1,
Expand Down Expand Up @@ -288,6 +290,7 @@
/obj/item/ammo_magazine/revolver/standard_revolver = -1,
/obj/item/storage/box/t500case = 10,
/obj/item/ammo_magazine/revolver/t500 = -1,
/obj/item/ammo_magazine/revolver/t500/slavs = -1,
/obj/item/weapon/gun/pistol/standard_pocketpistol = -1,
/obj/item/ammo_magazine/pistol/standard_pocketpistol = -1,
/obj/item/weapon/gun/pistol/vp70 = -1,
Expand Down Expand Up @@ -375,6 +378,7 @@
/obj/item/ammo_magazine/packet/magnum = -1,
/obj/item/ammo_magazine/packet/t500 = -1,
/obj/item/ammo_magazine/packet/t500/qk = -1,
/obj/item/ammo_magazine/packet/t500/slavs = -1,
/obj/item/ammo_magazine/packet/p10x20mm = -1,
/obj/item/ammo_magazine/packet/p10x24mm = -1,
/obj/item/ammo_magazine/packet/p10x25mm = -1,
Expand Down Expand Up @@ -501,6 +505,7 @@
/obj/item/ammo_magazine/revolver/standard_revolver = -1,
/obj/item/storage/box/t500case = -1,
/obj/item/ammo_magazine/revolver/t500 = -1,
/obj/item/ammo_magazine/revolver/t500/slavs = -1,
/obj/item/weapon/gun/pistol/standard_pocketpistol = -1,
/obj/item/ammo_magazine/pistol/standard_pocketpistol = -1,
/obj/item/weapon/gun/pistol/vp70 = -1,
Expand Down Expand Up @@ -605,6 +610,7 @@
/obj/item/ammo_magazine/packet/standard_magnum = -1,
/obj/item/ammo_magazine/packet/t500 = -1,
/obj/item/ammo_magazine/packet/t500/qk = -1,
/obj/item/ammo_magazine/packet/t500/slavs = -1,
/obj/item/ammo_magazine/packet/p10x20mm = -1,
/obj/item/ammo_magazine/packet/p10x24mm = -1,
/obj/item/ammo_magazine/packet/p10x24mm/ap = -1,
Expand Down
20 changes: 12 additions & 8 deletions code/modules/projectiles/ammo_datums/bullet/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,25 @@

/datum/ammo/bullet/revolver/t500
name = ".500 Nigro Express revolver bullet"
icon_state = "nigro"
icon = 'icons/obj/items/ammo.dmi'
handful_icon_state = "nigro"
handful_amount = 5
damage = 100
penetration = 40
additional_xeno_penetration = 0

/datum/ammo/bullet/revolver/t500/on_hit_mob(mob/M,obj/projectile/P)
staggerstun(M, P, stagger = 0, slowdown = 0, knockback = 1)
staggerstun(M, P, stagger = 0, slowdown = 0, knockback = 2)

/datum/ammo/bullet/revolver/t500/slavs
name = ".500 'Slavs' revolver bullet"
handful_icon_state = "nigro_sv"

/datum/ammo/bullet/revolver/t500/slavs/on_hit_mob(mob/M, obj/projectile/P)
staggerstun(M, P, weaken = 2 SECONDS, knockback = 1)

/datum/ammo/bullet/revolver/t500/qk
name = ".500 'Queen Killer' revolver bullet"
icon_state = "nigro_qk"
icon = 'icons/obj/items/ammo.dmi'
handful_amount = 5
damage = 100
penetration = 40
handful_icon_state = "nigro_qk"

/datum/ammo/bullet/revolver/t500/qk/on_hit_mob(mob/M,obj/projectile/P)
if(isxenoqueen(M))
Expand Down Expand Up @@ -101,6 +104,7 @@
handful_amount = 5
damage = 100
penetration = 40
additional_xeno_penetration = 0

/datum/ammo/bullet/revolver/t76/on_hit_mob(mob/M, obj/projectile/P)
staggerstun(M, P, weaken = 2 SECONDS, knockback = 1)
Expand Down
6 changes: 5 additions & 1 deletion code/modules/projectiles/guns/revolvers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,11 @@
caliber = CALIBER_500 //codex
max_chamber_items = 5 //codex
default_ammo_type = /obj/item/ammo_magazine/revolver/t500
allowed_ammo_types = list(/obj/item/ammo_magazine/revolver/t500, /datum/ammo/bullet/revolver/t500/qk)
allowed_ammo_types = list(
/obj/item/ammo_magazine/revolver/t500,
/obj/item/ammo_magazine/revolver/t500/slavs,
/datum/ammo/bullet/revolver/t500/qk,
)
force = 20
actions_types = null
attachable_allowed = list(
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/magazines/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@
icon_state = "boxt500_qk"
default_ammo = /datum/ammo/bullet/revolver/t500/qk

/obj/item/ammo_magazine/packet/t500/slavs
name = "packet of .500 'Slavs'"
icon_state = "boxt500_sv"
default_ammo = /datum/ammo/bullet/revolver/t500/slavs

/obj/item/ammo_magazine/packet/standard_magnum
name = "packet of .12x7mm"
icon = 'icons/obj/items/ammo.dmi'
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/magazines/revolvers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
w_class = WEIGHT_CLASS_SMALL
max_rounds = 5

/obj/item/ammo_magazine/revolver/t500/slavs
name = "\improper R-500 speed loader (.500 'Slavs')"
icon_state = "t500_sv"
default_ammo = /datum/ammo/bullet/revolver/t500/slavs

/obj/item/ammo_magazine/revolver/marksman
name = "\improper R-44 marksman speed loader (.44)"
default_ammo = /datum/ammo/bullet/revolver/marksman
Expand Down
Binary file modified icons/obj/items/ammo.dmi
Binary file not shown.
Loading