BlackMajor and GitHub
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
BlackMajor and GitHub
47b5dbeaaa
Merge pull request #9625 from Ghommie/Ghommie-cit277
...
Unmodularize digi/muzzled clothing sprites.
2019-11-25 11:30:31 +13:00
kevinz000 and GitHub
f88ed98ee4
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
...
Anthromorphic Insect Revert
2019-11-23 11:44:52 -07:00
Lin and GitHub
e954cec58c
Merge pull request #9898 from Ghommie/Ghommie-cit387
...
Dreamchecker compatibility changes, part 3.
2019-11-23 05:52:44 +00:00
Lin and GitHub
028fa518e4
Merge pull request #9879 from Ghommie/Ghommie-cit383
...
Unmodularize closets.
2019-11-23 05:39:33 +00:00
Ghommie
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
kiwedespars and GitHub
9999d87b42
fixed hands
2019-11-21 22:59:57 -08:00
kiwedespars and GitHub
10b16b2442
reverts insect sprites
2019-11-21 19:39:51 -08:00
Seris02
2dd20c63f9
fixes the icons added
2019-11-21 14:03:37 +08:00
Ghommie
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
Ghommie
dccb3c2e22
part 3
2019-11-21 06:36:22 +01:00
Seris02
60def2a9fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-21 13:08:23 +08:00
kevinz000 and GitHub
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
kevinz000 and GitHub
3efb104b4e
Merge pull request #9876 from Ghommie/Ghommie-cit380
...
Unmodularize tools and apc icons.
2019-11-20 21:47:33 -07:00
kevinz000 and GitHub
47888bd208
Merge pull request #9877 from Ghommie/Ghommie-cit381
...
Unmodularize pAI holo-chassis icons.
2019-11-20 21:47:00 -07:00
Ghommie
10373c7c96
Unmodularize closets.
2019-11-20 06:41:59 +01:00
Ghommie
75ac087988
Unmodularize pAI holo-chassis icons.
2019-11-20 05:54:00 +01:00
kevinz000 and GitHub
9e5f697838
Merge pull request #9842 from NopemanMcHalt/dab-op-plus
...
Fixes D.A.B. loadout name
2019-11-19 21:31:47 -07:00
Ghommie
411310b0c6
Unmodularize tools and apc icons.
2019-11-20 05:18:15 +01:00
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
kevinz000 and GitHub
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
BlackMajor
6cdb54bef1
Fix service borg lights breaking
2019-11-19 21:29:05 +13:00
Lin and GitHub
c57e0f5add
Merge pull request #9782 from Ghommie/Ghommie-cit342
...
fixing stupid pink milk and tea missing sprites.
2019-11-19 03:25:09 +00:00
Lin and GitHub
c188c20f37
Merge pull request #9802 from Ghommie/Ghommie-cit349
...
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
Anonymous
1bb8ff1c0c
Fixes loadout name, adds DAB outfit crate to cargo
...
For "recruitment" on-station.
2019-11-17 15:08:30 +03:00
Seris02
dea5019bc9
cosmic winter coat yeeeehaw
2019-11-17 20:06:01 +08:00
Seris02
7d99508bd0
adds janitor winter coat
2019-11-17 15:45:12 +08:00
Seris02
b7f4580414
robotics winter coat
2019-11-17 11:50:56 +08:00
Seris02
8db64df364
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-16 16:54:27 +08:00
Seris02
e247d44aff
less transparency on the RD coat please
2019-11-16 16:17:13 +08:00
Seris02
e0e3c510d4
adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats
2019-11-16 15:31:20 +08:00
Ghommie
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
Ghommie
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
Ghommie
5bb6247a6d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349
2019-11-15 00:57:38 +01:00
Ghommie
354433cc94
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit342
2019-11-15 00:49:52 +01:00
kevinz000 and GitHub
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
kevinz000 and GitHub
40523802f3
Merge pull request #9804 from Ghommie/Ghommie-cit351
...
Unmodularize keybindings.
2019-11-14 16:36:55 -07:00
kevinz000 and GitHub
d6f540faf7
Merge pull request #9796 from Ghommie/Ghommie-cit347
...
Unmodularize airlocks.
2019-11-14 16:24:56 -07:00
kevinz000 and GitHub
bd650e53da
Merge pull request #9795 from Ghommie/Ghommie-cit346
...
Unmodularize areas.
2019-11-14 16:24:36 -07:00
kevinz000 and GitHub
c3250cecc3
Merge pull request #9788 from Seris02/hemitapered
...
Makes tapered penises look more tapered
2019-11-14 16:23:56 -07:00
kevinz000 and GitHub
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
kevinz000 and GitHub
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
kevinz000 and GitHub
09e5cd95a3
Merge pull request #9690 from Ghommie/Ghommie-cit308
...
Unmodularize configuration, _globalvars and subsystems.
2019-11-14 15:50:20 -07:00
kevinz000 and GitHub
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
kevinz000 and GitHub
d1ea2d9990
Merge pull request #9554 from NopemanMcHalt/assu
...
[READY] Desperate Assistance Battleforce
2019-11-14 15:43:51 -07:00
Ghommie
358db4f390
Dreamchecker compatibility changes, part 2.
2019-11-14 14:54:12 +01:00
kevinz000 and GitHub
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
BlackMajor
ce94da9ed3
Merge branch 'master' into Yote
2019-11-14 17:37:57 +13:00
BlackMajor
b9a7685830
Adds dogborg catch for doggos and some
2019-11-14 17:14:14 +13:00