0cb47f9a19
Merge pull request #980 from CHOMPStationBot/upstream-merge-9422
...
[MIRROR] [MIRROR] Plainleather & Tobacco
2020-12-08 03:14:03 -05:00
cb9a5dfd8f
Merge pull request #979 from CHOMPStationBot/upstream-merge-9427
...
[MIRROR] [MIRROR] Modular honks
2020-12-08 03:12:14 -05:00
d452144e20
Merge pull request #965 from CHOMPStationBot/upstream-merge-9393
...
[MIRROR] [MIRROR] Stowaway Cryopod is now invisible, and incorporeal.
2020-12-08 02:59:52 -05:00
cd1ad32cb2
Merge pull request #9422 from VOREStation/upstream-merge-7762
...
[MIRROR] Plainleather & Tobacco
2020-12-08 03:38:26 +00:00
6bd329bd30
Merge pull request #9427 from VOREStation/upstream-merge-7777
...
[MIRROR] Modular honks
2020-12-08 03:36:15 +00:00
56a9dbf677
Merge pull request #9393 from VOREStation/upstream-merge-7749
...
[MIRROR] Stowaway Cryopod is now invisible, and incorporeal.
2020-12-05 01:57:11 +00:00
ef7a8f2cda
Merge pull request #9402 from Very-Soft/dauntless
...
ITG Dauntless
2020-12-03 23:35:54 +00:00
6df859e88e
Merge pull request #915 from Shadow-Quill/PDTurrets
...
Adds Point Defence Turrets
2020-12-02 15:54:47 -07:00
bbdeeede74
Merge pull request #954 from cadyn/newportals
...
Some simple portals for kassc
2020-11-30 23:58:33 -07:00
e1d970908f
Appease travis' replacement
2020-11-30 16:39:12 -08:00
9521b59193
Kassc portals :)
2020-11-30 16:24:46 -08:00
a9f77823d7
Merge pull request #9333 from Tenryumi/nikki-fluff
...
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
2020-11-30 23:46:15 +00:00
9ba21cd2e0
Updoots
2020-11-30 16:30:19 -06:00
49ae612dc4
Maybe forgot this
2020-11-25 19:44:55 -08:00
f1c9b60bf8
Fuck okay maybe intercoms move sometimes
2020-11-24 23:24:36 -08:00
d260757e91
yumyum radio go vroom hehe
2020-11-24 22:45:41 -08:00
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
7626117811
I forgot to delete these oops
2020-11-22 21:43:20 -08:00
c55132d06d
Finally optimize radios
2020-11-22 21:20:05 -08:00
7fd1eaa5ec
Merge pull request #894 from CHOMPStation2/Razgriz1032-patch-3
...
Remove Loss Poster
2020-11-22 04:11:48 -05:00
e56a6c7382
Remove Loss Poster
...
Fixes #892
2020-11-22 01:48:15 -07:00
9d660c4222
Merge pull request #1 from CHOMPStation2/master
...
merge master into branch
2020-11-21 21:24:20 -05:00
ca04b0ef72
Make the station gateway work :p
2020-11-21 13:24:49 -08:00
a7623eacc6
Merge pull request #9310 from Jwguy/MinorAdditions
...
PosterAdds
2020-11-19 01:27:54 +00:00
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
5afa72a83e
Merge pull request #844 from CHOMPStation2/metroid
...
Current Metroid Progress
2020-11-15 13:59:33 -07:00
4d2f915f33
Merge master and build TGUI
2020-11-15 02:17:53 -08:00
1db7b1d2e6
Merge pull request #845 from CHOMPStationBot/upstream-merge-9304
...
[MIRROR] Balance fixes and bugfixes
2020-11-15 02:07:40 -08:00
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
a1db30bac7
Merge pull request #848 from CHOMPStation2/master
...
Fixing raz's PR lol
2020-11-15 00:52:09 -08:00
2b178a86b0
hhhhhhhhhh
2020-11-14 22:24:25 -07:00
5749453f74
Delete toys_ch.dm
2020-11-14 22:24:08 -07:00
56f2c6f408
Merge pull request #836 from cadyn/newreflectors
...
New, improved, reflector turrets
2020-11-14 22:16:03 -05:00
02d51b5756
Merge branch 'master' into metroid
2020-11-14 15:25:04 -07:00
1efc4bcd9f
Merge pull request #9304 from Novacat/nova-basicfixes
...
Balance fixes and bugfixes
2020-11-14 17:54:59 +00:00
7b5fc6d721
Add files via upload
2020-11-14 04:29:40 -07:00
faa287d91b
[MIRROR] Adds AlliCo Grab-A-Gift
2020-11-14 07:32:50 +00:00
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
9efa4251ca
Spicy Engineering :o
2020-11-13 04:35:15 -08:00
8fce3fe4b6
Merge pull request #825 from Darlantanis/StarcasterFix
...
Converts Starcaster to tgui
2020-11-13 00:26:46 -07:00
0e07c9a739
Merge pull request #824 from r4d6/cigar
...
Add cigar cases to the loadout
2020-11-11 19:30:25 -07:00
65bea48122
Merge pull request #820 from CHOMPStationBot/upstream-merge-9288
...
[MIRROR] [MIRROR] Adds the Frostbelle
2020-11-11 19:16:05 -07:00
613033221d
trying to appease travis some more
2020-11-11 16:52:47 -08:00
e0c685e59a
travis is a bitch
2020-11-11 16:01:57 -08:00
9f54f4fb3d
stupid runtime reee
2020-11-11 15:34:13 -08:00
cfc8f579a2
Added spicy tools
2020-11-11 15:07:16 -08:00
61f46ab35f
Converts starcaster to tgui
2020-11-10 06:40:19 -05:00
d628ce8ff4
Move the cigar cases to a new _ch file
2020-11-10 00:04:17 -05:00
d0cbf7f856
Add cigar cases to the loadout.
2020-11-09 19:23:00 -05:00
5d1977b324
Merge pull request #817 from CHOMPStationBot/upstream-merge-9287
...
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
2020-11-08 23:41:34 -07:00
Nadyr