cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,876 Commits 5 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

9177 Commits

Author SHA1 Message Date
Cadyn
49ae612dc4 Maybe forgot this 2020-11-25 19:44:55 -08:00
cadyn
f1c9b60bf8 Fuck okay maybe intercoms move sometimes 2020-11-24 23:24:36 -08:00
cadyn
d260757e91 yumyum radio go vroom hehe 2020-11-24 22:45:41 -08:00
Razgriz
f0ace37d4f Spear and Gun sizes 
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)

-Tweaked the Floragun have no recoil for micros.
 2020-11-23 19:29:48 -07:00
cadyn
7626117811 I forgot to delete these oops 2020-11-22 21:43:20 -08:00
cadyn
c55132d06d Finally optimize radios 2020-11-22 21:20:05 -08:00
Nadyr
7fd1eaa5ec Merge pull request #894 from CHOMPStation2/Razgriz1032-patch-3 
Remove Loss Poster
 2020-11-22 04:11:48 -05:00
Razgriz
e56a6c7382 Remove Loss Poster 
Fixes #892
 2020-11-22 01:48:15 -07:00
Kassc
9d660c4222 Merge pull request #1 from CHOMPStation2/master 
merge master into branch
 2020-11-21 21:24:20 -05:00
cadyn
ca04b0ef72 Make the station gateway work :p 2020-11-21 13:24:49 -08:00
Novacat
a7623eacc6 Merge pull request #9310 from Jwguy/MinorAdditions 
PosterAdds
 2020-11-19 01:27:54 +00: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
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
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
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
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
Cadyn
9efa4251ca Spicy Engineering :o 2020-11-13 04:35:15 -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
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
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
5d1977b324 Merge pull request #817 from CHOMPStationBot/upstream-merge-9287 
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
 2020-11-08 23:41:34 -07:00
Chompstation Bot
e127655b5d [MIRROR] Adds the Frostbelle 2020-11-08 17:05:55 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +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
Razgriz
64e07a46d5 Merge pull request #796 from cadyn/kassc-v2 
New features for triggers and kbuttons
 2020-11-03 19:40:02 -07:00
Razgriz
2f18c69fb2 Merge pull request #797 from LunarFleet/Lun-Egg 
Egg Laying Implant Updates - Makes cascading toggleable
 2020-11-03 02:26:59 -07:00
LunarFleet
aaa61d6377 Makes cascading toggleable 2020-11-02 23:46:52 -05:00
Cadyn
be27df5441 New features for triggers and kbuttons 2020-11-02 19:24:16 -08:00
Cadyn
96c6d2e9ff Kassc's POI/event requests 2020-10-29 16:05:26 -07:00
cadyn
109f8c9b13 Merge branch 'master' into tweakfixes 2020-10-28 21:33:40 -07:00
Nadyr
3b8655f2e4 Merge pull request #768 from CHOMPStationBot/upstream-merge-9257 
[MIRROR] This is *not* what _onclick is for FFS
 2020-10-28 05:01:59 -04:00
Verkister
420b44c449 Merge pull request #9257 from ShadowLarkens/paifix 
This is *not* what _onclick is for FFS
 2020-10-28 07:11:48 +00:00
Cadyn
947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -07:00