 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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
|
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
|
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 |
|
|
Razgriz
|
545b1a8486
|
Merge pull request #761 from CHOMPStationBot/upstream-merge-9253
[MIRROR] [MIRROR] Adds new balloons
|
2020-10-27 02:15:44 -07:00 |
|
|
Razgriz
|
548c123e77
|
Merge pull request #760 from CHOMPStationBot/upstream-merge-9225
[MIRROR] [MIRROR] Makes wall-mounted machines layer above windows
|
2020-10-27 02:15:15 -07:00 |
|
|
Verkister
|
b7f4c2192c
|
Merge pull request #9253 from VOREStation/upstream-merge-7748
[MIRROR] Adds new balloons
|
2020-10-27 08:17:38 +00:00 |
|
|
Verkister
|
9848c0e719
|
Merge pull request #9225 from VOREStation/upstream-merge-7708
[MIRROR] Makes wall-mounted machines layer above windows
|
2020-10-27 08:16:29 +00:00 |
|
|
Razgriz
|
d1d2e5905c
|
Merge pull request #744 from cadyn/husksurgery
Adding dehusk and tox/oxyloss surgery
|
2020-10-23 19:57:51 -07:00 |
|
|
Nadyr
|
a9bdc52b09
|
Merge pull request #719 from CHOMPStationBot/upstream-merge-9227
[MIRROR] [MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
|
2020-10-22 09:35:07 -04:00 |
|
|
Cadyn
|
732025c8ce
|
Adding dehusk and tox/oxyloss surgery
|
2020-10-21 23:32:27 -07:00 |
|
|
Verkister
|
7d408e9996
|
Merge pull request #9227 from VOREStation/upstream-merge-7714
[MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
|
2020-10-19 10:39:13 +00:00 |
|
|
Verkister
|
16a23eadec
|
Merge pull request #9235 from VOREStation/upstream-merge-7726
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
|
2020-10-19 10:37:24 +00:00 |
|
|
LunarFleet
|
bd1503a35d
|
Realized I could touch up the interactions a bit
|
2020-10-15 23:37:26 -04:00 |
|
|
LunarFleet
|
163dc56069
|
Only eggs can sustain me
|
2020-10-15 20:34:13 -04:00 |
|
|
Razgriz
|
0a8521f900
|
Merge pull request #568 from cadyn/vspull
Direct pull from virgo
|
2020-10-06 20:52:54 -07:00 |
|
|
Razgriz
|
ef5f28cb0c
|
Merge pull request #551 from Holdelta/master
Reverting changes to the RMS
|
2020-10-06 15:40:56 -06:00 |
|
|
Cadyn
|
1d0e69633f
|
Fix silly stuff
|
2020-10-05 19:46:50 -07:00 |
|
|
Cadyn
|
07775449d7
|
Fixing conflicts
|
2020-10-05 18:10:53 -07:00 |
|
|
David Winters
|
b6ac68836a
|
please work PLEASE
|
2020-09-29 00:28:25 -04:00 |
|
|
ShadowLarkens
|
3d7b051f2b
|
Convert /material to /datum/material
|
2020-09-27 16:16:44 -07:00 |
|
|
Razgriz
|
8cc3e87f1b
|
Update scannable fabricator pathname
|
2020-09-26 15:13:00 -07:00 |
|
|
Razgriz
|
54e632ebf2
|
September 2020 Upstream Merge
|
2020-09-25 23:07:08 -07:00 |
|
|
Novacat
|
4b83c18fb7
|
Merge pull request #9071 from VOREStation/upstream-merge-7660
[MIRROR] Fix duplicate results from analyzing some objects
|
2020-09-21 16:54:29 -04:00 |
|
|
Rykka
|
534623b1fd
|
Delete accidentally-added file from Commcard PR
|
2020-09-21 16:01:46 -04:00 |
|