Hatterhat
6ff7083bfb
the one where i buff a 4 tc item, give trilby a (You), and squash my commits
2019-12-08 01:29:08 -06:00
CitadelStationBot
a105f55e38
Automatic changelog generation for PR #9957 [ci skip]
2019-11-28 13:21:57 -06:00
Lin
53927c97fd
Merge pull request #9957 from Ghommie/Ghommie-cit395
...
fixes missing hypereutactic left inhand sprites.
2019-11-28 19:21:54 +00:00
CitadelStationBot
65c0ef72c8
Automatic changelog generation for PR #9959 [ci skip]
2019-11-28 13:16:47 -06:00
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
CitadelStationBot
5b16fc4868
Automatic changelog generation for PR #9948 [ci skip]
2019-11-28 13:12:28 -06: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
CitadelStationBot
a5e5e20e00
Automatic changelog generation for PR #9943 [ci skip]
2019-11-28 07:37:39 -06: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
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
3728173669
fixes missing hypereutactic left inhands.
2019-11-27 03:56:11 +01:00
CitadelStationBot
8cec8fa506
Automatic changelog generation for PR #9906 [ci skip]
2019-11-26 20:26:21 -06: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
CitadelStationBot
65bec77c5a
Automatic changelog generation for PR #9882 [ci skip]
2019-11-26 17:02:45 -06: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
CitadelStationBot
d79fba2838
Automatic changelog generation for PR #9268 [ci skip]
2019-11-26 17:01:51 -06: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
CitadelStationBot
4c2a7597cc
Automatic changelog generation for PR #9920 [ci skip]
2019-11-26 16:59:11 -06: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
Unknown
65db2b2160
Merge conflicts
2019-11-25 20:19:57 -07:00
Unknown
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
Unknown
495b4b6ddc
Fixes some issues
2019-11-25 20:13:07 -07:00
Dap
281ddf73ba
Ports AI console focus loss fix and fixes an error in my trimline code
...
Port of https://github.com/tgstation/tgstation/pull/44207 and I copy pasted code and missed renaming one thing.
2019-11-25 14:48:26 -07:00
CitadelStationBot
56bdb36058
Automatic changelog generation for PR #9942 [ci skip]
2019-11-25 06:39:22 -06:00
Putnam3145
8219d298a5
Merge pull request #9942 from Useroth/new-tg-plants
...
[Hotfix] Fixed the reagents in the new plants.
2019-11-25 04:39:20 -08:00
Useroth
99300229a1
Fixed the reagents in the new plants.
2019-11-25 13:35:26 +01:00
CitadelStationBot
e4dce88761
Automatic changelog generation for PR #9922 [ci skip]
2019-11-24 17:31:17 -06:00
BlackMajor
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
GrayRachnid
0b60d5e6ef
derp
2019-11-24 17:48:09 -05:00
CitadelStationBot
453bb6ca32
Automatic changelog generation for PR #9867 [ci skip]
2019-11-24 16:31:05 -06:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
CitadelStationBot
315082fc91
Automatic changelog generation for PR #9902 [ci skip]
2019-11-24 16:30:45 -06:00
BlackMajor
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
BlackMajor
47b5dbeaaa
Merge pull request #9625 from Ghommie/Ghommie-cit277
...
Unmodularize digi/muzzled clothing sprites.
2019-11-25 11:30:31 +13:00
CitadelStationBot
18e7e85e87
Automatic changelog generation for PR #9907 [ci skip]
2019-11-24 14:01:39 -06:00
Lin
7481661182
Merge pull request #9907 from Putnam3145/midround-Vr-fix
...
[DYNAMIC] Prevents VR mobs from being midround antags.
2019-11-24 20:01:36 +00:00
Useroth
6a59cc1c99
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
Fermi
99e9c606c0
I dunno what I did but it's fixed... somehow.
2019-11-24 04:03:51 +00:00
Fermi
614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
Fermi
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
Fermi
25fe5ec14b
Revert "Revert "Alright""
...
This reverts commit 505e15a3e1
2019-11-24 03:04:37 +00:00
Fermi
1df097b8ed
Revert "Revert "hark""
...
This reverts commit f4b54f15d2
2019-11-24 03:04:31 +00:00
Fermi
f03b90f2e2
Revert "Revert "I can't spell""
...
This reverts commit 3d713b6c96
2019-11-24 03:04:30 +00:00
Fermi
2501b5c88c
Revert "Revert "Okay""
...
This reverts commit fb2c29caff
2019-11-24 03:04:27 +00:00
