 Enric Gabriel
|
c5afd0cc9f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-23 18:30:41 -03:00 |
|
|
Artur
|
d493886875
|
Speedmerge fix
|
2020-09-23 19:14:50 +03:00 |
|
|
SandPootandGitHub
|
627ceb5b19
|
Breaks lines... with a crowbar (#74)
|
2020-09-21 14:36:06 -03:00 |
|
|
Enric Gabriel
|
4de9baf690
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-21 14:10:28 -03:00 |
|
|
Artur
|
435565f1d8
|
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
|
2020-09-21 00:16:12 +03:00 |
|
|
Enric Gabriel
|
d2257abe86
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-19 13:21:18 -03:00 |
|
|
GhomandGitHub
|
868e464b40
|
fixes linter issues, removes acid degrading armor (#13399)
* fix
* more
* Update brawn.dm
* Update ticketmachine.dm
|
2020-09-19 15:04:48 +02:00 |
|
|
Enric Gabriel
|
d85ebed8db
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-16 16:22:36 -03:00 |
|
|
Artur
|
74533d3f9d
|
fiiix shit
|
2020-09-16 11:16:39 +03:00 |
|
|
siliconsandGitHub
|
ca8b13b86a
|
Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
|
2020-09-16 00:31:18 -07:00 |
|
|
silicons
|
95ebeac5b6
|
fix
|
2020-09-15 17:27:11 -07:00 |
|
|
Artur
|
12fbd67b6d
|
Stupid shit
|
2020-09-09 21:27:32 +03:00 |
|
|
Artur
|
ff4c94c2d5
|
Fixes some verbs and gateway
|
2020-09-09 21:08:16 +03:00 |
|
|
Enric Gabriel
|
38c0f8efbd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-07 18:21:54 -03:00 |
|
|
siliconsandGitHub
|
07b28f40de
|
Merge pull request #13359 from Ghommie/Ghommie-cit838
Turf visuals fix plus corrected names of a couple things.
|
2020-09-07 13:42:05 -07:00 |
|
|
Ghommie
|
4a04b22b72
|
Turf visuals fix plus corrected names of a couple things.
|
2020-09-06 18:53:01 +02:00 |
|
|
Enric Gabriel
|
499fec6a16
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-06 10:42:43 -03:00 |
|
|
BlackMajorandGitHub
|
1943a2fdd7
|
Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
|
2020-09-06 17:53:35 +12:00 |
|
|
timothyteakettle
|
cdaef63fa1
|
sorry travis
|
2020-09-03 23:07:19 +01:00 |
|
|
timothyteakettle
|
90eef6efc9
|
Merge remote-tracking branch 'upstream/master' into limbs
|
2020-09-03 22:46:32 +01:00 |
|
|
timothyteakettle
|
9e2ee588c9
|
rp prosthetics
|
2020-09-03 22:05:21 +01:00 |
|
|
Artur
|
c79e9fbc0b
|
https://github.com/tgstation/tgstation/pull/53263
|
2020-09-02 18:48:09 +03:00 |
|
|
Artur
|
542453a7f1
|
Fixes shidd not working
|
2020-09-02 18:04:36 +03:00 |
|
|
Artur
|
3bef4ba35e
|
TGUI updates + statpanel
|
2020-09-02 17:52:47 +03:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -03:00 |
|
|
Letter N
|
ae482c1bb8
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-29 14:09:56 +08:00 |
|
|
Timothy Teakettle
|
fe25046410
|
Merge branch 'master' into limbs
|
2020-08-27 18:06:35 +01:00 |
|
|
Enric Gabriel
|
45c5d5d81d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-25 16:06:57 -03:00 |
|
|
siliconsandGitHub
|
973839dee4
|
ports my baystruments updates from tg (#13219)
* subsystem
* fix
* e
* update
* fix
|
2020-08-25 21:04:42 +02:00 |
|
|
timothyteakettle
|
cd7293a9a2
|
limbs
|
2020-08-24 03:19:36 +01:00 |
|
|
silicons
|
bd5766a8be
|
changes
|
2020-08-23 05:27:53 -07:00 |
|
|
Enric Gabriel
|
f759503b49
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-22 20:30:49 -03:00 |
|
|
siliconsandGitHub
|
7737e76b32
|
Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-22 15:19:07 -07:00 |
|
|
Letter N
|
afe32406c0
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-22 13:40:36 +08:00 |
|
|
Enric Gabriel
|
b0662f5e39
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-21 02:19:20 -03:00 |
|
|
siliconsandGitHub
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
|
Enric Gabriel
|
b0cf18fc5a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-20 13:29:24 -03:00 |
|
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
|
Putnam
|
81dc6c7ee5
|
Ports reftracking from TG.
|
2020-08-18 20:41:43 -07:00 |
|
|
Letter N
|
5dff3e9a04
|
deletes ping
|
2020-08-18 11:35:10 +08:00 |
|
|
Letter N
|
90cb13f6af
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-18 10:33:21 +08:00 |
|
|
Enric Gabriel
|
cf2c21ea52
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-17 12:06:32 -03:00 |
|
|
Letter N
|
610e25beb7
|
oops updates asset cache
|
2020-08-17 20:51:05 +08:00 |
|
|
Detective Google
|
016fd2ac3c
|
woo yeah yeah woo
|
2020-08-15 23:55:52 -05:00 |
|
|
SandPootandGitHub
|
518c70e6ed
|
Some Cit reverts and skyrat features. (#46)
|
2020-08-15 13:29:50 -03:00 |
|
|
Enric Gabriel
|
bae8c236f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-09 18:34:33 -03:00 |
|
|
lolman360andGitHub
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
|
Letter N
|
f1c4a7f6ac
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-09 14:54:16 +08:00 |
|
|
Enric Gabriel
|
55a116fd76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-07 21:24:04 -03:00 |
|