cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,002 Commits 5 Branches 0 Tags
22c27abf0688a2dfb3fa85d1f5bc6e6e397060e8
Commit Graph

1800 Commits

Author SHA1 Message Date
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
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
54146258ec Micro recoil from 51% to 70% 
Because 51 is memes and wierd number and we have size traits now that make you smaller.
 2022-03-17 23:36:29 -07:00
Casey
acf0aa858d Merge pull request #12421 from GhostActual/Donk-Co.-Toys 
Foam Dart Fix
 2022-03-12 17:29:48 +00:00
Casey
4fbfc78cde fixes a few typos 2022-03-06 18:36:40 -05: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
Nadyr
1d27bf55c1 Merge pull request #3604 from CHOMPStation2/upstream-merge-12122 
[MIRROR] [MIRROR] Adds caseless BB rounds for common gun types
 2022-02-03 22:48:48 -05: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
Cyrelius
6ecaa54625 Update phase.dm 
Add chompedit tags as requested.
 2022-01-29 21:00:25 -08:00
Cyrelius
008bf33299 Merge branch 'CHOMPStation2:master' into master 2022-01-29 16:38:44 -08: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
Cyrelius
b9cd1eddfe Update phase.dm 
Make the borg phase rifle not awful, hopefully.
 2022-01-17 12:35:26 -08:00
Cyrelius
d8a8bb736c Robot Taser buff 
The taser is trash, and this'll help it a bunch.
 2022-01-02 04:01:28 -08:00
Verkister
0014d6a6e6 Adds Honk-Hound 
Absolutely cursed in all the right ways~

Also fixed the regular confetti cannon's flaccid throwing performance while at it.
 2021-12-31 02:40:35 +02:00
BlackMajor
6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
Nadyr
3b0e00531d Merge pull request #3313 from CHOMPStation2/upstream-merge-11991 
[MIRROR] Makes bluespace harpoon capable of televore
 2021-12-12 06:25:11 -05:00
Nadyr
5534d7e403 powder that makes you say yes 2021-12-12 06:16:15 -05:00
Nadyr
c70ed31f40 Merge pull request #3446 from CHOMPStation2/upstream-merge-11841 
[MIRROR] Somatoray Modularity
 2021-12-12 05:27:18 -05:00
Razgriz
783c579b36 powder that makes you say yes 2021-12-10 01:27:04 -07:00
CHOMPStation2
1e358f9752 powder that makes you say yes 2021-12-10 00:17:29 -07: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
4b247c48d4 fix a couple of missing icons 2021-12-10 16:07:53 +13:00
Casey
3ff1fc8beb You can't eat yourself, charlie brown! 2021-12-08 20:07:14 +00:00
BlackMajor
dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
Nadyr
db68153268 Merge pull request #3231 from CHOMPStation2/upstream-merge-11831 
[MIRROR] operation RAD APES
 2021-12-05 12:18:12 -05:00
Nadyr
f4a8eebb8e powder that makes you say yes 2021-12-05 11:29:08 -05:00
Casey
cfcbab8941 Merge pull request #11831 from Hatterhat/rad-arm 
operation RAD APES
 2021-12-03 07:17:59 +00: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
Verkister
98df2abae2 Update explosive.dm 2021-11-11 22:15:01 +02:00