e5c8f7bf06
Merge branch 'master' into glassware
2019-12-07 12:50:32 -05:00
878a2d65de
Merge pull request #9919 from Ghommie/Ghommie-391
...
Fixes several "behind" layer tail sprites skipping areas normally covered by bodyparts.
2019-12-06 04:52:14 +00:00
e2f9a68c2c
Merge pull request #10049 from Useroth/new-tg-plants
...
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
2fcdb24fe3
Merge pull request #10019 from Seris02/wintercoattide
...
Adds CentCom, Assistant's formal, ratvarian and narsian winter coats + loadout for formal
2019-12-05 21:29:08 -07:00
a6f48ea74c
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
...
[Ready] [Test Merge] Ports Xenobio Hotkeys
2019-12-06 11:29:34 +13:00
0c5a1b900b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide
2019-12-05 21:09:38 +08:00
f74c1d835f
removes thing
2019-12-05 20:53:55 +08:00
2ce79828b8
ratvar coat updated
2019-12-05 20:46:59 +08:00
950b884da5
Adds colored fairygrass.
2019-12-05 01:47:42 +01:00
b3d778f786
readds
2019-12-03 23:54:24 -05:00
e1717bb534
Merge branch 'master' into crow
2019-12-03 23:45:05 -05:00
72e5e17c51
ratvarian and narsian winter coats
2019-12-03 18:16:36 +08:00
99e9c7299e
Merge pull request #10004 from Ghommie/Ghommie-cit414
...
Unmodularizing first aid kits.
2019-12-03 01:30:51 +00:00
44c621e5e9
Merge pull request #9895 from Thalpy/OrganQoL
...
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
9afbabb55e
removes cult coat for now, adds coats to places
2019-12-01 05:42:43 +08:00
b5f732c838
formal and cc winter coats + start of cult coats
2019-12-01 04:06:03 +08:00
9b8ed8ca4f
The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs.
2019-11-29 07:14:51 +01:00
521fdec59b
Merge pull request #9960 from Ghommie/Ghommie-cit398
...
Ports custom reagent icecreams.
2019-11-28 23:11:57 -07:00
7495ce602a
Merge pull request #9693 from Ghommie/Ghommie-cit310
...
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-28 23:03:07 -07:00
53927c97fd
Merge pull request #9957 from Ghommie/Ghommie-cit395
...
fixes missing hypereutactic left inhand sprites.
2019-11-28 19:21:54 +00:00
a5298dac7e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-27 21:44:56 +01:00
a89eccbac5
Ports custom reagent icecreams, plus some fixes.
2019-11-27 08:16:17 +01:00
3728173669
fixes missing hypereutactic left inhands.
2019-11-27 03:56:11 +01:00
2aa0211121
Merge pull request #9906 from Xantholne/xantholne-berets02
...
[Ready] Ports/Adds new berets but I don't break the branch somehow
2019-11-26 19:26:18 -07:00
ccfdb74508
Merge pull request #9882 from FestiveBall/Fersi
...
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
8b56e25d97
Merge pull request #9920 from YakumoChen/ai-sprites
...
Ports a bunch of VG's AI sprites
2019-11-26 15:59:09 -07:00
65db2b2160
Merge conflicts
2019-11-25 20:19:57 -07:00
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
47b5dbeaaa
Merge pull request #9625 from Ghommie/Ghommie-cit277
...
Unmodularize digi/muzzled clothing sprites.
2019-11-25 11:30:31 +13:00
6a59cc1c99
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
f88ed98ee4
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
...
Anthromorphic Insect Revert
2019-11-23 11:44:52 -07:00
d07266e432
new VG icons, un-animates holograms
2019-11-23 00:09:17 -05:00
496d81b76a
New VG AI icons, fixes Yes Man.
2019-11-23 00:00:48 -05:00
2a22a7a3c2
update AI.dmi
2019-11-22 23:00:16 -05:00
45ad9a6598
update AI.dmi
2019-11-22 22:46:58 -05:00
38cc9a546b
welp
2019-11-23 02:56:25 +01:00
77913406ed
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 18:50:24 -05:00
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05: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
f53918682c
re-adds hats
2019-11-22 05:52:18 -05:00
b01be3b1ff
Merge branch 'master' into crow
2019-11-22 05:48:36 -05: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
b4b80ef314
un-superfluffs the fluff
2019-11-21 19:46:53 -08:00
3310a2c435
Little APC overlays tweak. Removing rogue pixels from the energy gun.
2019-11-22 04:26:00 +01:00
2136968585
Ring ring
2019-11-21 21:55:17 -05:00
00bffba7ea
Why do surgeries always end up with jank
2019-11-21 15:57:21 +00:00
1bc4a788df
Another touch to the missing icons.
2019-11-21 11:47:31 +01:00
76d72f6f6e
Fixed a couple missing icons.
2019-11-21 11:38:54 +01:00
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
TrilbySpaceClone