Commit Graph

528 Commits

Author SHA1 Message Date
Cyrelius
1c447bd7af Update energy.dm
Discussion with Raz, increased range on phase weapons.
2023-01-22 17:05:11 -08:00
Heroman3003
e9c2487299 Merge pull request #14290 from VOREStation/upstream-merge-8851
[MIRROR] Maintenance on Hydro code, specifically vines and bees.
2023-01-04 02:56:23 +00:00
Razgriz
2b204b9194 Port old point defense stuff I rage-closed
Tech-debt repo-man called
https://github.com/CHOMPStation2/CHOMPStation2/pull/1790
2022-10-02 21:39:21 -07:00
Victor Zisthus
245591be95 Shuttle/Voidcraft Hotfix
Updates Shuttlecraft and Voidcraft to be visible by bullet penetration code. Things designed to fly in space at high speeds with lots of little rocks present are not gonna feel bullets all that much.
2022-07-03 23:06:28 -04:00
Rykka
d3962b086b Sets Vepr to laser_overcharge HUD state. 2022-04-10 09:11:46 -06:00
Rykka
50b98e7f35 Remove CHOMPEdit codes + _ch files added, given upstream ports in progress
As stated, per maintainer/headmin request (and common sense).
2022-04-10 09:04:18 -06:00
Rykka
26fbd5e3cb TGMC Final Commit - Fixes Ammo Count + symbols + Medigun/Curabitur
Changes:
- Code copied over to hud.dm and commented out, to prep for upstream pull.
- Commented-out, unused code removed.
- CHOMPEdits removed, pending upstream PR.
- Medigun no longer shows 2x the actual ammo loaded.
- Curabitur now fetches the amount of shots correctly, bar 1 extra for some reason.
- Curabitur ammo updates on automatic recharge ticks.
- A ton of projectile get_ammo_count optimization - mostly swaps the massive if/else for for loops. Fixes multiple guns not getting ammo properly, now casings won't register as ammo unless they have a shell in the casing.
- hud_state_empty defined as base on all bullets.
- Corrects energy weapons missing a hud_state_empty.
- Gives Ion weapons a hud_state_empty

All changes have been tested, and bar the Curabitur having an extra shot for ??? reason, which is a base bug I've yet to fix, this is entirely ready for testmerge.
2022-04-10 09:04:18 -06:00
Rykka
92ccb52ca7 Multiple Testing Fixes
- Fixes all projectile guns not having an empty state after unloading the gun via various methods
- Fixes stun revolver not having an empty sprite
- Fixes self-charging guns not updating ammo counts

Still needing fixes:
- Revolvers do not update ammo counts after firing, only on emptying the gun/adding new shells.
2022-04-10 09:04:18 -06:00
Rykka
f84c9d720f Fixes issues with HUDs not updating
Forces updates upon cycling the next round.
Fixes Chambered casings still counting for ammo despite having no associated projectile. Because for ~realism~ the casing has a BB var that determines if we currently have a bullet available to fire.
Adds rocket states for our ONE measly rocket launcher.
Phasers will now update their ammunition count on every single pump.
2022-04-10 09:04:18 -06:00
Rykka
7cedcee7bc Fixes Compile time errors 2022-04-10 09:04:18 -06:00
Rykka
0cdd2da44c Adds hud_states to almost all weaponry, credit to Serdy
Reshuffles files to match Polaris
2022-04-10 09:04:18 -06:00
Rykka
85e69ffba4 Progress Commit 2 - Energy Gun HUD works, starting Projectiles
Saving progress to resume later.
2022-04-10 09:03:20 -06:00
Ocelot
114dbb73a3 more gun tweaks
added nonlethal magazines, magazines that were missing, changed a few things, and added the Colt SAA.
2022-04-08 07:08:39 -04:00
Casey
51bd77e5c2 Firearms 1 2022-03-26 03:56:42 +00:00
Casey
acf0aa858d Merge pull request #12421 from GhostActual/Donk-Co.-Toys
Foam Dart Fix
2022-03-12 17:29:48 +00:00
Razgriz
c09ad1baa9 powder that makes you say yes and hate the map changes 2022-03-04 15:23:33 -07:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
BlackMajor
ef9e2919db forgot about the importance of inheritance 2022-02-14 17:09:51 +13:00
BlackMajor
b950be88fa Removes baymiss 2022-02-13 20:29:26 +13:00
Casey
a8d3dce15f Merge pull request #12122 from VOREStation/upstream-merge-8385
[MIRROR] Adds caseless BB rounds for common gun types
2022-02-03 06:28:45 +00:00
Nadyr
656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs
Porting a hefty chunk of Citadel mobs.
2022-01-29 17:09:18 -05:00
Nadyr
c70ed31f40 Merge pull request #3446 from CHOMPStation2/upstream-merge-11841
[MIRROR] Somatoray Modularity
2021-12-12 05:27:18 -05:00
Casey
9c7d030128 Somatoray Modularity 2021-12-10 04:33:32 +00:00
Casey
c0cc81fbae SD QOL update 2021-12-10 03:21:22 +00:00
BlackMajor
a3bb4b9b5a Early pr 2021-11-26 15:35:21 +13:00
Verkister
98df2abae2 Update explosive.dm 2021-11-11 22:15:01 +02:00
Verkister
6a814f53ac Earlyports rocket launcher fix
Launcher type guns throw the projectile instead of firing it via the advanced rng bullet spaghetti so the projectile had no idea how to go boom.
2021-11-11 22:06:48 +02:00
Cadyn Bombaci
4b5d036662 WIP new guns 2021-09-26 10:28:09 -07:00
Razgriz
2ff1958668 More armor pen and buckshot damage 2021-08-12 22:20:36 -07:00
Razgriz
82c5881e28 Bullet penetration update
We don't need big penetration anymore because we are not using the damage system.
2021-08-12 22:02:54 -07:00
Razgriz
5d23c0d5b6 Bring back ballistics
Now with ez "use old damages" change.
2021-08-12 21:45:10 -07:00
Chompstation Bot
b85c5de137 Xenomorph Overhaul and fixes from Gurgstation 2021-07-20 01:06:44 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Razgriz
cb23172621 Merge pull request #2256 from CHOMPStationBot/upstream-merge-10714
[MIRROR] stops handbow changes overiding engery bow
2021-06-21 02:24:14 -07:00
Razgriz
a1fa2882a2 Expand list of SA_Vulnerability for the phase projectile
Added MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION, MOB_CLASS_HUMANOID
2021-06-21 02:09:48 -07:00
Chompstation Bot
5160052a5d stops handbow changes overiding engery bow 2021-06-20 21:44:15 +00:00
Razgriz
2837de2bb3 Add files via upload 2021-06-19 20:24:41 -07:00
Novacat
fafe1bc65c Merge pull request #10657 from TheDavestDave/phaser-handbow
adds the phaser handbow
2021-06-17 19:50:01 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
1660fe9ff8 [MIRROR] phoron bore stock parts now affect range, along with other bits 2021-05-23 22:29:10 +00:00
Razgriz
40b77f37e4 Update beams_vr.dm 2021-04-30 22:22:31 -07:00
Chompstation Bot
eff2f9f68b The Armory V1 2021-04-26 16:52:51 +00:00
Razgriz
241c6447c8 Update beams.dm 2021-04-21 21:48:30 -07:00
Chompstation Bot
147887545f [MIRROR] Practice/Lasertag weapons no longer excavate 2021-04-21 06:31:39 +00:00
Razgriz
c446790d4f Merge pull request #1234 from cadyn/ballistics-v4
Ballistics v4
2021-02-06 22:59:44 -07:00
Sym
9b69e4ab34 Clean the addition
Oh god I forgot to update the branch before I did all this stuff.
2021-02-05 00:16:11 -05:00
Sym
da52aa33cc Updoot?
Oh god what is it doing
2021-02-05 00:02:34 -05:00