kevinz000
|
8f60099595
|
Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
|
2020-01-10 14:01:06 -08: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 |
|
Unknown
|
8e58c416f6
|
Fuggin DMI merges amirite
|
2020-01-08 20:40:34 -07: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 |
|
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 |
|
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 |
|
TrilbySpaceClone
|
52ea6ce262
|
Crushing presser
|
2020-01-04 03:13:21 -05:00 |
|
Hatterhat
|
7c98656939
|
upstream merge
|
2020-01-04 01:48:50 -06:00 |
|
Hatterhat
|
2e406d418b
|
conflict THIS
|
2020-01-04 01:37:58 -06:00 |
|
Hatterhat
|
576db0ed41
|
i swear to god this conflict shouldn't even happen
|
2020-01-04 01:37:18 -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 |
|
kevinz000
|
c0d3b08ab0
|
Merge pull request #10255 from Xantholne/xantholne-christmas02
Hopefully fixes the broken Christmas clothes that no one knows how they broke?
|
2020-01-02 23:07:20 -08: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 |
|
BlackMajor
|
62c8fce043
|
Fix conflict
|
2020-01-02 21:56:17 +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
|
78e4c608ad
|
Merge pull request #10319 from Seris02/coconutsyep
porting azarak's coconuts from hyper station
|
2019-12-31 13:16:07 +01:00 |
|
Hatterhat
|
5a497b02ac
|
hey i'm WALKIN here
|
2019-12-31 01:56:01 -06:00 |
|
nik707
|
5c13fa64e3
|
Merge pull request #10338 from Seris02/marshmallow
marshmallow
|
2019-12-30 18:31:06 -06:00 |
|
Ghom
|
e309497af2
|
Merge pull request #10339 from Seris02/teleivdrip
telescopic IV drips
|
2019-12-30 18:24:50 +01:00 |
|
Ghommie
|
49f1176170
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-30 16:06:16 +01:00 |
|
Seris02
|
40730b48d5
|
few fixes
|
2019-12-30 11:49:16 +08:00 |
|
Seris02
|
9b3654e4ff
|
telescopic IVs
|
2019-12-29 23:26:53 +08:00 |
|
Seris02
|
a39c0249c4
|
marshmallow
|
2019-12-29 21:55:25 +08: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 |
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01:00 |
|
Seris02
|
4a2b7c2438
|
cocooooonuuuuuuts
|
2019-12-28 16:02:53 +08:00 |
|
Commandersand
|
aa04f87425
|
sprites
|
2019-12-27 10:42:58 -06:00 |
|
Ghom
|
05bde370ec
|
Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis
Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code
|
2019-12-26 16:11:54 +01:00 |
|
Ghom
|
0e16f4052d
|
Merge pull request #10292 from Citadel-Station-13/miku-fix
fixes bad sprite states
|
2019-12-26 16:06:19 +01:00 |
|
Jay
|
b33a167906
|
fixes bad sprite states
|
2019-12-25 02:22:10 -06:00 |
|
Unknown
|
6ed808f033
|
Merge branch 'master' into xantholne-christmas02
|
2019-12-24 02:56:13 -07:00 |
|
Lin
|
9bdbb55b57
|
Merge pull request #10139 from Citadel-Station-13/donator
Donator Item - Ready For Review
|
2019-12-23 05:29:06 +00:00 |
|
TrilbySpaceClone
|
784ea3f5e1
|
readds sprites
|
2019-12-22 03:06:04 -05:00 |
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
Jay
|
4730413431
|
FUUUUUUUUUUUCK
|
2019-12-21 18:05:34 -06:00 |
|
Ghom
|
a33065a728
|
Merge pull request #10190 from Trilbyspaceclone/honeysoda
The new buzz around the new soft drink
|
2019-12-21 18:34:35 +01:00 |
|
Michiyamenotehifunana
|
e06b2407b4
|
oh god please don't mess up
|
2019-12-21 22:22:43 +08: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 |
|
Unknown
|
b10f6c8762
|
Hopefully fixes the broken Christmas clothes that no one knows how they broke?
|
2019-12-20 16:56:32 -07:00 |
|
Lin
|
42d8228c75
|
Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
|
2019-12-19 23:03:48 +00:00 |
|
Lin
|
66c6659681
|
Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
|
2019-12-19 23:00:52 +00:00 |
|