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

Hunter's Pride #2618

Merged
merged 34 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
32ba3d5
vickland
rye-rice Dec 24, 2023
040f127
todo: don't update paths until its ready to ship
rye-rice Jan 1, 2024
9e90a73
fuck
rye-rice Jan 2, 2024
29ebb46
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 2, 2024
f55fd1a
apogee_suggestsions/finsihes, todo:illest-saw&enbc
rye-rice Jan 8, 2024
aeeb0b9
request
rye-rice Jan 8, 2024
afccf06
Vickland and Illestren magtype swap req by apogee
rye-rice Jan 10, 2024
4d557eb
polish, fixes some maps
rye-rice Jan 10, 2024
c55bca6
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 10, 2024
2c8def4
fixes maps, probably
rye-rice Jan 10, 2024
eaadd70
woah
rye-rice Jan 10, 2024
70d154f
uifhasdophufdsa damn you ember, hopefully last go
rye-rice Jan 10, 2024
7061fd9
VERY final last time?
rye-rice Jan 10, 2024
dfec359
AAAAAAAAAAAAA
rye-rice Jan 10, 2024
18c1998
how do i keep fucking up oh my god
rye-rice Jan 10, 2024
1c422bb
updated desc/fixes disposable gun runtime
rye-rice Jan 10, 2024
2ab9129
augh
rye-rice Jan 10, 2024
346c95f
apogee suggestions some missed things
rye-rice Jan 12, 2024
09cf75e
this was stupid
rye-rice Jan 12, 2024
9aa3c9f
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 14, 2024
c380e73
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 18, 2024
a2333b8
path fixes
rye-rice Jan 18, 2024
e06c252
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 18, 2024
8701e87
AUGH
rye-rice Jan 19, 2024
06e57fa
sdfgsdfaf
rye-rice Jan 21, 2024
9dd887b
nice catch apoggers
rye-rice Jan 23, 2024
4bd1945
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 24, 2024
cfad6ff
woops
rye-rice Jan 25, 2024
a179d7d
fixes inhands/sprites
rye-rice Jan 28, 2024
c8474ca
OOOPS
rye-rice Jan 28, 2024
2824659
test?
rye-rice Jan 29, 2024
2e5f29d
what the fuck?
rye-rice Jan 29, 2024
c8fb452
last shotgun change, i hope
rye-rice Feb 1, 2024
c1a40a7
augh
rye-rice Feb 1, 2024
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
Prev Previous commit
Next Next commit
apogee_suggestsions/finsihes, todo:illest-saw&enbc
  • Loading branch information
rye-rice committed Jan 8, 2024
commit f55fd1ab347975618fa44211abb68aca789bbe29
10 changes: 5 additions & 5 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@
/obj/item/gun/ballistic/shotgun/automatic/combat{
pixel_y = 5
},
/obj/item/gun/ballistic/revolver/montagne{
/obj/item/gun/ballistic/revolver/ashhand{
pixel_y = -1
},
/turf/open/floor/plasteel/tech,
Expand Down Expand Up @@ -1760,13 +1760,13 @@
pixel_x = -3;
pixel_y = -5
},
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/n762,
/obj/item/ammo_box/a357,
rye-rice marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/ammo_box/a357,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/n762,
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/security)
"vr" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/deprecated/Ships/minutemen_carina.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2583,10 +2583,10 @@
/obj/item/stamp/captain{
name = "bridge officer's rubber stamp"
},
/obj/item/disk/design_disk/ammo_n762,
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/n762_clip,
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/gun/ballistic/revolver,
/obj/structure/closet/secure_closet/wall{
dir = 4;
icon_door = "solgov_wall";
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8951,7 +8951,7 @@
"hra" = (
/obj/structure/table/reinforced,
/obj/item/storage/lockbox/loyalty,
/obj/item/gun/ballistic/automatic/assault/ar,
/obj/item/gun/energy/e_gun/hades,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel,
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/minutemen/minutemen_asclepius.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4439,8 +4439,8 @@
/obj/item/healthanalyzer/advanced,
/obj/item/clothing/neck/cloak/cmo,
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
/obj/item/reagent_containers/hypospray/CMO,
/obj/item/ammo_box/n762,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/minutemen/minutemen_cepheus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@
/obj/item/clothing/shoes/cowboy/white,
/obj/item/storage/belt/sabre,
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/a357,
/obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/pirate/pirate_ember.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5597,11 +5597,11 @@
/area/ship/engineering/incinerator)
"Bx" = (
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/revolver/montagne{
/obj/item/gun/ballistic/revolver{
pixel_y = 6
},
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/gun/ballistic/revolver/montagne{
/obj/item/gun/ballistic/revolver,
/obj/item/gun/ballistic/revolver{
pixel_y = -5
},
/obj/effect/turf_decal/techfloor{
Expand All @@ -5615,7 +5615,7 @@
/area/ship/security/armory)
"By" = (
/obj/structure/guncase,
/obj/item/gun/ballistic/automatic/smg/thompson{
/obj/item/gun/ballistic/automatic/smg/firestorm{
pixel_y = -3
},
/obj/effect/turf_decal/techfloor{
Expand Down Expand Up @@ -9001,7 +9001,7 @@
pixel_y = 2;
pixel_x = -4
},
/obj/item/ammo_box/magazine/smgm45/drum{
/obj/item/ammo_box/magazine/c45_firestorm_mag/pan{
pixel_y = -4
},
/obj/item/ammo_box/magazine/smgm45,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/roumain/srm_glaive.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2836,7 +2836,7 @@
},
/obj/item/circuitboard/machine/rdserver,
/obj/item/circuitboard/machine/autolathe,
/obj/item/disk/design_disk/ammo_n762,
/obj/item/ammo_box/c38_box,
/obj/item/disk/design_disk/ammo_1911,
/obj/item/circuitboard/machine/protolathe/department/ballistics,
/obj/item/circuitboard/computer/rdconsole,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/storage/concrete/pockets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
. = ..()
var/static/list/exception_cache = typecacheof(list(
/obj/item/katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana,
/obj/item/energy_katana, /obj/item/gun/ballistic/automatic/smg/thompson/drum
/obj/item/energy_katana, /obj/item/gun/ballistic/automatic/smg/firestorm/pan
))
exception_hold = exception_cache

Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -689,17 +689,17 @@

/obj/item/storage/belt/bandolier
name = "bandolier"
desc = "A bandolier for holding shotgun ammunition."
desc = "A bandolier for holding ammunition. Does not hold magazines"
icon_state = "bandolier"
item_state = "bandolier"

/obj/item/storage/belt/bandolier/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 18
STR.max_items = 40
STR.display_numerical_stacking = TRUE
STR.set_holdable(list(
/obj/item/ammo_casing/shotgun
/obj/item/ammo_casing
))

/obj/item/storage/belt/fannypack
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@

if("made_man")
new /obj/effect/spawner/lootdrop/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
new /obj/item/gun/ballistic/automatic/smg/thompson/drum(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
new /obj/item/gun/ballistic/automatic/smg/firestorm/pan(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
new /obj/item/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) // 5 TC, free molotov assemblies
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/outfits/ert/frontiersmen_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
ears = /obj/item/radio/headset/pirate/alt/captain
back = /obj/item/storage/backpack/satchel/leather
suit = /obj/item/clothing/suit/armor/frontier
suit_store = /obj/item/gun/ballistic/revolver/montagne
suit_store = /obj/item/gun/ballistic/revolver
belt = /obj/item/storage/belt/military/assault

backpack_contents = list(/obj/item/ammo_box/n762_clip=3, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
backpack_contents = list(/obj/item/ammo_box/a357=3, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)

id_role = "Officer"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
r_hand = /obj/item/gun/ballistic/automatic/smg/thompson/drum
r_hand = /obj/item/gun/ballistic/automatic/smg/firestorm/pan
id = /obj/item/card/id

/datum/outfit/mobster/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/hostile/frontiersman.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
icon_state = "frontiersmanranged"
icon_living = "frontiersmanranged"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
/obj/item/gun/ballistic/revolver/montagne)
/obj/item/gun/ballistic/revolver)
ranged = 1
retreat_distance = 5
minimum_distance = 5
projectilesound = 'sound/weapons/gun/revolver/shot.ogg'
casingtype = /obj/item/ammo_casing/n762_38
casingtype = /obj/item/ammo_casing/a357

/mob/living/simple_animal/hostile/frontier/ranged/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)
Expand Down
9 changes: 0 additions & 9 deletions code/modules/projectiles/ammunition/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@
desc = "A .45-70 explosive bullet casing."
projectile_type = /obj/projectile/bullet/a4570/explosive

// 7.62x38mmR (Nagant Revolver)

/obj/item/ammo_casing/n762_38
name = "7.62x38mmR bullet casing"
desc = "A 7.62x38mmR bullet casing."
caliber = "7.62x38mmR"
projectile_type = /obj/projectile/bullet/n762


// .38 Special (Colt Detective Special & Winchester)

/obj/item/ammo_casing/c38
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammunition/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
projectile_type = /obj/projectile/beam/laser/weak/negative_ap
e_cost = 799 //12 shots with a normal power cell, 25 with an upgraded
select_name = "kill"
delay = 0.2 SECONDS
delay = 0.1 SECONDS

/obj/item/ammo_casing/energy/lasergun/old
projectile_type = /obj/projectile/beam/laser
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammunition/energy/stun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@
/obj/item/ammo_casing/energy/disabler/smg
projectile_type = /obj/projectile/beam/disabler/weak/negative_ap
e_cost = 330
delay = 0.2 SECONDS
delay = 0.1 SECONDS
33 changes: 6 additions & 27 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,44 +24,30 @@
// .45-70 Ammo Holders (Hunting Revolver)

/obj/item/ammo_box/a4570
name = "ammo holder (.45-70)"
desc = "A 6-round ammo holder for .45-70 revolvers. These rounds do significant damage with average performance against armor."
name = "ammo box (.45-70)"
desc = "A box of top grade .45-70 ammo. These rounds do significant damage with average performance against armor."
icon_state = "4570"
ammo_type = /obj/item/ammo_casing/a4570
max_ammo = 6
multiple_sprites = AMMO_BOX_PER_BULLET
item_flags = NO_MAT_REDEMPTION
w_class = WEIGHT_CLASS_TINY
instant_load = TRUE
max_ammo = 12

/obj/item/ammo_box/a4570/match
name = "ammo holder (.45-70 match)"
desc = "A 6-round ammo holder for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
icon_state = "4570-match"
ammo_type = /obj/item/ammo_casing/a4570/match

/obj/item/ammo_box/a4570/hp
name = "ammo holder (.45-70 hollow point)"
desc = "A 6-round ammo holder for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones."
icon_state = "4570-hp"
ammo_type = /obj/item/ammo_casing/a357/hp

/obj/item/ammo_box/a4570/explosive
name = "ammo holder (.45-70 explosive)"
desc = "A 6-round ammo holder for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs."
icon_state = "4570-explosive"
ammo_type = /obj/item/ammo_casing/a4570/explosive

// 7.62x38mmR Ammo Holders (Nagant Revolver)

/obj/item/ammo_box/n762_clip
name = "ammo holder (7.62x38mmR)"
desc = "A 7-round ammo holder for the Nagant revolver. These rounds do good damage, but struggle against armor."
icon_state = "n762"
ammo_type = /obj/item/ammo_casing/n762_38
max_ammo = 7
multiple_sprites = AMMO_BOX_PER_BULLET
item_flags = NO_MAT_REDEMPTION
w_class = WEIGHT_CLASS_TINY
instant_load = TRUE

// .38 special Speed Loaders (Colt Detective Special)

/obj/item/ammo_box/c38
Expand Down Expand Up @@ -347,13 +333,6 @@
multiple_sprites = AMMO_BOX_PER_BULLET
w_class = WEIGHT_CLASS_NORMAL

/obj/item/ammo_box/n762
name = "ammo box (7.62x38mmR)"
icon_state = "n762box"
desc = "A box of unusual revolver ammunition with the bullet seated below the mouth of the cartridge."
ammo_type = /obj/item/ammo_casing/n762_38
max_ammo = 28

/obj/item/ammo_box/a762_39
name = "ammo box (7.62x39mm)"
icon_state = "a762_39box"
Expand Down
9 changes: 9 additions & 0 deletions code/modules/projectiles/boxes_magazines/external/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,12 @@
/obj/item/ammo_box/magazine/e40/update_icon_state()
. = ..()
icon_state = "e40_mag-[!!ammo_count()]"

/obj/item/ammo_box/magazine/vickland_a308 //this is a magazine codewise do nothing breaks
name = "en bloc clip (.308)"
desc = "A 8-round en bloc clip for the Vickland Battle Rifle. These rounds do good damage with significant armor penetration."
icon_state = "enbloc_303"
ammo_type = /obj/item/ammo_casing/a308
max_ammo = 8
multiple_sprites = AMMO_BOX_PER_BULLET
w_class = WEIGHT_CLASS_TINY
25 changes: 19 additions & 6 deletions code/modules/projectiles/boxes_magazines/external/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,29 @@
. = ..()
icon_state = "c20r45-[round(ammo_count(),2)]"

/obj/item/ammo_box/magazine/smgm45/drum
name = "drum magazine (.45)"
desc = "A bulky, 50-round drum magazine for .45 submachine guns. These rounds do moderate damage, but struggle against armor."
icon_state = "drum45"
/obj/item/ammo_box/magazine/c45_firestorm_mag
name = "stick magazine (.45)"
desc = "A 28-round stick magazine for the toploading Firestorm submachine gun. These rounds do moderate damage, but struggle against armor."
icon_state = "firestorm_mag"
base_icon_state = "firestorm_mag"
ammo_type = /obj/item/ammo_casing/c45
caliber = ".45"
max_ammo = 28

/obj/item/ammo_box/magazine/c45_firestorm_mag/update_icon_state()
. = ..()
icon_state = "firestorm_mag-[!!ammo_count()]"

/obj/item/ammo_box/magazine/c45_firestorm_mag/pan
name = "pan magazine (.45)"
desc = "A bulky, 50-round pan magazine for the toploading Firestorm submachine gun. These rounds struggle against armor, but with this many you could cut anyone down regardless."
icon_state = "firestorm_pan"
max_ammo = 50
w_class = WEIGHT_CLASS_NORMAL

/obj/item/ammo_box/magazine/smgm45/drum/update_icon_state() //Causes the mag to NOT inherit the parent's update_icon oooh the misery
/obj/item/ammo_box/magazine/c45_firestorm_mag/pan/update_icon_state() //Causes the mag to NOT inherit the parent's update_icon oooh the misery
. = ..()
icon_state = "drum45"
icon_state = "firestorm_pan"

/obj/item/ammo_box/magazine/pistol556mm
name = "handgun magazine (5.56mm HITP caseless)"
Expand Down
44 changes: 28 additions & 16 deletions code/modules/projectiles/guns/ballistic/assault.dm
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,6 @@
icon_state = "cm16"
item_state = "cm16"

/obj/item/gun/ballistic/automatic/assault/ar
name = "\improper NT-ARG 'Boarder'"
desc = "A burst-fire 5.56mm carbine occasionally found in the hands of Nanotrasen marines."
fire_sound = 'sound/weapons/gun/rifle/shot_alt2.ogg'
icon_state = "arg"
item_state = "arg"
slot_flags = 0
mag_type = /obj/item/ammo_box/magazine/p16
can_suppress = FALSE
burst_size = 3
fire_delay = 1

/obj/item/gun/ballistic/automatic/assault/ar/ComponentInitialize()
. = ..()
AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)

/obj/item/gun/ballistic/automatic/assault/swiss_cheese
name = "\improper Swiss Cheese"
desc = "An ancient longarm famous for its boxy, modular design. The DMA on this unit is, sadly, broken. Uses 5.56mm ammunition for Matter mode."
Expand Down Expand Up @@ -312,3 +296,31 @@
w_class = WEIGHT_CLASS_NORMAL
ammo_type = list(/obj/item/ammo_casing/energy/laser/assault)
fire_delay = 2

//techinically a battle rifle, i'm putting it here for organisation sake

/obj/item/gun/ballistic/automatic/vickland
name = "\improper Vickland"
desc = "The pride of the Saint-Roumain Militia, the Vickland is a semi-automatic battle rifle produced by Hunter's Pride exclusively for SRM use. Its higher cost makes it uncommon even in SRM service. Chambered in .308."
icon = 'icons/obj/guns/48x32guns.dmi'
fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
icon_state = "vickland" //weapon designer: @Apogee-dev
item_state = "vickland"
empty_autoeject = TRUE
weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_BULKY
mag_type = /obj/item/ammo_box/magazine/vickland_a308
fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
burst_size = 0
actions_types = list()
manufacturer = MANUFACTURER_HUNTERSPRIDE

rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
eject_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
eject_empty_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
eject_sound_vary = FALSE

spread_unwielded = 25
recoil = 0
recoil_unwielded = 4
wield_slowdown = 0.75
Loading
Loading