cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,556 Commits 8 Branches 0 Tags
b28bf70a2fd76b13d33bcdce63dedaf5da575da5
Commit Graph

43925 Commits

Author SHA1 Message Date
Novacat
b28bf70a2f Merge pull request #10345 from Heroman3003/spdrfix 
Fixes pixel offsets resetting on Giant Spider Queen
 2021-05-17 19:53:41 +00:00
Razgriz
b953b2db37 Merge pull request #1957 from CHOMPStationBot/upstream-merge-10330 
[MIRROR] AR Visor
 2021-05-15 22:50:07 -07:00
Razgriz
8f2a2ee219 Merge pull request #1959 from CHOMPStationBot/upstream-merge-10332 
[MIRROR] Touch up emote port
 2021-05-15 22:49:07 -07:00
Razgriz
3e9d81b887 Merge pull request #1956 from CHOMPStationBot/upstream-merge-10328 
[MIRROR] Pilot Headset Fix
 2021-05-15 22:47:55 -07:00
Aronai Sieyes
2d4853ca4f Merge pull request #10310 from Novacat/nova-pathfinder 
Mecha Balance and Fighter Fixes
 2021-05-15 17:17:36 +00:00
Novacat
d5a6cb16a3 Merge pull request #10332 from VOREStation/Arokha/emoflip 
Touch up emote port
 2021-05-15 15:13:23 +00:00
Novacat
84661bfe35 Merge pull request #10330 from TheFurryFeline/TFF-AR_Visor_Port 
AR Visor
 2021-05-15 13:23:31 +00:00
Novacat
111cd2a1ad Merge pull request #10328 from klaasjared/pilot_fix 
Pilot Headset Fix
 2021-05-15 11:56:58 +00:00
Nadyr
bddfb995a2 Merge pull request #1912 from CHOMPStationBot/upstream-merge-10222 
[MIRROR] Catalogue Entries V1
 2021-05-14 01:15:36 -04:00
Nadyr
5f1528b34d Merge pull request #1950 from CHOMPStationBot/upstream-merge-10309 
[MIRROR] Fixes Scream sounds
 2021-05-14 01:05:55 -04:00
Nadyr
692c8df8e1 Merge pull request #1842 from CHOMPStation2/Razgriz1032-patch-6 
Catalogue update
 2021-05-14 01:05:29 -04:00
Nadyr
5fe4f38477 grammar 2021-05-14 01:04:42 -04:00
Nadyr
5dcb7f09fb grammar 2021-05-14 01:03:06 -04:00
Nadyr
c2d4da4ac2 grammar 2021-05-14 01:00:16 -04:00
Nadyr
ecd8f1e73a grammar 2021-05-14 00:59:12 -04:00
Nadyr
3b84b864f2 powder that makes you say yes 2021-05-14 00:57:58 -04:00
Nadyr
ea6f0fa259 powder that makes you say yes 2021-05-14 00:54:36 -04:00
Nadyr
88bac3f6e1 chompedits 2021-05-14 00:52:13 -04:00
Nadyr
3369090f3b Merge pull request #1953 from CHOMPStationBot/upstream-merge-10314 
[MIRROR] [MIRROR] Standardizes Boxes
 2021-05-13 23:32:02 -04:00
Nadyr
458df58b2c Merge pull request #1943 from CHOMPStation2/PredPois 
Pred POI's
 2021-05-13 23:29:26 -04:00
Nadyr
ff06903dcf Merge pull request #1952 from CHOMPStationBot/upstream-merge-10323 
[MIRROR] Help beam_components qdel properly
 2021-05-13 23:25:51 -04:00
Novacat
8d751f9969 Merge pull request #10314 from VOREStation/upstream-merge-8065 
[MIRROR] Standardizes Boxes
 2021-05-13 17:30:39 +00:00
Aronai Sieyes
b2217f0b18 Merge pull request #10323 from VOREStation/Arokha/beamqdel 
Help beam_components qdel properly
 2021-05-13 15:49:53 +00:00
Aronai Sieyes
63475bf84b Merge pull request #10320 from VOREStation/upstream-merge-8079 
[MIRROR] Adds map name and in-round player count to Topic reply.
 2021-05-13 15:10:09 +00:00
Chompstation Bot
3837c57c0d Fixes Scream sounds 2021-05-13 15:07:59 +00:00
Novacat
966de75a6c Merge pull request #10313 from TheFurryFeline/patch-31 
Stop SSD Snorers
 2021-05-13 02:53:39 +00:00
Nadyr
b48dd8fa43 Merge pull request #1948 from CHOMPStationBot/upstream-merge-10311 
[MIRROR] RE-ADDS SQUISH
 2021-05-12 18:48:21 -04:00
Nadyr
97dfe1fec8 Merge pull request #1942 from CHOMPStationBot/upstream-merge-10298 
[MIRROR] Tweak synth stuff
 2021-05-12 18:45:12 -04:00
Nadyr
31b47bc0d1 powder that makes you say yes 2021-05-12 18:20:23 -04:00
Nadyr
2a16c0d6e5 powder that makes you say yes 2021-05-12 18:18:47 -04:00
Nadyr
3bce32f1e0 powder that makes you say yes 2021-05-12 18:15:43 -04:00
Nadyr
294abf2ee2 powder that makes you say yes 2021-05-12 18:12:16 -04:00
Nadyr
c6572af5de powder that makes you say yes 2021-05-12 18:10:59 -04:00
Nadyr
ccc7fbab62 powder that makes you say yes 2021-05-12 18:09:36 -04:00
Nadyr
21d0f89b11 powder that makes you say yes 2021-05-12 18:07:50 -04:00
Nadyr
43a3fa4cb3 powder that makes you say yes 2021-05-12 18:06:49 -04:00
Nadyr
aba0ea1150 powder that makes you say yes 2021-05-12 18:04:54 -04:00
Nadyr
6f02754446 powder that makes you say yes 2021-05-12 18:03:53 -04:00
Nadyr
e5113a0984 powder that makes you say yes 2021-05-12 17:59:16 -04:00
Novacat
18c1f3b275 Merge pull request #10311 from lm40/master 
RE-ADDS SQUISH
 2021-05-12 17:56:56 +00:00
Novacat
86ab1a8363 Merge pull request #10303 from VOREStation/Arokha/removeoldnifmenu 
Deprecate NIF statpanel in favor of TGUI
 2021-05-12 17:46:40 +00:00
Nadyr
600122cfb3 Merge pull request #1883 from CHOMPStationBot/upstream-merge-10256 
[MIRROR] Adds various new fat taur variants
 2021-05-12 03:39:34 -04:00
Nadyr
90b4274f92 Remove redundacies due to upstream port 2021-05-12 03:26:44 -04:00
Darlantan
86e7b94971 powder that makes you say yes 2021-05-12 03:11:54 -04:00
Nadyr
5a76adb54f Merge pull request #1944 from CHOMPStationBot/upstream-merge-10302 
[MIRROR] Fix two character spawn bugs
 2021-05-12 02:22:33 -04:00
Novacat
d318defa59 Merge pull request #10302 from VOREStation/Arokha/joinfixes 
Fix two character spawn bugs
 2021-05-12 04:13:20 +00:00
Chompstation Bot
2612365204 [MIRROR] Brings back old tesh radsuit sprites, adds 'fitted' version. 2021-05-11 23:58:55 -04:00
Nadyr
e157d0bf79 Merge pull request #1939 from CHOMPStationBot/upstream-merge-10257 
[MIRROR] Changes some Exploration Colors
 2021-05-11 23:56:27 -04:00
Nadyr
d2163812bb Merge pull request #1937 from CHOMPStationBot/upstream-merge-10273 
[MIRROR] [MIRROR] Adds verb to VV global variables
 2021-05-11 23:55:42 -04:00
Nadyr
30aac542a4 Merge pull request #1913 from CHOMPStationBot/upstream-merge-9820 
[MIRROR] Adds Suffocation Damage option to vore panel/bellies
 2021-05-11 23:55:15 -04:00