cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,703 Commits 5 Branches 0 Tags
1ad488dc8532d0bb66f83a00ba65d0dcb49b19bd
Commit Graph

60703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Razgriz
1ad488dc85 Update grubinfestation_vr.dm 2020-11-19 19:35:25 -07:00
cadyn
cbc538f529 Fix bullshit 2020-11-19 12:43:22 -08:00
cadyn
bf5104bd54 Fix the bullshit 2020-11-19 12:41:43 -08:00
Razgriz
c5a7662969 Prevent grubs in dorms or docks 
MEGAMIND.
 2020-11-17 05:12:13 -07:00
Razgriz
a8e49a29e7 Prevent spiders in docks and dorms 2020-11-17 05:10:52 -07:00
Razgriz
9788c05c8b Merge pull request #855 from CHOMPStation2/Razgriz1032-patch-3 
Remove xeno taser recoil
 2020-11-17 04:27:59 -07:00
Razgriz
5b4d69a834 Remove xeno taser recoil 
Also colloquially known as the slime taser...
 2020-11-17 04:02:45 -07:00
cadyn
6bb06f43b2 Merge pull request #853 from CHOMPStation2/cadyn-patch-2 
fix stupid bugs ree
 2020-11-16 00:38:50 -08:00
cadyn
4a6b57ae01 Update negative_ch.dm 2020-11-16 00:00:16 -08:00
cadyn
c25d59d84b fix singularity metabolism bruh 2020-11-15 23:56:01 -08:00
cadyn
4e2da5ae98 fix stupid bugs ree 2020-11-15 23:52:27 -08:00
Razgriz
159b208df2 Merge pull request #851 from cadyn/kachow 
Make it more clear that cyber tech is protogen head.
 2020-11-15 17:53:05 -07:00
cadyn
8c59263e72 Update robolimbs_vr.dm 2020-11-15 16:26:22 -08:00
cadyn
9234b847af Make it more clear. 2020-11-15 16:24:55 -08:00
cadyn
bf396e0a12 Merge pull request #843 from CHOMPStationBot/upstream-merge-9263 
[MIRROR] [MIRROR] Adds AlliCo Grab-A-Gift
 2020-11-15 13:48:10 -08:00
Razgriz
5afa72a83e Merge pull request #844 from CHOMPStation2/metroid 
Current Metroid Progress
 2020-11-15 13:59:33 -07:00
Razgriz
ee2cbe8161 Merge pull request #850 from CHOMPStationBot/upstream-merge-9309 
[MIRROR] Fixes pixel shifting breaking offsets
 2020-11-15 13:58:21 -07:00
Chompstation Bot
c822f6403d Fixes pixel shifting breaking offsets 2020-11-15 19:08:13 +00:00
Verkister
e612636a10 Merge pull request #9309 from VOREStation/Verkister-patch-5 
Fixes pixel shifting breaking offsets
 2020-11-15 19:08:13 +00:00
Cadyn
4aba7c9ac0 Updating again because other PR with tgui changes :seensomeshit: 2020-11-15 02:24:52 -08:00
cadyn
fea581f4ea Merge pull request #842 from CHOMPStationBot/upstream-merge-9132 
[MIRROR] Change from iMessage style to Tinder style messaging
 2020-11-15 02:23:57 -08:00
Cadyn
4d2f915f33 Merge master and build TGUI 2020-11-15 02:17:53 -08:00
cadyn
ef9f05fc3c Merge pull request #839 from CHOMPStationBot/upstream-merge-9275 
[MIRROR] Fix toeless knee and thigh high jackboots
 2020-11-15 02:12:23 -08:00
cadyn
e22d99d936 Merge pull request #847 from CHOMPStationBot/upstream-merge-9298 
[MIRROR] Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 02:09:07 -08:00
cadyn
d75c393d2f Merge pull request #846 from CHOMPStationBot/upstream-merge-9307 
[MIRROR] Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss
 2020-11-15 02:08:13 -08:00
cadyn
1db7b1d2e6 Merge pull request #845 from CHOMPStationBot/upstream-merge-9304 
[MIRROR] Balance fixes and bugfixes
 2020-11-15 02:07:40 -08:00
Cadyn
898ee2186a Merge master 2020-11-15 02:02:16 -08:00
Cadyn
4183f92f2a Building TGUI 2020-11-15 01:58:16 -08:00
cadyn
518f9608cd Merge pull request #3 from CHOMPStation2/master 
Update bot master from origin master
 2020-11-15 01:42:41 -08:00
cadyn
93ad7eab9a Merge pull request #838 from CHOMPStationBot/upstream-merge-8848 
[MIRROR] Remove gravity from debris field and rogue mining zones
 2020-11-15 00:57:51 -08:00
cadyn
d2a2b301cc Merge pull request #829 from cadyn/traits-v2 
Cadyn's traits v2
 2020-11-15 00:54:35 -08:00
cadyn
a1db30bac7 Merge pull request #848 from CHOMPStation2/master 
Fixing raz's PR lol
 2020-11-15 00:52:09 -08:00
cadyn
a67c751841 Merge branch 'master' into upstream-merge-9307 2020-11-15 00:48:22 -08:00
Chompstation Bot
a7ee88a867 Adds Crescent-Moon Hair by Piperboobear 2020-11-15 08:46:24 +00:00
Verkister
f5c125eaff Merge pull request #9298 from Tenryumi/piper-hair 
Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 08:46:24 +00:00
Chompstation Bot
f932e65178 Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss 2020-11-15 08:44:14 +00:00
Razgriz
44c902ac42 Add files via upload 2020-11-14 22:50:44 -07:00
Razgriz
6a7c850429 I hate github 
RESOLVE CONFLICT PLEASE
 2020-11-14 22:25:31 -07:00
Razgriz
2b178a86b0 hhhhhhhhhh 2020-11-14 22:24:25 -07:00
Razgriz
5749453f74 Delete toys_ch.dm 2020-11-14 22:24:08 -07:00
Nadyr
56f2c6f408 Merge pull request #836 from cadyn/newreflectors 
New, improved, reflector turrets
 2020-11-14 22:16:03 -05:00
cadyn
ba5ac77b06 Merge pull request #837 from CHOMPStationBot/upstream-merge-8900 
[MIRROR] Adds a ton of potential fluff alt-titles
 2020-11-14 19:07:21 -08:00
cadyn
3d253d6908 uwu 2020-11-14 18:17:55 -08:00
cadyn
33018c20ff kachow 2020-11-14 18:14:30 -08:00
cadyn
bdf0340260 Update for Nadyr's comments 2020-11-14 18:07:44 -08:00
cadyn
c6c1d7f3ba Update for Nadyr's comments 2020-11-14 18:06:25 -08:00
cadyn
fe5b1a7bf5 Making inline with Nadyr's comment 2020-11-14 18:01:38 -08:00
Razgriz
02d51b5756 Merge branch 'master' into metroid 2020-11-14 15:25:04 -07:00
Razgriz
f1c2d79143 Bruh 2020-11-14 15:12:29 -07:00
Chompstation Bot
9bed9595b9 Balance fixes and bugfixes 2020-11-14 17:54:59 +00:00