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

Adding additional rounds to the smart gun. Round two. #147

Closed
wants to merge 47 commits into from
Closed
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
603f398
APC buffs
Kirshbia Feb 16, 2024
720f7f7
Update apc_wheels.dm
Kirshbia Feb 17, 2024
3109921
Update apc_wheels.dm
Kirshbia Feb 17, 2024
fa8da5c
Update tank.dm
Kirshbia Feb 18, 2024
c328157
Update dualcannon_ammo.dm
Kirshbia Feb 18, 2024
951589d
Update apc_wheels.dm
Kirshbia Feb 18, 2024
c689e7d
Update dual_cannon.dm
Kirshbia Feb 18, 2024
842e6c6
Update frontal_cannon.dm
Kirshbia Feb 18, 2024
948da72
Update dual_cannon.dm
Kirshbia Feb 18, 2024
d66477e
Update dual_cannon.dm
Kirshbia Feb 18, 2024
7b109bf
Hm
Kirshbia Feb 18, 2024
07d3a2c
Stuff
Kirshbia Feb 18, 2024
394dec6
Flare launcher and APC armor adjustment
Kirshbia Feb 18, 2024
46cdc32
Increase to Re-re cannon frontal rate
Kirshbia Feb 19, 2024
2cdd9d3
Merge branch 'master' into master
Kirshbia Feb 20, 2024
50f58b4
Merge branch 'PvE-CMSS13:master' into master
Kirshbia Feb 27, 2024
4c70688
PullingIncrease to Re-re cannon frontal rate
Kirshbia Feb 27, 2024
6d861b0
Revert "PullingIncrease to Re-re cannon frontal rate"
Kirshbia Feb 27, 2024
cad6882
Merge branch 'master' of https://github.com/Kirshbia/PvE-CMSS13
Kirshbia Feb 27, 2024
ca8d248
Synching
Kirshbia Feb 27, 2024
0d3f8a6
Tonk buffs
Kirshbia Feb 28, 2024
1e55108
Merge branch 'master' into master
Kirshbia Feb 28, 2024
84be84e
Update hardpoint.dm
Kirshbia Feb 28, 2024
6086bb0
Update tank.dm
Kirshbia Mar 1, 2024
bb413be
Update rocket.dm
Kirshbia Mar 1, 2024
61be86c
Update ltb_ammo.dm
Kirshbia Mar 1, 2024
b8f1faa
Update ltb.dm
Kirshbia Mar 1, 2024
cc12100
Update minigun.dm
Kirshbia Mar 1, 2024
35a9001
Update secondary.dm
Kirshbia Mar 1, 2024
4f01566
Update tow.dm
Kirshbia Mar 1, 2024
d27e354
Buffs to armor and other support modules that Kirsh forgot existed.
Kirshbia Mar 1, 2024
5338390
Increasing mag sizes of hard points
Kirshbia Mar 1, 2024
d6de36c
Update tank.dm
Kirshbia Mar 2, 2024
ecd3865
Update ltb.dm
Kirshbia Mar 2, 2024
4c81c6d
Update tow.dm
Kirshbia Mar 2, 2024
c0b5d23
Merge branch 'master' of https://github.com/Kirshbia/PvE-CMSS13
Kirshbia Mar 2, 2024
752d9d7
Update ballistic.dm
Kirshbia Mar 2, 2024
200772c
Merge branch 'master' into master
Kirshbia Mar 2, 2024
fbd0e39
Slight increase to tonk movement
Kirshbia Mar 3, 2024
7d8a037
Adjusting to the ACE. Tuned down it's damage and armor pen to keep th…
Kirshbia Mar 5, 2024
03cd972
Merge branch 'master' into master
Kirshbia Mar 8, 2024
13274ab
Changed to tank treads, made the tank a bit faster and need one less …
Kirshbia Mar 8, 2024
ea959ce
not that
morrowwolf Mar 11, 2024
3a7bd5e
I got it
morrowwolf Mar 11, 2024
a63bd84
Smartgun change
Kirshbia Mar 12, 2024
4760572
Merge branch 'master' of https://github.com/Kirshbia/PvE-CMSS13
Kirshbia Mar 12, 2024
7b111e7
Merge branch 'PvE-CMSS13:master' into master
Kirshbia Mar 12, 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
6 changes: 6 additions & 0 deletions code/modules/projectiles/guns/smartgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
reload_sound = 'sound/weapons/handling/gun_sg_reload.ogg'
unload_sound = 'sound/weapons/handling/gun_sg_unload.ogg'
current_mag = /obj/item/ammo_magazine/smartgun

accepted_ammo = list(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, no, that won't work.

SG uses var/datum/ammo/ammo_primary and var/datum/ammo/ammo_secondary to define what ammo to shoot, so you might want to somehow tie these vars to loaded mags

Copy link
Contributor

@FslashN FslashN Mar 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is correct. You could also remove the ammo switching (the toggle function) all-together, as it doesn't make any logical sense anyway. It's a PvP holdout.

/obj/item/ammo_magazine/smartgun,
/obj/item/ammo_magazine/smartgun/holo_targetting,
/obj/item/ammo_magazine/smartgun/dirty,
)
flags_equip_slot = NO_FLAGS
w_class = SIZE_HUGE
force = 20
Expand Down
Loading