r4d6
|
4e6ad84317
|
Fix conflict
|
2020-01-18 16:05:56 -05:00 |
|
r4d6
|
810556cbb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
|
2020-01-18 16:03:49 -05:00 |
|
Ghom
|
ce2fc37df3
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-01-18 20:16:30 +01:00 |
|
Kraseo
|
6708607073
|
fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly
|
2020-01-18 15:05:07 +01:00 |
|
Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
kevinz000
|
05e2b6a441
|
Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
|
2020-01-17 14:24:13 -07:00 |
|
keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|
r4d6
|
755b0fac3c
|
Merge branch 'master' into Passive-Vents
|
2020-01-15 19:15:50 -05:00 |
|
r4d6
|
6045d818d8
|
Add passive vents
|
2020-01-15 19:12:13 -05:00 |
|
r4d6
|
85e71c4d60
|
fix conflicts.
|
2020-01-15 17:18:18 -05:00 |
|
Ghom
|
03ebab6ec5
|
Merge pull request #10454 from Commandersand/clothsfix
fixes clothing directional sprites(i swear not all of them are my fault)
|
2020-01-14 18:24:50 +01:00 |
|
Ghom
|
9189455fb1
|
Merge pull request #10549 from Seris02/durathread
durathread winter coats from hyper
|
2020-01-14 13:49:53 +01:00 |
|
Seris02
|
d46f3232f9
|
tada
|
2020-01-14 10:57:32 +08:00 |
|
Ghom
|
8437d1f0c3
|
Merge pull request #10552 from Tupinambis/NotUglyFireAlarms
Pseudo Reverts Fire Alarms Back to Original Look: AKA Not Fuckugly
|
2020-01-14 00:33:47 +01:00 |
|
Letter N
|
450cb2b01a
|
Merge branch 'master' into banjo
|
2020-01-13 20:53:30 +08:00 |
|
Tupinambis
|
7a0b14b6d7
|
fixes things
|
2020-01-13 02:12:12 -06:00 |
|
Tupinambis
|
2772feb084
|
Makes fire alarms less ugly
|
2020-01-13 01:04:43 -06:00 |
|
Seris02
|
bd2fe8eb01
|
durathread winter coat from hyper
|
2020-01-13 13:12:17 +08:00 |
|
Letter N
|
74ed49da46
|
string broke
|
2020-01-12 12:50:45 +08:00 |
|
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 |
|
Putnam
|
e468fa3e71
|
Added a binary version and fixed up sprites
|
2020-01-10 01:26:09 -08:00 |
|
Putnam
|
36a6daa26f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-09 19:09:38 -08:00 |
|
Putnam
|
bdda3f940c
|
it works
|
2020-01-09 18:55:56 -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 |
|
Commandersand
|
be35379387
|
obj psrite fixes
|
2020-01-08 22:56:18 -06: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 |
|
keronshb
|
35cd77d433
|
Adds the nanite remote for some programs
Adds a new remote function from tg
|
2020-01-06 20:28:33 -05: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 |
|