Lin
|
a5b5fb729a
|
Merge pull request #9959 from Ghommie/Ghommie-cit397
patching some combat mode edge cases and issues.
|
2019-11-28 19:16:44 +00:00 |
|
Lin
|
46c02af86e
|
Merge pull request #9948 from Ghommie/Ghommie-cit393
Morgues no longer go "ammunition depleted"
|
2019-11-28 19:12:25 +00:00 |
|
Ghommie
|
9bef7edd0f
|
Rags are no longer transparent reagent containers.
|
2019-11-28 19:59:34 +01:00 |
|
Ghommie
|
74baa00634
|
Ports "#44787"
|
2019-11-28 19:37:46 +01:00 |
|
Putnam3145
|
09897b4ece
|
Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
Ports AI console focus loss fix and fixes an error in my trimline code
|
2019-11-28 05:37:36 -08:00 |
|
Useroth
|
85a6d588a8
|
[fix] Extradimensional oranges now actually grow properly and give proper seeds.
|
2019-11-28 09:26:52 +01:00 |
|
Ghommie
|
60b8688674
|
Ports "Fixes transit tube barricade spam"
|
2019-11-28 07:10:00 +01:00 |
|
Ghommie
|
e884f606c4
|
wait, what the fuck!
|
2019-11-28 05:41:49 +01:00 |
|
Ghommie
|
6194dddf42
|
I'll hold on this until I port the conveyor_construct conversion to stacks.
|
2019-11-28 05:40:26 +01:00 |
|
Ghommie
|
0ad89bd9de
|
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
|
2019-11-28 05:34:56 +01:00 |
|
GrayRachnid
|
b6df1126bb
|
Can't I make a PR without having to make 2 commits to fix my mistakes oh my god
|
2019-11-27 22:52:21 -05:00 |
|
Ghommie
|
b66832809e
|
Fixing that tiny gap in human examine.
|
2019-11-28 04:37:16 +01:00 |
|
Unknown
|
33854e8fd8
|
Adds a huge amount of Christmas clothes
|
2019-11-27 20:07:39 -07:00 |
|
Ghommie
|
4a3a7c841a
|
Removes literally atrocious polka dotted accessories.
|
2019-11-28 03:54:38 +01:00 |
|
Linzolle
|
829cc3d81c
|
Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
|
2019-11-27 20:23:33 -06:00 |
|
Ghommie
|
1795072f94
|
Mistakes were made.
|
2019-11-28 02:47:09 +01:00 |
|
Ghommie
|
efcf79aab0
|
teachin' 🅱️ how to swim
|
2019-11-28 02:32:43 +01:00 |
|
Ghommie
|
13b9158a44
|
Ports "Plasmamen get plasma in their box"
|
2019-11-28 02:30:03 +01:00 |
|
Ghommie
|
dd9116ee70
|
Ports elements: Lightweight shared/global components.
|
2019-11-28 01:47:20 +01:00 |
|
GrayRachnid
|
ad6684380c
|
You can now stack stuff pretty high
|
2019-11-27 18:39:11 -05:00 |
|
GrayRachnid
|
6a13801c1a
|
I assume this is what ghommie meant
|
2019-11-27 18:34:36 -05:00 |
|
GrayRachnid
|
47e3cd346f
|
Fixes codewords and MKUltra enthrall hearing.
|
2019-11-27 16:36:19 -05:00 |
|
Ghommie
|
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 |
|
Ghommie
|
792f1947a7
|
Fixes limbs' set_disabled.
|
2019-11-27 19:45:27 +01:00 |
|
Ghommie
|
f9680130f9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-11-27 18:48:20 +01:00 |
|
Ghommie
|
252c37f421
|
whops 2
|
2019-11-27 08:31:21 +01:00 |
|
Ghommie
|
b432ec4f33
|
Whops
|
2019-11-27 08:25:13 +01:00 |
|
Ghommie
|
a89eccbac5
|
Ports custom reagent icecreams, plus some fixes.
|
2019-11-27 08:16:17 +01:00 |
|
Ghommie
|
3f077df500
|
redundant.
|
2019-11-27 06:40:32 +01:00 |
|
Ghommie
|
d1d201ff26
|
Sanity check.
|
2019-11-27 06:39:09 +01:00 |
|
Ghommie
|
d43d996c38
|
ouch
|
2019-11-27 06:19:17 +01:00 |
|
Ghommie
|
c67f138d23
|
patching some combat mode edge cases and issues.
|
2019-11-27 06:10:08 +01:00 |
|
Ghommie
|
4640d8495d
|
)
|
2019-11-27 05:14:08 +01:00 |
|
Ghommie
|
1f69679cfb
|
Ports a few telecomms updates and fixes.
|
2019-11-27 04:58:05 +01:00 |
|
kevinz000
|
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 |
|
Ghommie
|
d3bce1bbcd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2019-11-27 02:59:08 +01:00 |
|
Ghommie
|
5988e4558c
|
> to add injury to someone you just fragged
|
2019-11-27 02:32:23 +01:00 |
|
Ghommie
|
4e05c27cdb
|
Updating supply pods code.
|
2019-11-27 01:54:10 +01:00 |
|
Fermi
|
e6ecabe54c
|
Scanner
|
2019-11-26 23:23:29 +00:00 |
|
Fermi
|
ca2467ff93
|
Thingie
|
2019-11-26 23:14:14 +00:00 |
|
kevinz000
|
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 |
|
kevinz000
|
6b53845f06
|
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
|
2019-11-26 16:01:48 -07:00 |
|
kevinz000
|
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 |
|
Ghommie
|
d6d830b2ec
|
Morgues no longer go "ammunition depleted"
|
2019-11-26 22:20:52 +01:00 |
|
YakumoChen
|
0b9ea6c7f0
|
no pedoing the AI
|
2019-11-26 19:58:25 +00:00 |
|
Putnam
|
66d1b88725
|
Get
|
2019-11-25 22:23:50 -08:00 |
|
Putnam
|
1283149fb2
|
also allowed wallets
|
2019-11-25 22:22:16 -08:00 |
|
kevinz000
|
4ffe9cd464
|
Update traits.dm
|
2019-11-25 22:53:22 -07:00 |
|
kevinz000
|
804ee207e3
|
Update _status_effects.dm
|
2019-11-25 22:52:19 -07:00 |
|
kevinz000
|
70ec955ef3
|
Update _status_effects.dm
|
2019-11-25 22:47:24 -07:00 |
|