cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,714 Commits 8 Branches 0 Tags
b23bf87ef5c57753a95c34e609850c69c9ba3fed
Commit Graph

2557 Commits

Author SHA1 Message Date
Razgriz
bc8021de7b Merge branch 'master' into upstream-merge-12511 2022-03-24 18:50:27 -07:00
Razgriz
fbebae4d1b powder that makes you say yes 2022-03-24 18:32:17 -07:00
Casey
396b201cf7 Fixes the infina-scoped-rifle bug 2022-03-23 06:36:45 +00:00
Casey
dc618675c1 Shotguns and Bolt-Action Rifles 2022-03-21 09:54:13 +00:00
Casey
361a2f1568 Strapless satchel moved to bag selection 2022-03-20 18:33:21 +00:00
Casey
9885711cd2 Small Pilot QoL additions 2022-03-13 20:05:54 +00:00
Razgriz
bdd02fcc0d Merge pull request #3820 from CHOMPStation2/upstream-merge-12409 
[MIRROR] Vore Stats
 2022-03-11 15:55:22 -07:00
Casey
1eb126e529 Merge pull request #12409 from Very-Soft/vorestats 
Vore Stats
 2022-03-09 23:20:40 +00:00
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix 
Brings REAL cookies to everywhere they belong
 2022-03-07 09:06:24 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Razgriz
6d277be2c0 powder that makes you say yes 2022-03-01 01:10:30 -07:00
Casey
b721da62a1 A more elegant weapon from a more civlised age 2022-02-27 19:27:52 +00:00
Nadyr
fa1fea2c56 Merge pull request #3715 from CHOMPStation2/upstream-merge-12285 
[MIRROR] 7914 branch fix
 2022-02-19 19:58:40 -05:00
Nadyr
3fe87a33ed Merge pull request #3711 from CHOMPStation2/upstream-merge-12253 
[MIRROR] Donk Co. Toys
 2022-02-19 19:55:19 -05:00
Nadyr
6c385e6dd4 Merge pull request #3709 from CHOMPStation2/upstream-merge-12262 
[MIRROR] primative-shields
 2022-02-19 18:53:34 -05:00
Nadyr
f1c5f657bd powder that makes you say yes 2022-02-19 18:20:32 -05:00
Casey
e73d113da0 7914 branch fix 2022-02-19 21:25:16 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Casey
7ad39bffcb Merge pull request #12262 from TheDavestDave/primative-shield-2 
primative-shields
 2022-02-19 04:02:45 +00:00
Casey
9c74404d02 reworks 'sword' crate 2022-02-18 18:58:07 +00:00
Casey
fdfa958555 Adds vendor refill cartridges to cargo 2022-02-14 21:36:39 +00:00
Casey
cfefb1098e Hastily gives the ERT their suits back 2022-02-07 23:17:22 +00:00
Nadyr
6e44bb7876 Merge branch 'master' into upstream-merge-12165 2022-02-06 21:53:14 -05:00
Casey
e6f02c05a6 The final Item Bank patch? 2022-02-06 23:29:28 +00:00
Casey
b77383ecce Merge pull request #12151 from PastelPrinceDan/catslugcrate 
adds a catslug crate to cargo
 2022-02-06 14:16:18 +00:00
Nadyr
0cd8c4569a Merge pull request #3591 from CHOMPStation2/upstream-merge-12092 
[MIRROR] [MIRROR] Adds a roof to indoor rain sounds
 2022-01-29 17:17:12 -05: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
Casey
cf831798bd Merge pull request #12092 from VOREStation/upstream-merge-8369 
[MIRROR] Adds a roof to indoor rain sounds
 2022-01-28 22:20:30 +00:00
Nadyr
05f5e75b26 powder that makes you say yes 2022-01-22 10:43:43 -05:00
Novacat
501bff423f sword fix attempt three 2022-01-22 14:17:45 +00:00
Nadyr
1938a2ea4f powder that makes you say yes 2022-01-16 23:14:03 -05:00
Casey
dccd954ae4 I don't know why I need to set a name for the crate three times but I… 2022-01-14 18:44:04 +00:00
Nadyr
f62dfdbf4d Merge pull request #3524 from CHOMPStation2/upstream-merge-12042 
[MIRROR] Sword crate
 2022-01-09 20:57:34 -05:00
Nadyr
f4ad4ec873 Merge pull request #3521 from CHOMPStation2/upstream-merge-12048 
[MIRROR] Fixes riding offsets not counting rider size
 2022-01-09 20:53:39 -05:00
Nadyr
02fa3eba30 powder that makes you say yes 2022-01-09 20:48:24 -05:00
Casey
b60ad04452 Merge pull request #12016 from PastelPrinceDan/injectorslargo 
makes large autoinjectors cheaper
 2022-01-09 01:52:14 +00:00
Casey
3fa644b0d6 Sword crate 2022-01-09 01:49:54 +00:00
Casey
8ae533e3f1 Merge pull request #12048 from Verkister/ponyshow2 
Fixes riding offsets not counting rider size
 2022-01-09 01:49:29 +00:00
Nadyr
8164226256 Merge pull request #3337 from CHOMPStation2/upstream-merge-11874 
[MIRROR] Adds prefs for Corgi and Cursed Sword roles
 2021-12-12 06:03:10 -05:00
Nadyr
3ccb809e3e powder that makes you say yes 2021-12-11 23:06:22 -05:00
Casey
f7fbce58c1 Merge pull request #11874 from Heroman3003/moreroleprefs 
Adds prefs for Corgi and Cursed Sword roles
 2021-12-08 22:49:16 +00:00
Nadyr
6bdeaa101d Merge pull request #3232 from CHOMPStation2/upstream-merge-11910 
[MIRROR] fixes the commonwealth engi RIG having the wrong crate
 2021-12-05 12:09:53 -05:00
Nadyr
ace233ac5d powder that makes you say yes 2021-12-05 11:08:43 -05:00
Nadyr
7600142bd1 powder that makes you say yes 2021-12-03 20:39:05 -05:00
Casey
97312b93c0 fixes the commonwealth engi RIG having the wrong crate 2021-12-03 07:18:09 +00:00
BlackMajor
a3bb4b9b5a Early pr 2021-11-26 15:35:21 +13:00
Nadyr
19246dbed1 Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722 
[MIRROR] Hardwood Material Port
 2021-10-30 23:30:40 -04:00
Nadyr
b4c8211ef1 powder that makes you say yes 2021-10-30 23:05:20 -04:00
Chompstation Bot
ef6f631360 OFD Supply Packs 2021-10-30 21:25:39 +00:00
Chompstation Bot
da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00