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
silicons and GitHub
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
silicons and GitHub
ed5aa7c9f7
Merge pull request #12994 from kappa-sama/patch-37
...
removes dildo
2020-08-05 15:27:29 -07:00
silicons and GitHub
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
Letter N
454baea55f
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-04 09:31:34 +08:00
Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
kappa-sama and GitHub
178976f5e5
no
2020-08-01 16:54:21 -04:00
Enric Gabriel
372b486daf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-01 10:07:19 -03:00
Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
Unknown
16722c47c3
CentCom Galactic Ban DB
2020-07-29 21:39:58 -05:00
Timothy Teakettle
31963b32a4
subcategories cool
2020-07-29 17:14:07 +01:00
Timothy Teakettle and GitHub
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
Lin and GitHub
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
Ghom and GitHub
f946a157f4
Update mapping.dm
2020-07-27 14:54:46 +02:00
Ghom and GitHub
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
silicons
d30acd5b09
smooth
2020-07-23 13:49:17 -07:00
silicons and GitHub
9222933d77
Merge pull request #12816 from timothyteakettle/wound-port
...
ports part 1 of tg wounds
2020-07-23 10:25:25 -07:00
Enric Gabriel
36970c378b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-07-22 12:06:12 -03:00
Letter N
d5a6a3ecd9
actual code chang
2020-07-22 12:02:31 +08:00
Letter N
49941ea2e6
code, still not enabled
2020-07-22 10:27:37 +08:00
lolman360
0f1aa3c0ca
'lolman? did you test your code?'
...
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
Enric Gabriel
f0904c6b10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-07-21 01:19:25 -03:00
Putnam
3faa9d6f13
Chat queue optimization.
...
To be exact, makes it only do the expensive text replacement when there's a client to receive the text.
2020-07-20 19:58:44 -07:00
Timothy Teakettle and GitHub
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
Lin and GitHub
f7355dde62
Merge pull request #12728 from silicons/vote
...
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
2020-07-20 18:17:45 -05:00
Timothy Teakettle and GitHub
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
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
silicons and GitHub
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
Letter N
2afab07b4a
https://github.com/tgstation/tgstation/pull/52255
2020-07-16 20:05:37 +08:00
Enric Gabriel and GitHub
7e533b336d
fix the thing please ( #24 )
2020-07-14 22:24:20 -03:00
b5f77eeb66
Ports a lot of stuff from all around ( #23 )
...
* shhh
* checks the thing
* please don't hurt me, it is my first time
* there, much better
* this is huge
Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com >
2020-07-14 01:31:52 -03:00
Artur
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03: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
Lin and GitHub
955d9fa0cc
Merge pull request #12624 from Citadel-Station-13/policy
...
policy configuration & support hooks for clone memory disorder
2020-07-11 16:40:38 -05:00
Enric Gabriel