Commit Graph

1841 Commits

Author SHA1 Message Date
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
Razgriz
042366372e Merge pull request #5018 from CHOMPStation2/I-Will-Give-You-500-Dollars-to-fuck-off-conflicts
[Manual MIRROR] Adds a ton more altevian stuff
2022-09-22 22:24:16 -07:00
Razgriz
4b24086042 powder that makes you say yes 2022-09-22 21:55:43 -07:00
Razgriz
6bbcda4901 [Manual MIRROR] Adds a ton more altevian stuff
Ports https://github.com/VOREStation/VOREStation/pull/13774 instead of the auto mirror because github was crying over conflicts with a .dmi file
2022-09-22 21:32:28 -07:00
Novacat
06014fb014 Removes last references to simple_animal 2022-09-10 20:54:36 +00:00
Razgriz
36ec46103e powder that makes you say yes 2022-08-17 01:27:20 -07:00
Casey
6869732e32 adds cool and fun and totally balanced new weapon 2022-08-07 19:35:59 +00:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00
Casey
dda05e9aa7 Lucky 7 Casino and Restaurant 2022-07-12 06:03:43 +00: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
Bib Bob
90fc75333c powder that makes you say yes? 2022-06-29 19:25:45 -05:00
Nadyr
a1a074cd80 powder that makes you say yes 2022-06-29 20:11:36 -04:00
Nadyr
7f856931e0 powder that makes you say yes 2022-06-29 19:13:55 -04:00
Casey
6ab64ba666 Implements all-species positive and negative traits 2022-06-29 06:01:30 +00:00
Bib Bob
4b87ad705d Fixes missing sprites for the somatoray and advanced SMG
Fine. I'll do it myself. Literally 1 line of code change fixes the invisible sprites, because all the gun DMI files are all over the place instead of a parent file anymore.

I tried to fix the WT-550 sprites too but I cant read the code and I AINT touching parent files any time soon.
2022-06-28 21:00:39 -05:00
Bib Bob
5986fea6b3 Fixes missing sprites for the somatoray and advanced SMG
Fine. I'll do it myself. Literally 1 line of code change fixes the invisible sprites, because all the gun DMI files are all over the place instead of a parent file anymore.

I tried to fix the WT-550 sprites too but I cant read the code and I AINT touching parent files any time soon.
2022-06-28 20:30:20 -05:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
5fac79aa3c Merge pull request #13104 from foopwo/tasey
Makes security cyborg taser cost the same charge as security's tasers.
2022-06-19 01:00:38 +00:00
Rykka
553f1bba47 Missing Gun Sprite Fixes
- Fixes C20R missing sprite when empty
- Fixes Z8/Z9 missing sprite when empty
- Fixes Laser Cannon not having a sprite at all
- Fixes Xray Laser not having a sprite at all
- Fixes Anti-Particle Weapons (yes all of them) not having sprites
- Fixes Alien Pistol missing sprite + missing beam
- Fixes Mini-Uzi missing sprite when magazine removed/empty

Fixes https://github.com/CHOMPStation2/CHOMPStation2/issues/4101
2022-05-21 17:17:12 -06:00
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys
Adds a couple of new toys for cyborgs.
2022-05-15 20:15:29 +00:00
LordSaladin
b443ea1cb8 fixes the laws of thermodynamics for .45 LC i hope
god imagine having to add mat values for all of these other bullets
2022-05-05 16:36:49 +01:00
Nadyr
f3bdb597b8 Merge pull request #4124 from CHOMPStation2/upstream-merge-12796
[MIRROR] Particle Gun Fix
2022-04-23 18:10:04 -04:00
Casey
e3b147f3c3 Vision and Phaser Bug Fixes 2022-04-22 22:43:10 +00:00
LordSaladin
5fa1cfaa28 adds .45 LC to the autolathes
now you can be a real space cowboy
2022-04-20 19:45:16 +01:00
Casey
24e8977281 Particle Gun Fix 2022-04-20 08:25:42 +00:00
Casey
0a447ad26f Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean
Xenobio Upgrades
2022-04-11 19:24:32 +00: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
ce6f0e568c Makes Projectile Ammo HUD code work!
Now to just get all the boolets to have `hud_state`s set. D:
2022-04-10 09:03:20 -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
Razgriz
9e5859f667 No recoil for toy guns 2022-04-09 19:42:33 -07:00
Razgriz
23930aac17 Merge pull request #4036 from SilencedMP5A5/ocelot_do_a_thing
More gun tweaks
2022-04-09 14:06:30 -07:00
Ocelot
fc6c0038fe oops
forgot a few things
2022-04-08 07:30:51 -04: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
Rykka
ad1c39ce86 I forgot two vars 2022-04-07 04:03:20 -06:00
Rykka
22c27abf06 Finishes Serdy's Gun PR stuff
Uzi uses new sprite + tilts now.
Sec pistols use new sprite
Energy Gun uses new sprite.
C20r uses new sprite.
L6 SAW uses new sprite.
Ion Rifle uses new sprite.
Z8 Bulldog uses new sprite.
WT-550 uses new sprite.

Resolves https://github.com/CHOMPStation2/CHOMPStation2/issues/3068

Serdy will add Stetchkin, PPK + PPK Light later.
2022-04-07 03:53:43 -06:00
Ocelot
77d7259a59 fuck 2 electric boogaloo
gun gun gun gun gun
2022-04-06 11:26:19 -04:00
Ocelot
a6146a70af fuck
asfhdfhjfj gun
2022-04-06 10:29:29 -04:00
Ocelot
d4f24ccc2a Guns 3: The un-oofening
see https://github.com/CHOMPStation2/CHOMPStation2/issues/3068 for a general idea of what i fixed
2022-04-06 10:10:11 -04:00
Razgriz
f1e4f67bd8 Change size recoil to 60 2022-04-01 22:56:44 -07:00
Razgriz
c6316b6156 Unfuck sawed off shotgun sprites because we have better sprites
Virgo hardcoded sprite recolors.
2022-03-30 14:07:32 -07:00
Razgriz
0f4f9e67d5 re-add a chomp change from original file 2022-03-27 00:25:49 -07:00
Razgriz
bccde2328a powder that makes you say yes 2022-03-27 00:20:39 -07:00
Casey
51bd77e5c2 Firearms 1 2022-03-26 03:56:42 +00:00