 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
siliconsandGitHub
|
1586625e6b
|
Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
|
2020-08-06 21:59:13 -07:00 |
|
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
|
Enric Gabriel
|
e4f7092490
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-05 22:52:22 -03:00 |
|
|
siliconsandGitHub
|
ed5aa7c9f7
|
Merge pull request #12994 from kappa-sama/patch-37
removes dildo
|
2020-08-05 15:27:29 -07:00 |
|
|
siliconsandGitHub
|
2d697e1867
|
Merge pull request #12926 from GlitchyCore/master
Adds a new fun round end sound
|
2020-08-05 15:14:20 -07:00 |
|
|
Enric Gabriel
|
8558cc8747
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-04 01:48:59 -03:00 |
|
|
kappa-samaandGitHub
|
178976f5e5
|
no
|
2020-08-01 16:54:21 -04:00 |
|
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
|
Timothy Teakettle
|
31963b32a4
|
subcategories cool
|
2020-07-29 17:14:07 +01:00 |
|
|
Timothy TeakettleandGitHub
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
|
Enric Gabriel
|
935901593b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-29 09:52:32 -03:00 |
|
|
LinandGitHub
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
|
Timothy Teakettle
|
721e018aec
|
loadout stuff
|
2020-07-28 22:52:00 +01:00 |
|
|
Enric Gabriel
|
b942c9f162
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-28 14:46:58 -03:00 |
|
|
GlitchyCore
|
cf7678c7d4
|
hey let's forget to add the filetype to this instead of making sure it would actually work
|
2020-07-27 14:41:10 -05:00 |
|
|
GhomandGitHub
|
f946a157f4
|
Update mapping.dm
|
2020-07-27 14:54:46 +02:00 |
|
|
GhomandGitHub
|
7e18e7a7a8
|
Update mapping.dm
|
2020-07-27 14:52:05 +02:00 |
|
|
Ghommie
|
f1c242aadc
|
Fixing new bugs and stuff.
|
2020-07-27 14:16:01 +02:00 |
|
|
GlitchyCore
|
0e780d4ba0
|
hey you know what it'd be good if the filepath was actually there instead of the the .ogg name
|
2020-07-26 16:59:26 -05:00 |
|
|
GlitchyCore
|
e9b397cbad
|
ADDS END ROUND SOUND
|
2020-07-26 16:41:48 -05:00 |
|
|
timothyteakettle
|
315e7e1f99
|
bugfixes
|
2020-07-24 23:49:15 +01:00 |
|
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
|
Enric Gabriel
|
ba3da94e74
|
fix some positioning stuff + revert forced _indicator on some binds
|
2020-07-24 00:08:08 -03:00 |
|
|
Enric Gabriel
|
e0fdf3dce9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts
|
2020-07-23 19:14:58 -03:00 |
|