 Enric Gabriel
|
05593f84a0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-16 22:13:13 -03:00 |
|
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
|
siliconsandGitHub
|
484da28600
|
Merge branch 'master' into shoelaces
|
2020-07-16 17:31:41 -07:00 |
|
|
siliconsandGitHub
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07:00 |
|
|
Enric Gabriel
|
310b0e4e91
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-16 14:53:25 -03:00 |
|
|
Artur
|
af65b626e3
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-16 15:56:08 +03:00 |
|
|
Letter N
|
819ca63456
|
https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing
|
2020-07-16 20:42:02 +08:00 |
|
|
siliconsandGitHub
|
147a905b5d
|
Merge pull request #12783 from Sneakyrat6/oocNotesExploit
Fixes seeing real name in OOC Notes
|
2020-07-15 14:48:55 -07:00 |
|
|
Sneakyrat6
|
538e7c62cd
|
Fixes seeing real name in OOC Notes
|
2020-07-15 13:32:56 -05:00 |
|
|
Timothy Teakettle
|
11148b0a26
|
optimisaiton
|
2020-07-14 18:51:46 +01:00 |
|
|
Timothy Teakettle
|
1f8e47c0f5
|
actually works
|
2020-07-14 18:40:20 +01:00 |
|
|
Timothy Teakettle
|
dd1cce50e8
|
better solution
|
2020-07-14 17:23:18 +01:00 |
|
|
Timothy Teakettle
|
657810bb13
|
please fix it
|
2020-07-14 17:08:57 +01:00 |
|
|
Timothy Teakettle
|
98f63772b3
|
fix wrestling rotation
|
2020-07-14 14:35:13 +01:00 |
|
|
Artur
|
d0f1a805e4
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-14 16:15:48 +03:00 |
|
|
|
4b615b8a6f
|
It should actually work now.
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-07-14 02:20:27 -04:00 |
|
|
Enric Gabriel
|
674af2dc86
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-13 17:30:11 -03:00 |
|
|
LinandGitHub
|
55c4e40fbb
|
Merge pull request #12706 from silicons/records
adds security/medical records to character setup
|
2020-07-13 11:50:02 -05:00 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
|
Enric Gabriel
|
e3eb8b0b02
|
few fixes
|
2020-07-13 00:58:06 -03:00 |
|
|
TheSpaghettiandGitHub
|
cb8725d08d
|
ok maybe it is
|
2020-07-12 17:20:08 -04:00 |
|
|
TheSpaghettiandGitHub
|
a3531383d3
|
"monophobia = new" isn't needed
|
2020-07-12 15:29:32 -04:00 |
|
|
TheSpaghettiandGitHub
|
0200c4ca1f
|
Fixed the double period.
Whoops.
|
2020-07-12 13:13:25 -04:00 |
|
|
TheSpaghettiandGitHub
|
d8aa20b4e9
|
Adds monophobia quirk
|
2020-07-12 13:11:06 -04:00 |
|
|
Enric Gabriel
|
beec77b17d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-11 20:04:30 -03:00 |
|
|
Enric Gabriel
|
bf39a91205
|
combat indicator
|
2020-07-11 19:47:48 -03:00 |
|
|
silicons
|
8d5d194a26
|
hahahahaha
|
2020-07-11 00:30:56 -07:00 |
|
|
siliconsandGitHub
|
4f4c6b85bf
|
Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
|
2020-07-11 00:14:47 -07:00 |
|
|
Enric Gabriel
|
7b593d16fb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-11 03:13:42 -03:00 |
|
|
Artur
|
84a22a9f49
|
Fixes cloning species transfer
|
2020-07-09 23:06:57 +03:00 |
|
|
Timothy Teakettle
|
02f46322ad
|
port examine
|
2020-07-09 18:32:45 +01:00 |
|
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
|
Artur
|
e3ba2e60c6
|
Not supported
|
2020-07-08 20:31:08 +03:00 |
|
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
|
silicons
|
cee15792b7
|
ok
|
2020-07-07 07:25:10 -07:00 |
|
|
Enric Gabriel
|
9c43c980cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-06 19:20:20 -03:00 |
|
|
GhomandGitHub
|
e7d19f512e
|
Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
|
2020-07-06 22:54:58 +02:00 |
|
|
GhomandGitHub
|
bc5e7d1513
|
Merge pull request #12688 from Weblure/small-strides-fix
[READY] Fixes Small Strides Formula
|
2020-07-06 22:48:09 +02:00 |
|
|
Artur
|
7ebc785437
|
fIXES UPLINK
|
2020-07-05 21:52:24 +03:00 |
|
|
Enric Gabriel
|
961a217691
|
holy shit, there's so much stuff here, so... idk exactly what it does
|
2020-07-04 21:39:32 -03:00 |
|
|
Enric Gabriel
|
ee00138850
|
if you don't want a spotlight in you, that's okay
|
2020-07-04 17:42:04 -03:00 |
|
|
Enric Gabriel
|
83522c8571
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-04 17:18:13 -03:00 |
|
|
Enric GabrielandGitHub
|
1f4cad192c
|
ic quick spawn revamped (#19)
|
2020-07-04 14:15:04 -03:00 |
|
|
GhomandGitHub
|
871993ce14
|
Merge pull request #12593 from silicons/autobunker
adds verb to auto bunker override on linked servers
|
2020-07-04 18:36:59 +02:00 |
|
|
GhomandGitHub
|
17ee8c5960
|
Merge pull request #12660 from YakumoChen/master
Reverts improv small arms, makes guncrafting easier and faster
|
2020-07-04 18:35:22 +02:00 |
|
|
siliconsandGitHub
|
c10350f10e
|
Merge pull request #12677 from Ghommie/Ghommie-cit830
Fixes items' skills list keys missing associated traits and improves modulability a little.
|
2020-07-04 00:12:37 -07:00 |
|
|
siliconsandGitHub
|
103b8b7600
|
Merge pull request #12662 from kappa-sama/patch-29
makes bows and arrows more feasible improv weapons
|
2020-07-04 00:11:45 -07:00 |
|
|
siliconsandGitHub
|
f6be57269d
|
Merge pull request #12687 from Ghommie/Ghommie-cit832
Fixing obscured inventory slots unequip block, for real.
|
2020-07-04 00:10:49 -07:00 |
|