silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
kappa-sama
|
1134e1ce20
|
i don't wanna talk about it
|
2021-01-15 00:36:45 -05:00 |
|
kappa-sama
|
656d95ce2f
|
i rewrote this at 2 in the morning
|
2021-01-12 09:57:36 -05:00 |
|
kappa-sama
|
f98edf0eaa
|
shush
|
2021-01-12 09:55:18 -05:00 |
|
kappa-sama
|
a58141898c
|
i was tired
|
2021-01-12 09:45:13 -05:00 |
|
kappa-sama
|
3d9e907532
|
fixed
|
2021-01-12 02:19:13 -05:00 |
|
Letter N
|
51143f89e5
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-29 10:37:06 +08:00 |
|
DeltaFire
|
687c6a9e6f
|
and another one
|
2020-12-28 19:49:42 +01:00 |
|
DeltaFire
|
0bba554052
|
e
|
2020-12-28 19:45:03 +01:00 |
|
Letter N
|
a808f805d4
|
ASYNC EVERYTHING!
|
2020-12-21 16:24:51 +08:00 |
|
silicons
|
5b03f5b0ec
|
more
|
2020-11-12 23:36:18 -07:00 |
|
DeltaFire15
|
91584053f5
|
Fixes a bunch of fallout from the tgui PR (#13648)
* screamies
fixes a bunch of fallout from the tgui PR.. probably
* Empty commit to poke travis
|
2020-11-01 21:59:22 +01:00 |
|
silicons
|
19f1e99a8c
|
mass ports like 15 tg prs + counting (#13386)
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
|
2020-10-10 12:20:33 +02:00 |
|
Timothy Teakettle
|
cb36f4ad24
|
travis we're friends right
|
2020-09-10 22:50:17 +01:00 |
|
Timothy Teakettle
|
58737e42b9
|
empulse using range
|
2020-09-10 19:52:34 +01:00 |
|
timothyteakettle
|
d2f4d675a4
|
fuck
|
2020-09-10 03:55:24 +01:00 |
|
timothyteakettle
|
e0f44ef717
|
new emps
|
2020-09-10 03:49:47 +01:00 |
|
silicons
|
1abe2458ee
|
Update taeclowndo.dm (#13227)
|
2020-08-23 20:58:34 +02:00 |
|
kiwedespars
|
eb8574d6d6
|
heretics from tg (with changes)
|
2020-08-10 19:17:26 -07:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
silicons
|
2ec64f3e05
|
Update wizard.dm
|
2020-07-20 16:50:56 -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
|
910869d6bf
|
more
|
2020-07-18 19:44:12 -07:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03: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 |
|
Ghommie
|
ae053a9a08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
|
2020-06-23 03:12:49 +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 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
kevinz000
|
445d94f335
|
haha whew
|
2020-06-17 21:32:10 -07:00 |
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|
Ghommie
|
e51ac4e745
|
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-05-29 17:58:35 +02:00 |
|
Ghommie
|
a84e7bcecc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-24 04:00:51 +02:00 |
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
Ghom
|
12ac08d7c5
|
Porting tesla/electrocute code updates. (#12280)
* Porting tesla/electrocute code updates.
* Why is the dominator being insta-deleted by zaps a good idea?
* Yikes.
* ah
|
2020-05-17 16:35:17 -07:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
Artur
|
dabdf16eac
|
Coonflict fiiixeeess
|
2020-05-13 12:56:17 +03:00 |
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
Artur
|
321902c35a
|
Ports https://github.com/tgstation/tgstation/pull/50225
|
2020-04-23 13:28:09 +03:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
Ghommie
|
7615f63753
|
Oopsie
|
2020-04-11 17:43:09 +02:00 |
|