Trilbyspaceclone
|
c81d0e8b66
|
Update energy.dm
|
2019-12-31 05:25:12 -05:00 |
|
Hatterhat
|
5a497b02ac
|
hey i'm WALKIN here
|
2019-12-31 01:56:01 -06:00 |
|
kevinz000
|
79c609aa40
|
Update telescopic_iv.dm
|
2019-12-30 17:55:59 -08:00 |
|
nik707
|
5c13fa64e3
|
Merge pull request #10338 from Seris02/marshmallow
marshmallow
|
2019-12-30 18:31:06 -06:00 |
|
Putnam
|
71fcd23f1f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
|
2019-12-30 13:31:15 -08:00 |
|
Ghommie
|
80e716eeaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-30 18:14:47 +01:00 |
|
Seris02
|
f0ba93052d
|
yee2.
|
2019-12-30 23:53:10 +08:00 |
|
Putnam
|
90ebbdfdb9
|
elements are so good. they're so good
|
2019-12-30 00:53:03 -08:00 |
|
kevinz000
|
24e3b88a34
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-30 00:32:25 -08:00 |
|
Seris02
|
40730b48d5
|
few fixes
|
2019-12-30 11:49:16 +08:00 |
|
Seris02
|
f663c4db96
|
tiny fixes
|
2019-12-30 11:24:12 +08:00 |
|
Trilbyspaceclone
|
4a5715e5ac
|
Update belt.dm
|
2019-12-29 19:13:32 -05:00 |
|
Ghommie
|
edd05cebea
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-30 00:28:36 +01:00 |
|
Seris02
|
b96bcf6eec
|
tiny fix
|
2019-12-29 23:47:30 +08:00 |
|
Seris02
|
a39c0249c4
|
marshmallow
|
2019-12-29 21:55:25 +08:00 |
|
BlackMajor
|
62b3c1e65b
|
Makes pick up range work
|
2019-12-30 02:28:23 +13:00 |
|
BlackMajor
|
8948e0491e
|
add mining card
|
2019-12-30 02:07:49 +13:00 |
|
BlackMajor
|
b811d3e57e
|
More work on it
|
2019-12-30 01:23:41 +13:00 |
|
BlackMajor
|
375e59a77d
|
Merge branch 'master' into Yeehaw
|
2019-12-29 22:12:40 +13:00 |
|
BlackMajor
|
2e03a529bf
|
checking off the list
|
2019-12-29 22:11:10 +13:00 |
|
BlackMajor
|
206a5e168a
|
More mining changes
|
2019-12-29 20:15:49 +13:00 |
|
Ghommie
|
7837688426
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-28 23:41:10 +01:00 |
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01:00 |
|
Seris02
|
1ff7709765
|
all of the weh.
|
2019-12-29 00:12:25 +08:00 |
|
Seris02
|
7bde63dcc4
|
weh
|
2019-12-28 23:58:28 +08:00 |
|
Seris02
|
4a2b7c2438
|
cocooooonuuuuuuts
|
2019-12-28 16:02:53 +08:00 |
|
Lin
|
d562a5ba27
|
Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
|
2019-12-28 04:07:03 +00:00 |
|
Lin
|
80daaacc86
|
Merge pull request #10268 from Ghommie/Ghommie-cit487
Effectively removes the old unused roboticist encryption key and headset.
|
2019-12-28 00:08:24 +00:00 |
|
Ghommie
|
21cfb2914b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-27 17:49:59 +01:00 |
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
BlackMajor
|
4e1a9b83cf
|
Pushing work for tonight.
|
2019-12-28 01:01:26 +13:00 |
|
Ghom
|
12d0a2ee4c
|
Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
|
2019-12-26 16:07:45 +01:00 |
|
Ghom
|
512d046f18
|
Merge pull request #10128 from Seris02/clownheadset
gives the clown a headset with a clown megaphone loudmode
|
2019-12-26 13:58:45 +01:00 |
|
Ghommie
|
57cecd2499
|
work
|
2019-12-25 06:54:44 +01:00 |
|
Ghommie
|
53d142b4c0
|
more work.
|
2019-12-25 01:34:33 +01:00 |
|
Seris02
|
9e6f0762b7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass
|
2019-12-24 22:27:41 +08:00 |
|
Hatterhat
|
d1c96237a6
|
the very shitty idea: "muh speedloader"
|
2019-12-24 04:16:33 -06:00 |
|
Ghommie
|
d571bbd292
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-24 00:07:32 +01:00 |
|
Ghommie
|
e1949b0131
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-23 19:02:20 +01:00 |
|
Ghommie
|
14c73b7d01
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 14:21:08 +01:00 |
|
kevinz000
|
1b9b54b33d
|
Merge pull request #10267 from Ghommie/Ghommie-cit486
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
|
2019-12-23 00:44:42 -08:00 |
|
Ghommie
|
b75349bebf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 04:32:09 +01:00 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
Ghommie
|
4fbd9fdca0
|
Effectively removes the long unrequired roboticist encryption key.
|
2019-12-22 12:02:15 +01:00 |
|
Ghommie
|
8bc277d38d
|
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
|
2019-12-22 11:40:25 +01:00 |
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
Ghommie
|
395457f7ef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
|
2019-12-21 17:59:32 +01:00 |
|
Ghom
|
ce34bcf2e4
|
Merge pull request #10012 from Commandersand/INEEDAMEDICBAG
Rebalance/port: refactor ported, ointment/brute pack healing nerf but max stack doubled. gauze heals a bit now
|
2019-12-21 14:34:43 +01:00 |
|
Ghom
|
7f0ae5dbde
|
I gotta go fast.
|
2019-12-21 13:04:27 +01:00 |
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|