timothyteakettle
|
8709a72fc0
|
fry everything
|
2020-07-20 00:40:18 +01:00 |
|
Timothy Teakettle
|
037cec508e
|
fixes a math mistake
|
2020-07-19 21:43:17 +01:00 |
|
silicons
|
771a28e685
|
oh boy
|
2020-07-18 17:48:51 -07:00 |
|
TheSpaghetti
|
16957d78e9
|
Makes the grammar bad again.
For some reason the fixed grammar didn't compile.
|
2020-07-18 18:11:48 -04:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Lin
|
ba3dc6a73b
|
Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
|
2020-07-18 17:02:02 -05:00 |
|
Timothy Teakettle
|
50b346355c
|
fixes travis but without dm fucking up
|
2020-07-18 22:13:15 +01:00 |
|
Timothy Teakettle
|
35b5c019a5
|
Revert "travis please"
This reverts commit b712538e69.
|
2020-07-18 22:12:01 +01:00 |
|
Timothy Teakettle
|
b712538e69
|
travis please
|
2020-07-18 22:10:08 +01:00 |
|
Timothy Teakettle
|
c1ac3bae6e
|
appease travis
|
2020-07-18 22:06:07 +01:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
Timothy Teakettle
|
fe79c53f04
|
bugfixes
|
2020-07-18 21:40:19 +01:00 |
|
Putnam
|
d88ade40bf
|
actually fixes uplink
|
2020-07-18 01:51:59 -07:00 |
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
silicons
|
183a929e42
|
Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix
wrestling rotation fix
|
2020-07-17 17:07:06 -07:00 |
|
TheSpaghetti
|
b2e9579217
|
Fixes typos in the light sensitivity trait.
It was bothering me.
|
2020-07-17 00:48:45 -04:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
silicons
|
484da28600
|
Merge branch 'master' into shoelaces
|
2020-07-16 17:31:41 -07:00 |
|
silicons
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07: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 |
|
silicons
|
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 |
|
TheSpaghetti
|
4b615b8a6f
|
It should actually work now.
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-07-14 02:20:27 -04:00 |
|
Lin
|
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 |
|
TheSpaghetti
|
cb8725d08d
|
ok maybe it is
|
2020-07-12 17:20:08 -04:00 |
|
TheSpaghetti
|
a3531383d3
|
"monophobia = new" isn't needed
|
2020-07-12 15:29:32 -04:00 |
|
TheSpaghetti
|
0200c4ca1f
|
Fixed the double period.
Whoops.
|
2020-07-12 13:13:25 -04:00 |
|
TheSpaghetti
|
d8aa20b4e9
|
Adds monophobia quirk
|
2020-07-12 13:11:06 -04:00 |
|
silicons
|
8d5d194a26
|
hahahahaha
|
2020-07-11 00:30:56 -07:00 |
|
silicons
|
4f4c6b85bf
|
Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
|
2020-07-11 00:14:47 -07: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 |
|
Ghom
|
e7d19f512e
|
Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
|
2020-07-06 22:54:58 +02:00 |
|
Ghom
|
bc5e7d1513
|
Merge pull request #12688 from Weblure/small-strides-fix
[READY] Fixes Small Strides Formula
|
2020-07-06 22:48:09 +02:00 |
|