 Trilbyspaceclone
|
7df495f4ba
|
Merge branch 'master' into plastic__world
|
2020-01-09 20:41:33 -05: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 |
|
|
Hatterhat
|
04aa0eda5a
|
tg 40046, 41695, 46726 - hope i didnt forget smth
|
2020-01-09 18:35:13 -06:00 |
|
|
Trilbyspaceclone
|
17afb84f94
|
I didnt even touch any maps
|
2020-01-09 05:53:23 -05:00 |
|
|
TrilbySpaceClone
|
34c6288d22
|
so fantastic!
|
2020-01-09 05:46:30 -05:00 |
|
|
Putnam
|
fdbbcfe59a
|
it's functional, sprite time
|
2020-01-08 17:05:43 -08:00 |
|
|
kappa-sama
|
35353996bd
|
lazy copypaste
|
2020-01-08 16:36:53 -05: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 |
|
|
kevinz000
|
5b2c4deaa0
|
lockcharge --> locked_down
|
2020-01-07 12:04:41 -08: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 |
|
|
r4d6
|
68e48209da
|
Fix
|
2020-01-07 02:04:06 -05:00 |
|
|
r4d6
|
20d5e4f480
|
Make the RCD show its upgrades on examination.
And remove a small copy-pasta.
|
2020-01-07 01:45:59 -05:00 |
|
|
r4d6
|
c3f47e713a
|
Merge branch 'master' into RCD-Updates
|
2020-01-07 00:04:43 -05:00 |
|
|
Trilbyspaceclone
|
f7aa4f3050
|
Merge branch 'master' into glassware
|
2020-01-06 23:55:44 -05:00 |
|
|
BlackMajor
|
5a97259ba9
|
Fix a couple of bugs, add wrapping paper and destination tagger
|
2020-01-07 15:33:16 +13:00 |
|
|
Lin
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
Ghom
|
d07d436ba2
|
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
|
2020-01-06 21:47:15 +01:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|
|
Ghommie
|
4cc0833b28
|
Fixing an edge case runtime with ore bags.
|
2020-01-06 01:45:53 +01:00 |
|
|
Ghom
|
e18244671f
|
Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
|
2020-01-05 23:05:13 +01:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
kevinz000
|
0f909a1437
|
Update twohanded.dm
|
2020-01-05 12:50:51 -08:00 |
|
|
kevinz000
|
4d151b2a7c
|
Update twohanded.dm
|
2020-01-05 11:20:13 -08:00 |
|
|
kevinz000
|
46cf029a28
|
Update twohanded.dm
|
2020-01-05 11:19:18 -08:00 |
|
|
Ghom
|
516ec585d2
|
Merge pull request #10435 from Hatterhat/tg-40394
biogenerator can print flour sacks and enzyme now, also some boxes idk
|
2020-01-05 16:22:44 +01:00 |
|
|
Ghom
|
eeb9ec5f35
|
Merge pull request #10380 from Hatterhat/tg-43000-powerfists
powerfists throw people faster but also leak their gas into the air
|
2020-01-05 15:12:06 +01:00 |
|
|
Hatterhat
|
f166586ca0
|
a comma
|
2020-01-04 21:05:55 -06:00 |
|
|
Hatterhat
|
5b0d20cf37
|
this one fucking tab
|
2020-01-04 19:52:01 -06:00 |
|
|
Hatterhat
|
46ced736ba
|
what the fuck was that damage my guy
|
2020-01-04 19:51:06 -06:00 |
|
|
r4d6
|
4e528da5c2
|
Correct price and rpd
|
2020-01-04 19:06:56 -05:00 |
|
|
Hatterhat
|
92f6fe129a
|
tgstation 40394 port
|
2020-01-04 07:14:39 -06:00 |
|
|
Ghom
|
499907f9b7
|
Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
|
2020-01-04 14:07:25 +01:00 |
|
|
Ghom
|
39da7cc58e
|
Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
|
2020-01-04 14:03:01 +01:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
Hatterhat
|
5142a0e4ae
|
that should probably be there
|
2020-01-04 02:07:19 -06: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 |
|
|
Linzolle
|
d0263fc669
|
don't act on non mobs
|
2020-01-03 18:21:08 -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 |
|
|
kevinz000
|
d1d9b7a179
|
Merge pull request #10403 from r4d6/patch-1
Add a way to make opaque plastic flaps
|
2020-01-03 08:16:17 -08:00 |
|
|
kevinz000
|
04649efc62
|
Update stack.dm
|
2020-01-03 02:46:57 -08:00 |
|
|
Seris02
|
519d379cdf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock
|
2020-01-03 17:42:53 +08:00 |
|
|
BlackMajor
|
a4d2ea0281
|
Small fix
|
2020-01-03 22:39:58 +13:00 |
|
|
r4d6
|
7347cb0ba6
|
Merge branch 'master' into RCD-Updates
|
2020-01-03 03:09:11 -05:00 |
|