Putnam3145
6b2d3b116d
Merge branch 'master' into Ghommie-cit430
2019-12-05 20:53:14 -08:00
kevinz000
54be35a243
Merge pull request #9997 from Sishen1542/nuked
...
removes superspeed from nuka cola
2019-12-05 21:48:34 -07:00
kevinz000
5048995a58
Merge pull request #9993 from Ghommie/Ghommie-cit412
...
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
Ghommie
9ca7bb759c
Ports "Slightly improves visible and audible messages."
2019-12-06 02:02:12 +01:00
Ghommie
3c7d2972de
Porting some return type annotations and bad keyword fixes, linter stuff.
2019-12-03 03:31:35 +01:00
Putnam3145
e1a9c8e6d3
Merge pull request #9972 from Ghommie/Ghommie-cit403
...
Fixed double whitespace gap in human, ai and carbon examine.
2019-11-30 22:46:29 -08:00
Sishen
69e11e4203
olllll
2019-11-28 23:01:15 -07:00
Sishen
3a1e4dec5a
Revert "lol"
...
This reverts commit 7f6a1a6fda
2019-11-28 23:00:13 -07:00
Sishen
7f6a1a6fda
lol
2019-11-28 22:53:39 -07:00
Ghommie
2bd4ac5de8
Also AI and Carbon
2019-11-29 06:31:23 +01:00
Ghommie
e6484a22a8
Ports tgstation loom changes, and durathred golems.
2019-11-29 05:34:17 +01:00
Ghommie
b66832809e
Fixing that tiny gap in human examine.
2019-11-28 04:37:16 +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
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
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
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +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
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
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
Fermi
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
Fermi
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e
Revert "pls2"
...
This reverts commit 0eb635b908
2019-11-24 03:02:04 +00:00
Fermi
8ea6618f5d
Revert "ARGH"
...
This reverts commit f0f52ce3f8
2019-11-24 03:01:59 +00:00
Fermi
f0f52ce3f8
ARGH
2019-11-24 02:55:50 +00:00
Fermi
0eb635b908
pls2
...
ugh
2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
Fermi
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05: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
98998ca85f
un-moths the anthromorphic insects
2019-11-21 19:47:48 -08:00
Lin
522a664f55
Merge pull request #9887 from Ghommie/Ghommie-cit385
...
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
Lin
1ddb9935ff
Merge pull request #9530 from Ghommie/Ghommie-cit245
...
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Ghommie
6a0bd7c925
THE REVENGE OF THE WHITESPACES
2019-11-21 07:40:49 +01:00
nik707
0300927974
Merge pull request #9487 from Citadel-Station-13/spooky
...
adds an easy way for admins to force enable halloween races without the rest of halloween's code
2019-11-20 23:00:09 -06:00
kevinz000
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
Fermi
bfb5f75016
Finishing up final UI adjustments
2019-11-20 21:23:54 +00:00
Ghommie
920eba0b03
ayy
2019-11-20 21:41:59 +01:00
Ghommie
aab7ad192b
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-20 21:00:17 +01:00
kevinz000
67abc4ff03
Merge pull request #9855 from Ghommie/Ghommie-cit371
...
Fixing suit store overlays
2019-11-19 21:38:22 -07: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
Ghommie
63a3919ed2
Fixing gasping xenos.
2019-11-18 20:58:22 +01:00
Ghommie
21c1f8bc2a
Fixing suit store overlays
2019-11-18 15:19:39 +01:00
kevinz000
66f8b5f404
Merge pull request #9769 from Ghommie/Ghommie-cit336
...
ID console fixes and other tweaks.
2019-11-16 01:17:23 -07:00
