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 |
|
Detective Google
|
b13048f636
|
makes glass floors actually deconstructable
|
2020-08-17 12:15:09 -05: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 |
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
silicons
|
83e72b4f96
|
Merge branch '13164'
|
2020-08-16 18:51:36 -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 |
|
Detective Google
|
44e024a62f
|
specification
|
2020-08-16 18:44:05 -05:00 |
|
Detective Google
|
0e1586f24d
|
adds a construction path to glass floors
|
2020-08-16 18:21:29 -05:00 |
|
Detective-Google
|
ff6ef5d476
|
local idiot learns to spell
|
2020-08-16 00:22:21 -05:00 |
|
Detective Google
|
016fd2ac3c
|
woo yeah yeah woo
|
2020-08-15 23:55:52 -05:00 |
|
Detective-Google
|
f41c412cb9
|
material -> mineral
|
2020-08-14 23:41:29 -05:00 |
|
Detective-Google
|
76bfd9b3a6
|
?
|
2020-08-14 16:09:49 -05:00 |
|
Detective Google
|
81f7307575
|
yeah
|
2020-08-14 15:38:27 -05:00 |
|
lolman360
|
6f7badda41
|
Merge branch 'master' into plumb
|
2020-08-12 09:03:11 +10: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 |
|
kiwedespars
|
eb8574d6d6
|
heretics from tg (with changes)
|
2020-08-10 19:17:26 -07:00 |
|
lolman360
|
6c57dce54e
|
WX
|
2020-08-09 23:52:21 +10:00 |
|
lolman360
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
silicons
|
13c9954f74
|
fix
|
2020-08-07 17:00:27 -07:00 |
|
silicons
|
815ddd1866
|
oh boy
|
2020-08-05 21:34:26 -07:00 |
|
Timothy Teakettle
|
ef53f3faea
|
the old system isnt needed really but sure i guess
|
2020-08-04 11:43:15 +01:00 |
|
Timothy Teakettle
|
2bbe4631d6
|
working ricochets
|
2020-08-03 14:46:24 +01:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
silicons
|
791bfabc9b
|
walls
|
2020-07-26 16:03:57 -07:00 |
|
silicons
|
7d7f40ce90
|
fixes
|
2020-07-26 14:56:03 -07:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
lolman360
|
17d1fd0692
|
fixes
|
2020-07-22 12:42:46 +10:00 |
|
silicons
|
526d257410
|
fix
|
2020-07-20 11:48:08 -07:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
silicons
|
58e26c540c
|
merge from master
|
2020-07-20 10:18:44 -07:00 |
|
silicons
|
5b408d5b33
|
Update space.dm
|
2020-07-18 20:52:15 -07:00 |
|
silicons
|
9b1aa39497
|
Update space.dm
|
2020-07-18 20:51:30 -07:00 |
|
silicons
|
55f8e37544
|
sigh
|
2020-07-18 20:26:11 -07:00 |
|
silicons
|
0b98b0409b
|
sigh
|
2020-07-18 18:29:09 -07:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
Letter N
|
2afab07b4a
|
https://github.com/tgstation/tgstation/pull/52255
|
2020-07-16 20:05:37 +08:00 |
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
Ghom
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Detective Google
|
472ed97b8c
|
port tg#51713
|
2020-06-22 15:32:23 -05:00 |
|
Detective Google
|
4e26916502
|
Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald
|
2020-06-20 14:00:14 -05:00 |
|
Detective Google
|
0e1db216c8
|
Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)
|
2020-06-17 19:33:14 -05:00 |
|
Timothy Teakettle
|
eba1e8f301
|
fixes the merge conflicts
|
2020-06-15 23:29:49 +01:00 |
|
kevinz000
|
180b7d31d9
|
sigh
|
2020-06-13 09:24:22 -07:00 |
|
Trilbyspaceclone
|
6db076c42f
|
Lowers the slowdown on snow tiles (#12404)
* Update fancy_floor.dm
* Update fancy_floor.dm
|
2020-06-04 15:52:30 -07:00 |
|