cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 15:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,691 Commits 9 Branches 0 Tags
8c59263e723f1481ae90ec6cf828ed2c88a95211
Commit Graph

18227 Commits

Author SHA1 Message Date
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
Cadyn
4d2f915f33 Merge master and build TGUI 2020-11-15 02:17:53 -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
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
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
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
Novacat
1efc4bcd9f Merge pull request #9304 from Novacat/nova-basicfixes 
Balance fixes and bugfixes
 2020-11-14 17:54:59 +00:00
Razgriz
7b5fc6d721 Add files via upload 2020-11-14 04:29:40 -07:00
Chompstation Bot
faa287d91b [MIRROR] Adds AlliCo Grab-A-Gift 2020-11-14 07:32:50 +00:00
cadyn
62a7ced4dd Update science_vr.dm 2020-11-13 23:25:18 -08:00
cadyn
e8546bb154 More conflicts 2020-11-13 23:23:31 -08:00
cadyn
e6386c802a Fix more conflicts with your bullshit :v 2020-11-13 23:22:45 -08:00
cadyn
48f22efaab Merge branch 'master' into upstream-merge-8900 2020-11-13 23:03:30 -08:00
Novacat
49ef2d2ee9 Merge pull request #8848 from Cyantime/spaceweirdness 
Remove gravity from debris field and rogue mining zones
 2020-11-14 06:49:05 +00:00
Chompstation Bot
a9ca363f7f Adds a ton of potential fluff alt-titles 2020-11-14 06:46:55 +00:00
Cadyn
9efa4251ca Spicy Engineering :o 2020-11-13 04:35:15 -08:00
cadyn
d270b072d5 Actually give CMO teleport access. 2020-11-13 02:09:30 -08:00
Razgriz
8fce3fe4b6 Merge pull request #825 from Darlantanis/StarcasterFix 
Converts Starcaster to tgui
 2020-11-13 00:26:46 -07:00
Razgriz
0e07c9a739 Merge pull request #824 from r4d6/cigar 
Add cigar cases to the loadout
 2020-11-11 19:30:25 -07:00
Razgriz
65bea48122 Merge pull request #820 from CHOMPStationBot/upstream-merge-9288 
[MIRROR] [MIRROR] Adds the Frostbelle
 2020-11-11 19:16:05 -07:00
Razgriz
6123e3872d Merge pull request #819 from CHOMPStationBot/upstream-merge-9286 
[MIRROR] Event vendors and entertainer's vendor
 2020-11-11 19:15:43 -07:00
Razgriz
308a8ac9d4 Update grass.dm 2020-11-11 19:01:02 -07:00
Razgriz
9a1f979eee Update vending_machines_vr.dm 2020-11-11 18:58:16 -07:00
Cadyn
613033221d trying to appease travis some more 2020-11-11 16:52:47 -08:00
Cadyn
e0c685e59a travis is a bitch 2020-11-11 16:01:57 -08:00
Cadyn
9f54f4fb3d stupid runtime reee 2020-11-11 15:34:13 -08:00
Cadyn
cfc8f579a2 Added spicy tools 2020-11-11 15:07:16 -08:00
Cadyn
953b47764c Cadyn's traits v2 2020-11-11 12:34:31 -08:00
Darlantan
61f46ab35f Converts starcaster to tgui 2020-11-10 06:40:19 -05:00
r4d6
d628ce8ff4 Move the cigar cases to a new _ch file 2020-11-10 00:04:17 -05:00
r4d6
d0cbf7f856 Add cigar cases to the loadout. 2020-11-09 19:23:00 -05:00
Razgriz
1e76b0b799 Update vending_machines_vr.dm 2020-11-09 00:53:48 -07:00
Razgriz
5d1977b324 Merge pull request #817 from CHOMPStationBot/upstream-merge-9287 
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
 2020-11-08 23:41:34 -07:00
Razgriz
cf01110b5c Merge pull request #815 from CHOMPStationBot/upstream-merge-9289 
[MIRROR] [MIRROR] Moves the varset for DNA injector readying out of the for loop
 2020-11-08 17:16:27 -07:00
Chompstation Bot
e127655b5d [MIRROR] Adds the Frostbelle 2020-11-08 17:05:55 +00:00
Verkister
b987ba8b3d Merge pull request #9286 from Very-Soft/eventvendors 
Event vendors and entertainer's vendor
 2020-11-08 17:05:48 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Verkister
c56ec2bf01 Merge pull request #9289 from VOREStation/upstream-merge-7743 
[MIRROR] Moves the varset for DNA injector readying out of the for loop
 2020-11-08 06:58:44 +00:00
Razgriz
a269d28a8b Merge pull request #805 from CHOMPStationBot/upstream-merge-9276 
[MIRROR] [MIRROR] No more unnearsightedness!
 2020-11-05 03:19:31 -07:00
Verkister
a8aedccb38 Merge pull request #9276 from VOREStation/upstream-merge-7753 
[MIRROR] No more unnearsightedness!
 2020-11-05 10:06:02 +00:00