Heroman3003
077834dd5c
[MIRROR] Tiny grammar tweaks
2023-01-30 08:51:26 +00: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
Bib Bob
90fc75333c
powder that makes you say yes?
2022-06-29 19:25:45 -05: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
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
0a447ad26f
Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean
...
Xenobio Upgrades
2022-04-11 19:24:32 +00:00
Rykka
7cedcee7bc
Fixes Compile time errors
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
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
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
Casey
51bd77e5c2
Firearms 1
2022-03-26 03:56:42 +00:00
Razgriz
cc76be7960
Merge pull request #3898 from CHOMPStation2/upstream-merge-12499
...
[MIRROR] Shotguns and Bolt-Action Rifles
2022-03-24 18:40:20 -07:00
Razgriz
4d9a914f8c
powder that makes you say yes
2022-03-24 18:25:14 -07:00
Casey
12c80b9aeb
Merge pull request #12506 from BonniePandora/Comp-shotgun-updoot
...
Overhauls the warden's compact shotgun stock-folding
2022-03-22 03:01:04 +00:00
Nadyr
d4b9afdef7
powder that makes you say yes
2022-03-21 14:13:57 -04:00
Nadyr
4ffd7ae53f
powder that makes you say yes
2022-03-21 14:12:35 -04:00
Casey
dc618675c1
Shotguns and Bolt-Action Rifles
2022-03-21 09:54:13 +00:00
Casey
8e0552a788
Colts, Revolvers, and Tasers
2022-03-20 03:10:23 +00:00
Casey
2b3bb75044
Merge pull request #12449 from BonniePandora/Warden's-delight
...
Adds a choice between shotguns available to wardens.
2022-03-18 19:34:18 +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
6b4ccac9db
many more fixes
2021-12-14 02:22:21 +13:00
BlackMajor
4b247c48d4
fix a couple of missing icons
2021-12-10 16:07:53 +13:00
BlackMajor
dbb5a4083b
more progress
2021-12-07 01:46:21 +13:00
BlackMajor
636659d6a7
icon fix
2021-11-27 09:38:32 +13:00
BlackMajor
a3bb4b9b5a
Early pr
2021-11-26 15:35:21 +13:00
Cadyn Bombaci
576545ef47
fix
2021-09-26 10:48:54 -07:00
Cadyn Bombaci
b55c94da13
linter
2021-09-26 10:37:24 -07:00
Cadyn Bombaci
1fa43a5406
compiler fixes
2021-09-26 10:35:18 -07:00
Cadyn Bombaci
4b5d036662
WIP new guns
2021-09-26 10:28:09 -07:00
Aronai Sieyes
680587480a
Merge pull request #11449 from VOREStation/upstream-merge-8182
...
[MIRROR] New Shotguns/Rifles
2021-08-24 23:59:42 +00:00
Rykka
096b64ffb1
Changes all pistols to move_delay = 0 via CHOMPEdits
...
Some of these are probably redundant, I did this quickly in response to a request so it could get in before an event.
I'll do a more thorough move_delay lookover later and determine what weapons should be fire-able on the move vs not.
2021-08-18 14:59:37 -07:00
Rykka
54b0844ff4
Adds custom firing sounds for weapons - Serdy's Request
...
AKM Variants all use ak74.ogg
Glock uses 9mmpistol.ogg
VP70 uses 40pistol.ogg
Molniya uses molniyab.ogg
Plamya uses plamya.ogg
SKS uses sks.ogg
Type 901 uses type901.ogg
Vityaz uses vityaz.ogg
2021-08-18 14:07:26 -07:00
Nadyr
47c017bbc0
Merge pull request #2785 from CHOMPStation2/BallisticsAgain
...
Ballistics again
2021-08-14 21:50:46 -04:00
Razgriz
5d23c0d5b6
Bring back ballistics
...
Now with ez "use old damages" change.
2021-08-12 21:45:10 -07:00
Razgriz
dddeb35523
I used the shotgun
2021-08-12 21:11:09 -07:00
Chompstation Bot
9acfa8fcca
SMART Rifle
2021-08-05 21:48:45 +00:00
