silicons
|
822f1c9bf3
|
fix
|
2020-09-27 03:07:51 -07:00 |
|
silicons
|
57c4a3416a
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-09-25 01:03:15 -07:00 |
|
silicons
|
7ca1b1dc79
|
Merge pull request #13380 from Putnam3145/cache-locality-experiments
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
|
2020-09-23 14:39:56 -07:00 |
|
Artur
|
d493886875
|
Speedmerge fix
|
2020-09-23 19:14:50 +03:00 |
|
silicons
|
2dddb2253e
|
tweak
|
2020-09-21 21:03:28 -07:00 |
|
silicons
|
4ab064a50d
|
fix
|
2020-09-21 20:58:33 -07:00 |
|
silicons
|
31791df2bd
|
fixes
|
2020-09-21 20:38:43 -07:00 |
|
silicons
|
2c4dc4d1a9
|
ok
|
2020-09-21 19:08:21 -07:00 |
|
silicons
|
ddc7f10de7
|
fixes
|
2020-09-21 18:35:42 -07:00 |
|
silicons
|
7249fe058f
|
config based
|
2020-09-21 17:36:30 -07:00 |
|
Putnam
|
e89e7adda4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
|
2020-09-21 03:31:35 -07:00 |
|
silicons
|
9fef16964c
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-09-21 03:13:51 -07:00 |
|
Artur
|
435565f1d8
|
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
|
2020-09-21 00:16:12 +03:00 |
|
silicons
|
c5403b5ef4
|
fixes
|
2020-09-20 02:49:42 -07:00 |
|
Ghom
|
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 |
|
Artur
|
74533d3f9d
|
fiiix shit
|
2020-09-16 11:16:39 +03:00 |
|
silicons
|
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 |
|
Putnam
|
b06f19cf5c
|
Brought reactions to extools again; now including debug symbols.
This time they work!
|
2020-09-14 19:32:31 -07:00 |
|
Putnam
|
372be3bf5c
|
Fixed all the problems.
|
2020-09-14 02:37:07 -07:00 |
|
Putnam
|
3ea7f0defa
|
Added a gas mixture counter and fixed a segfault on exit.
|
2020-09-10 17:42:49 -07:00 |
|
Putnam
|
373f6a1068
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
|
2020-09-10 04:57:43 -07:00 |
|
Putnam
|
fb17f0cc75
|
Somehow made monstermos over 100x as fast
|
2020-09-10 04:48:55 -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 |
|
silicons
|
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 |
|
BlackMajor
|
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 |
|
Letter N
|
fe17bee28e
|
reverts thing kev said about
|
2020-08-29 14:36:41 +08: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 |
|
silicons
|
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 |
|
silicons
|
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
|
0b159b218a
|
revert moment
|
2020-08-22 16:30:56 +08: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 |
|
silicons
|
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 |
|
Letter N
|
2dd3d71b19
|
config©paste chang.
|
2020-08-20 16:36:24 +08:00 |
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
silicons
|
11467e1cae
|
Merge pull request #13212 from Putnam3145/reftrack
Ports reftracking from TG.
|
2020-08-19 22:03:16 -07:00 |
|
silicons
|
91484356c5
|
Merge pull request #13183 from SmArtKar/shuttle_hotfix
Shuttle hotfix so now you can make huge shuttle things
|
2020-08-19 21:03:58 -07:00 |
|
Putnam
|
81dc6c7ee5
|
Ports reftracking from TG.
|
2020-08-18 20:41:43 -07:00 |
|