Arturlang
|
29207b22fb
|
Merge branch 'master' into debug_outfit_updates
|
2020-02-09 22:05:26 +02:00 |
|
Artur
|
c9dc35fd9a
|
Updates the debug outfit
|
2020-02-06 18:42:23 +01:00 |
|
Putnam
|
53cad493a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-02-03 03:17:23 -08:00 |
|
Ghom
|
6f66d76680
|
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
|
2020-02-02 19:08:57 +01:00 |
|
Ghom
|
97be223b0b
|
Merge pull request #10799 from Seris02/goldentoolboxfix
makes the golden ""plastitanium"" toolbox actually plastitanium
|
2020-02-02 19:08:16 +01:00 |
|
Ghom
|
8a81ba9efe
|
Ok here we go.
|
2020-02-02 18:40:06 +01:00 |
|
kevinz000
|
c94b5688db
|
Merge pull request #10810 from YakumoChen/ring
Adds ring jewelry
|
2020-02-02 03:16:01 -07:00 |
|
kevinz000
|
3fc832fbe7
|
Merge pull request #10819 from Ghommie/Ghommie-cit541
clown ops infiltrator consistency.
|
2020-02-02 01:39:08 -07:00 |
|
Ghommie
|
ab4aa29576
|
clown ops infiltrator consistency.
|
2020-02-01 00:02:31 +01:00 |
|
YakumoChen
|
4c4fda8091
|
line ending
|
2020-01-31 14:14:34 +00:00 |
|
YakumoChen
|
89134d8b30
|
updates fancy
the boxes actually work now
|
2020-01-31 08:52:45 -05:00 |
|
YakumoChen
|
1ed4b90e5f
|
update fancy
|
2020-01-31 07:14:58 -05:00 |
|
YakumoChen
|
065691ca1e
|
adds ring boxes to fancy
|
2020-01-31 06:33:13 -05:00 |
|
Seris02
|
81039b131b
|
fixes
|
2020-01-31 09:49:08 +08:00 |
|
Commandersand
|
27c915ec75
|
honk
|
2020-01-30 02:04:48 -06:00 |
|
kevinz000
|
75e1108f33
|
optizmize
|
2020-01-24 21:45:43 -07:00 |
|
Putnam
|
c58b4daa35
|
collectors too
this doesn't compile but like. it's a draft
|
2020-01-24 11:58:58 -08:00 |
|
Ghom
|
5bc7229a9f
|
Quick rubber toolbox materials fix.
|
2020-01-20 19:11:43 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
Putnam3145
|
b09ef97ae3
|
Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
|
2020-01-07 16:50:21 -08:00 |
|
BlackMajor
|
05a644cc41
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
|
2020-01-08 12:26:45 +13:00 |
|
BlackMajor
|
972c03f79f
|
Merge branch 'master' into Yeehaw
|
2020-01-08 12:25:50 +13:00 |
|
BlackMajor
|
b41c9cd844
|
Sync with master
|
2020-01-08 12:25:22 +13:00 |
|
Lin
|
c162e9bb5d
|
Merge pull request #10453 from Ghommie/Ghommie-cit500
Fixing an edge case runtime with ore bags.
|
2020-01-07 19:37:49 +00:00 |
|
Ghommie
|
4cc0833b28
|
Fixing an edge case runtime with ore bags.
|
2020-01-06 01:45:53 +01:00 |
|
Hatterhat
|
7c98656939
|
upstream merge
|
2020-01-04 01:48:50 -06:00 |
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
Ghommie
|
f5b251db66
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-03 18:24:39 +01:00 |
|
Ghommie
|
4d06d231f8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-02 17:49:01 +01:00 |
|
BlackMajor
|
08d042901c
|
thank you github
|
2020-01-02 22:16:47 +13:00 |
|
BlackMajor
|
aabb39a364
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
|
2020-01-02 22:06:31 +13:00 |
|
BlackMajor
|
30e3edaac1
|
Merge branch 'master' into Yeehaw
|
2020-01-02 22:03:58 +13:00 |
|
BlackMajor
|
3239acf74d
|
Sync
|
2020-01-02 22:02:55 +13:00 |
|
nik707
|
be9912227f
|
Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
|
2020-01-01 20:28:15 -06:00 |
|
Ghom
|
0453363d4c
|
Merge pull request #10345 from Trilbyspaceclone/patch-256
Buffs bandoliers to hold more types of casings.
|
2019-12-31 14:36:53 +01:00 |
|
Hatterhat
|
5a497b02ac
|
hey i'm WALKIN here
|
2019-12-31 01:56:01 -06: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
|
40730b48d5
|
few fixes
|
2019-12-30 11:49:16 +08:00 |
|
Trilbyspaceclone
|
4a5715e5ac
|
Update belt.dm
|
2019-12-29 19:13:32 -05: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
|
b811d3e57e
|
More work on it
|
2019-12-30 01:23:41 +13: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 |
|
Hatterhat
|
d1c96237a6
|
the very shitty idea: "muh speedloader"
|
2019-12-24 04:16:33 -06: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 |
|