cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 13:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,041 Commits 9 Branches 0 Tags
b801f6d8469795b811d88cb1563d53ce8cc1cbda
Commit Graph

1083 Commits

Author SHA1 Message Date
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
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
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
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
Nadyr
4f36828e4c Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615 
[MIRROR] [MIRROR] Remove suicide act
 2021-10-27 21:05:48 -04:00
Aronai Sieyes
0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311 
[MIRROR] Remove suicide act
 2021-10-28 00:49:05 +00:00
Nadyr
4bd02ef673 Merge pull request #3140 from CHOMPStationBot/upstream-merge-11701 
[MIRROR] ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
 2021-10-27 19:30:01 -04:00
Nadyr
daa50cb5ac powder that makes you say yes 2021-10-27 19:21:48 -04:00
Chompstation Bot
318ac12a29 ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs 2021-10-27 16:05:04 +00:00
Casey
0e8d336a1b Merge pull request #11671 from VOREStation/upstream-merge-8328 
[MIRROR] Rocket launchers make the projectile when they consume the rocket
 2021-10-27 15:39:24 +00: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