 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 |
|
|
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 |
|
|
Trilbyspaceclone
|
9c8f3305bb
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-30 00:41:42 -04: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 |
|
|
Letter N
|
116145872f
|
commit thing, need to see changies but gitlens is denying me
|
2020-08-29 14:00:46 +08:00 |
|
|
Trilbyspaceclone
|
c4885d81f3
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-27 03:41:14 -04: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 |
|
|
silicons
|
8699ce2174
|
fixes a bunch of broken clickdelays (#13218)
* fixes
* fix
|
2020-08-25 20:58:20 +02:00 |
|
|
Enric Gabriel
|
78124ace3f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-23 12:54:24 -03:00 |
|
|
silicons
|
2fa023346a
|
Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
|
2020-08-23 05:08:50 -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 |
|
|
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 |
|
|
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 |
|
|
Timothy Teakettle
|
6392367df4
|
donator items
|
2020-08-18 17:28:09 +01: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 |
|
|
silicons
|
f611945b34
|
Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
|
2020-08-17 03:14:15 -07:00 |
|
|
Enric Gabriel
|
06496434a4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 23:30:53 -03:00 |
|
|
Enric Gabriel
|
7898f1fe3e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 23:24:11 -03:00 |
|
|
silicons
|
397cdb6c03
|
Merge branch '13129'
|
2020-08-16 18:45:35 -07:00 |
|
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
|
Enric Gabriel
|
da9bea69fe
|
there
|
2020-08-16 15:36:51 -03:00 |
|
|
Detective Google
|
016fd2ac3c
|
woo yeah yeah woo
|
2020-08-15 23:55:52 -05:00 |
|
|
Enric Gabriel
|
4e7312d276
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-14 15:07:53 -03:00 |
|
|
Trilbyspaceclone
|
1b61a5feb2
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-12 15:10:37 -04:00 |
|
|
silicons
|
3e67fd11e8
|
Update chair.dm
|
2020-08-11 23:39:31 -07:00 |
|
|
lolman360
|
6f7badda41
|
Merge branch 'master' into plumb
|
2020-08-12 09:03:11 +10:00 |
|
|
ancientpower
|
99d73388f8
|
lets ghosts see the contents of closets
|
2020-08-11 16:40:03 -05:00 |
|
|
Enric Gabriel
|
7929924d4a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-11 13:04:34 -03:00 |
|
|
silicons
|
a8d61b60ef
|
Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
|
2020-08-11 01:47:32 -07:00 |
|
|
lolman360
|
6ec9a3c4bd
|
craftable plunger
|
2020-08-11 17:38:16 +10: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 |
|
|
lolman360
|
6c57dce54e
|
WX
|
2020-08-09 23:52:21 +10:00 |
|
|
silicons
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
|
Sishen
|
1bd30ddf41
|
value tweak, add forced 2h
|
2020-08-07 21:52:16 -06:00 |
|
|
silicons
|
d6a5442a37
|
fix
|
2020-08-06 12:00:15 -07:00 |
|
|
silicons
|
2a0f2a38a7
|
Fix
|
2020-08-05 21:42:05 -07:00 |
|
|
silicons
|
815ddd1866
|
oh boy
|
2020-08-05 21:34:26 -07:00 |
|
|
Sishen
|
ec8cd31950
|
funny chair loses block chance and gains active block/parry
|
2020-08-05 14:21:48 -06:00 |
|
|
Timothy Teakettle
|
ef53f3faea
|
the old system isnt needed really but sure i guess
|
2020-08-04 11:43:15 +01:00 |
|
|
Trilbyspaceclone
|
e1e6198140
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-03 10:53:08 -04:00 |
|
|
Trilbyspaceclone
|
b3fea77468
|
Update necropolis_tendril.dm
|
2020-08-03 10:45:01 -04:00 |
|
|
Letter N
|
a19e306137
|
less redtext - updates anomalies
|
2020-08-03 20:53:36 +08:00 |
|
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08: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
|
447a0b24bf
|
Merge pull request #12944 from timothyteakettle/fixes-crates
fixes some crafted crates containing items
|
2020-07-28 22:11:30 -05:00 |
|
|
Lin
|
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 |
|
|
silicons
|
8313485632
|
fix
|
2020-07-28 11:31:28 -07: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 |
|
|
Timothy Teakettle
|
dc14c02570
|
fix crates
|
2020-07-27 21:55:51 +01:00 |
|