 Detective Google
|
bad9e76e50
|
Fixes pirates, ops, the mining base, and gives pirates and ops drills
|
2020-05-03 00:28:28 -05:00 |
|
|
Detective Google
|
231fd0edea
|
fixes the stupid fucking tile placing list
|
2020-04-30 23:04:35 -05:00 |
|
|
Detective Google
|
f6736e862d
|
it compiles, now to fix the maps
|
2020-04-30 15:49:06 -05:00 |
|
|
kevinz000
|
f028672e3c
|
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
|
2020-04-30 01:00:08 -07:00 |
|
|
kevinz000
|
d7f38faab9
|
Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
|
2020-04-25 17:05:38 -07:00 |
|
|
Putnam
|
95d1a25df7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller
|
2020-04-24 16:07:38 -07:00 |
|
|
Detective Google
|
71be8ed2fc
|
ports all the tg junk for icemoon, not yet changed to make it all compile
|
2020-04-24 00:02:03 -05:00 |
|
|
Ghommie
|
e0a51903a1
|
Not yet implemented design security level requirements.
|
2020-04-24 00:51:04 +02:00 |
|
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
|
Putnam
|
44925da1d8
|
Various dynamic tweaks
|
2020-04-21 20:52:33 -07:00 |
|
|
kevinz000
|
0791f22b62
|
Merge pull request #10702 from Ghommie/Ghommie-cit528
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
|
2020-03-10 17:24:48 -07:00 |
|
|
kevinz000
|
e210f7d535
|
Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
|
2020-03-10 05:58:17 -07:00 |
|
|
Ghom
|
f1d6360b70
|
Shuttle timer display seconds fix
|
2020-03-09 01:31:39 +01:00 |
|
|
Ghommie
|
59b1a223a3
|
Ok, done.
|
2020-03-08 22:51:36 +01:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07: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 |
|
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
|
Ghom
|
0f8f6e417b
|
Merge branch 'master' into Ghommie-cit528
|
2020-02-21 02:40:22 +01:00 |
|
|
kevinz000
|
d7403b3436
|
john doe
|
2020-02-19 22:26:10 -07:00 |
|
|
kevinz000
|
2dd5a0cfb8
|
Merge branch 'master' into hijack
|
2020-02-19 22:25:31 -07:00 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
Ghommie
|
0703c6eea6
|
First tweak to cargo reagents selling.
|
2020-02-06 22:34:54 +01:00 |
|
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
|
kevinz000
|
fb0f12520c
|
Update emergency.dm
|
2020-02-02 16:23:54 -07:00 |
|
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
|
Ghommie
|
7f14fa3c71
|
not-so-wip now.
|
2020-01-31 19:20:59 +01:00 |
|
|
Ghommie
|
188f726ffd
|
unicode support port wip
|
2020-01-31 05:32:00 +01:00 |
|
|
Ghommie
|
2adb981832
|
Welp.
|
2020-01-26 22:04:46 +01:00 |
|
|
Ghommie
|
9b149244b0
|
Ok here we go.
|
2020-01-26 21:56:31 +01:00 |
|
|
Ghommie
|
a89cd796d4
|
emergency shuttle console spam limiter.
|
2020-01-26 21:33:36 +01:00 |
|
|
kevinz000
|
40a2698b55
|
Update emergency.dm
|
2020-01-23 19:22:00 -07:00 |
|
|
kevinz000
|
289bb590cf
|
changes
|
2020-01-23 19:20:35 -07:00 |
|
|
kevinz000
|
e7bf1738cd
|
ok putnom
|
2020-01-23 18:00:33 -07:00 |
|
|
Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +01:00 |
|
|
kevinz000
|
c4475b1dda
|
variables
|
2020-01-22 05:39:16 -07:00 |
|
|
kevinz000
|
ccb5d32ab2
|
varnames
|
2020-01-22 05:38:09 -07:00 |
|
|
kevinz000
|
a8628cee33
|
udpates
|
2020-01-22 05:32:57 -07:00 |
|
|
kevinz000
|
9ef3879e53
|
fix
|
2020-01-22 05:17:59 -07:00 |
|
|
kevinz000
|
5b6f95cb1e
|
shuttle hijack
|
2020-01-22 05:16:33 -07:00 |
|
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
Ghommie
|
4b090f938c
|
ok
|
2020-01-15 20:51:36 +01:00 |
|
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Ghommie
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
|
kevinz000
|
f39d12527d
|
Update supply.dm
|
2019-12-21 23:50:59 -08:00 |
|