0eb635b908
pls2
...
ugh
2019-11-24 02:52:17 +00:00
b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
135608551f
Merge remote-tracking branch 'upstream/master'
2019-11-24 02:45:28 +00:00
ce7e9ac452
Revert "Removes the random love"
...
This reverts commit b056d91ea5
2019-11-24 02:45:06 +00:00
82c3e3cd9d
Revert "Trust your insincts"
...
This reverts commit 7a605b4ba6
2019-11-24 02:44:52 +00:00
3d713b6c96
Revert "I can't spell"
...
This reverts commit 0fed6d49e4
2019-11-24 02:44:28 +00:00
f4b54f15d2
Revert "hark"
...
This reverts commit 89bcb00ef1
2019-11-24 02:44:19 +00:00
505e15a3e1
Revert "Alright"
...
This reverts commit b756f37ff6
2019-11-24 02:44:10 +00:00
00601a0c87
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 02:44:00 +00:00
8af225e6e3
PLASE
2019-11-24 02:41:21 +00:00
b756f37ff6
Alright
2019-11-23 01:05:42 +00:00
89bcb00ef1
hark
2019-11-23 00:54:40 +00:00
0fed6d49e4
I can't spell
2019-11-23 00:32:33 +00:00
7a605b4ba6
Trust your insincts
2019-11-23 00:16:34 +00:00
b404e18b15
Merge branch 'master' into FERMICHEMCurTweaks
2019-11-23 00:10:33 +00:00
b056d91ea5
Removes the random love
2019-11-22 23:48:21 +00:00
7d3599b2f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
2019-11-22 18:53:58 +01:00
66a97cb224
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-22 05:17:42 +01:00
7b17bf2acd
god damn bitflags ARGH
2019-11-21 20:30:49 +00:00
46076c95c7
Ghommie is a good friend
2019-11-21 14:22:04 +00:00
911a33bfd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387
2019-11-21 06:36:59 +01:00
dccb3c2e22
part 3
2019-11-21 06:36:22 +01:00
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
01f465dc8c
Scanner formatting
2019-11-21 03:52:00 +00:00
cc53a0061f
Well it compiles
2019-11-21 02:15:58 +00:00
9e5f697838
Merge pull request #9842 from NopemanMcHalt/dab-op-plus
...
Fixes D.A.B. loadout name
2019-11-19 21:31:47 -07:00
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
d4f6bc67ca
Whoops that cansprint is in the wrong place
2019-11-19 22:41:39 +13:00
1b1ed21f42
No adrenals for borgs please
2019-11-19 22:13:22 +13:00
40a01dedfe
Merge pull request #9806 from BlackMajor/Yote
...
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
bddb437872
It works now.
2019-11-18 18:30:46 +01:00
1bb8ff1c0c
Fixes loadout name, adds DAB outfit crate to cargo
...
For "recruitment" on-station.
2019-11-17 15:08:30 +03:00
c7a3652d0a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
2019-11-15 01:12:36 +01:00
f401e622c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-15 01:01:08 +01:00
40523802f3
Merge pull request #9804 from Ghommie/Ghommie-cit351
...
Unmodularize keybindings.
2019-11-14 16:36:55 -07:00
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
4c89b8c33f
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -07:00
2f4562a63b
Merge pull request #9656 from Ghommie/Ghommie-cit290
...
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
617b0db310
Merge pull request #9692 from Ghommie/Ghommie-cit309
...
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
2019-11-14 15:48:34 -07:00
d1ea2d9990
Merge pull request #9554 from NopemanMcHalt/assu
...
[READY] Desperate Assistance Battleforce
2019-11-14 15:43:51 -07:00
358db4f390
Dreamchecker compatibility changes, part 2.
2019-11-14 14:54:12 +01:00
f1612f6619
Merge pull request #9791 from kappa-sama/revolverports
...
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
2019-11-14 01:39:21 -07:00
ce94da9ed3
Merge branch 'master' into Yote
2019-11-14 17:37:57 +13:00
b9a7685830
Adds dogborg catch for doggos and some
2019-11-14 17:14:14 +13:00
2f1a76c21e
Unmodularize keybindings.
2019-11-13 23:57:49 +01:00
c9c7d3e64e
begone
2019-11-13 16:46:13 -05:00
73661cfe52
more fixing+ chem selling tweaks
2019-11-13 09:39:42 -05:00
837052740a
Merge branch 'master' into assu
...
# Conflicts Resolved:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
2019-11-13 11:59:53 +03:00
Fermi