 silicons
|
89c63a243f
|
Update card.dm
|
2021-02-04 13:23:03 -07:00 |
|
|
silicons
|
ea07ad6e48
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-13 15:41:28 -07:00 |
|
|
MrJWhit
|
893199679d
|
Update arcade.dm
|
2021-01-11 08:46:12 -05:00 |
|
|
Letter N
|
98ff0a080e
|
ImmursionAudio(TM)
|
2020-12-21 19:47:11 +08:00 |
|
|
Letter N
|
a38aca4da6
|
tgui moment.
|
2020-08-22 13:11:13 +08:00 |
|
|
Letter N
|
f04918bdca
|
working code?
|
2020-08-21 15:09:49 +08: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
|
f1c4a7f6ac
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-09 14:54:16 +08:00 |
|
|
silicons
|
e9cbb550a1
|
Update laptop.dm
|
2020-08-06 18:09:50 -07:00 |
|
|
Letter N
|
8f0f30f6f7
|
lazy datacore fix
|
2020-08-06 17:27:51 +08:00 |
|
|
Letter N
|
f2f6416105
|
fixes - radio, broken - crewmanifest, gastank controler
|
2020-08-05 20:34:09 +08:00 |
|
|
Letter N
|
a19e306137
|
less redtext - updates anomalies
|
2020-08-03 20:53:36 +08:00 |
|
|
Letter N
|
e40470f553
|
h. Updates NTOS, and axes p2p filetransfer!
|
2020-07-30 20:54:13 +08:00 |
|
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
|
Letter N
|
0805265412
|
yet another batch. MAJOR: APC
|
2020-07-30 12:54:53 +08:00 |
|
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03: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 |
|
|
Artur
|
43951bf44e
|
Ports https://github.com/tgstation/tgstation/pull/51152
|
2020-06-17 17:01:55 +03:00 |
|
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
|
Ghom
|
8cb15f9279
|
Actually Balanced and Standardized Vendor Prices. (#12495)
|
2020-06-09 22:22:53 -07:00 |
|
|
Artur
|
3c973816d1
|
Ports https://github.com/tgstation/tgstation/pull/51125/
|
2020-05-27 12:48:25 +03: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 |
|
|
Putnam
|
8458f97692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-12 13:34:31 -07:00 |
|
|
Ghommie
|
7fb96ab0cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-05-12 20:06:59 +02:00 |
|
|
Putnam
|
e8d7da56f4
|
Ported C++mos from yogs (help me)
|
2020-05-11 15:44:26 -07:00 |
|
|
Ghommie
|
643ef48f0e
|
Macros, generic skill implementations.
|
2020-05-05 04:42:34 +02:00 |
|
|
Artur
|
f97f264fb7
|
Fixing more stuff
Mint machine compile fixes and the syndicate contractor program.
|
2020-04-23 20:09:42 +03:00 |
|
|
Artur
|
120615d472
|
Ports https://github.com/tgstation/tgstation/pull/44525, and
And fixes to make stuff work
|
2020-04-23 17:36:13 +03:00 |
|
|
Artur
|
a8aa2e2014
|
Updates modular computers, begins work on shuttle stuff.
|
2020-04-23 15:06:35 +03:00 |
|
|
Artur
|
80b47ec1c0
|
Ports https://github.com/tgstation/tgstation/pull/50497
|
2020-04-23 09:55:28 +03:00 |
|
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
|
Ghommie
|
1d51ac5ff2
|
Fixing some bug reports.
|
2020-03-14 02:34:25 +01:00 |
|
|
Ghom
|
d5a6c25128
|
Update tablet.dm
|
2020-03-11 13:19:57 +01:00 |
|
|
kevinz000
|
e210f7d535
|
Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
|
2020-03-10 05:58:17 -07:00 |
|
|
Ghommie
|
59b1a223a3
|
Ok, done.
|
2020-03-08 22:51:36 +01:00 |
|
|
Kraseo
|
dff0e03f11
|
fixes null runtime and baton inhands
|
2020-03-08 00:27:16 +01:00 |
|
|
Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +01:00 |
|
|
Kraseo
|
edfe50579e
|
ACTUALLY fixes null runtimes + double contracts
|
2020-03-04 13:17:24 +01:00 |
|
|
kappa-sama
|
ec3e2ddb24
|
no more laptop slowdown
|
2020-03-01 21:17:48 -05:00 |
|
|
Kraseo
|
648f7793d3
|
proving to the world i'm retarded one commit line at a time
|
2020-03-01 23:56:34 +01:00 |
|
|
Kraseo
|
e3c77f2f5a
|
part 4: the one where i slowly go insane
|
2020-03-01 22:05:35 +01:00 |
|
|
Kraseo
|
d93ade7e03
|
part 2: bloody tendency
|
2020-03-01 17:37:18 +01:00 |
|
|
Kraseo
|
38f7821dd6
|
part 1: battle stream
|
2020-03-01 16:56:13 +01:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
Seris02
|
26e16d7c89
|
yeet
|
2020-02-06 07:49:19 +08:00 |
|