 raspy-on-osu
|
ca34a50726
|
Port "Better Explosion Echoes" by NotRanged https://github.com/Skyrat-SS13/Skyrat13/pull/3295
|
2020-08-27 23:39:43 -04:00 |
|
|
Timothy Teakettle
|
b3c459c59c
|
okay you can use any emote
|
2020-08-27 21:04:36 +01:00 |
|
|
Lynxless
|
4caeb310f7
|
Added blank line to the end of files
|
2020-08-27 15:59:07 -03:00 |
|
|
Lynxless
|
828a65a7fd
|
New branch test
|
2020-08-27 15:46:40 -03:00 |
|
|
Enric Gabriel
|
0db4397e7c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-27 14:07:17 -03:00 |
|
|
Timothy Teakettle
|
fe25046410
|
Merge branch 'master' into limbs
|
2020-08-27 18:06:35 +01:00 |
|
|
timothyteakettle
|
8d6a026153
|
yep
|
2020-08-27 00:01:54 +01:00 |
|
|
timothyteakettle
|
97564312e3
|
mindreaders know your move
|
2020-08-26 17:06:58 +01:00 |
|
|
Ghommie
|
2811f744e3
|
Fixing some mistakes with the priority overlays removal PR.
|
2020-08-26 14:00:35 +02:00 |
|
|
lolman360
|
6b096d80cc
|
eee o aaa
|
2020-08-25 18:55:57 +10:00 |
|
|
timothyteakettle
|
ffcceb687f
|
fuck2
|
2020-08-24 03:23:45 +01:00 |
|
|
timothyteakettle
|
237a3fc682
|
fuck
|
2020-08-24 03:22:42 +01:00 |
|
|
timothyteakettle
|
cd7293a9a2
|
limbs
|
2020-08-24 03:19:36 +01:00 |
|
|
lolman360
|
f2a7c2599d
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-24 09:36:36 +10:00 |
|
|
lolman360andGitHub
|
bd5848a0e3
|
Update recipes_misc.dm
|
2020-08-24 08:52:42 +10:00 |
|
|
Enric Gabriel
|
1a4e563c9c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-23 18:54:50 -03:00 |
|
|
siliconsandGitHub
|
4d7d068407
|
Update airlock.dm (#13182)
|
2020-08-23 21:01:26 +02:00 |
|
|
lolman360andGitHub
|
289280f0ec
|
Update recipes_misc.dm
|
2020-08-24 00:00:39 +10:00 |
|
|
lolman360
|
bc14155632
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-23 17:01:45 +10:00 |
|
|
lolman360
|
1deafc7103
|
its asking me to commit hold on
|
2020-08-23 17:01:32 +10:00 |
|
|
lolman360
|
2a3ada511e
|
It's all codersprites?
Always has been.
|
2020-08-23 16:51:55 +10: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
|
c7c74e7c51
|
Merge pull request #13213 from lolman360/breath
breath mask balaclava
|
2020-08-22 15:22:04 -07:00 |
|
|
siliconsandGitHub
|
876dc36dbc
|
Merge pull request #13201 from kiwedespars/return-the-punch
makes it so you can craft armwraps roundstart again.
|
2020-08-22 15:21:22 -07: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
|
317480a3e7
|
something something skin texture revert. oh and oh fuck shit passkeys works again.
|
2020-08-22 15:07:02 +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 |
|
|
kiwedesparsandGitHub
|
055d397e1e
|
adds tape
|
2020-08-21 13:34:02 -07:00 |
|
|
Letter N
|
f04918bdca
|
working code?
|
2020-08-21 15:09:49 +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 |
|
|
lolman360andGitHub
|
623fe1cb69
|
Update recipes_clothing.dm
|
2020-08-21 12:00:09 +10:00 |
|
|
lolman360andGitHub
|
bda2c740ba
|
Merge branch 'master' into AnPrimAssistants
|
2020-08-21 11:08:13 +10:00 |
|
|
SandPootandGitHub
|
bcb474627b
|
Bluespace miner update + a little fix for borgdrakes* (#52)
|
2020-08-20 17:53:37 -03: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
|
8d70e21239
|
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
|
2020-08-20 19:40:47 +08:00 |
|
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
|
lolman360
|
4259332cfd
|
e
|
2020-08-19 18:37:31 +10:00 |
|
|
Putnam
|
81dc6c7ee5
|
Ports reftracking from TG.
|
2020-08-18 20:41:43 -07:00 |
|
|
Enric Gabriel
|
600c3b3528
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-18 23:31:57 -03:00 |
|
|
siliconsandGitHub
|
0331f0cdc3
|
Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
Revert "[TESTMERGE ONLY] FUCK"
|
2020-08-18 18:52:52 -07:00 |
|
|
lolman360
|
7390effcb9
|
e
|
2020-08-18 19:09:01 +10:00 |
|
|
lolman360
|
b466a5aae9
|
e
|
2020-08-18 18:57:23 +10:00 |
|
|
lolman360
|
9931cb006c
|
eee
|
2020-08-18 17:33:20 +10:00 |
|
|
kiwedesparsandGitHub
|
bd239b01b3
|
Update recipes_clothing.dm
|
2020-08-17 23:52:41 -07:00 |
|
|
lolman360
|
3040032409
|
documentation updates
|
2020-08-18 15:42:19 +10:00 |
|
|
lolman360
|
bb86003510
|
w e w
|
2020-08-18 10:04:52 +10: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 |
|
|
Putnam3145andGitHub
|
23b4ba3714
|
Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
|
2020-08-17 03:13:14 -07:00 |
|