 LetterJay
|
a63fbd9286
|
Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965
[MIRROR] Ports Goonchat
|
2017-06-19 17:25:18 -05:00 |
|
|
LetterJay
|
a4c9dc43dd
|
Dufflebag => Dufflebag
|
2017-06-19 16:42:05 -05:00 |
|
|
LetterJay
|
52fa6e4df8
|
wrong way around
|
2017-06-19 16:25:07 -05:00 |
|
|
LetterJay
|
42368581c5
|
Merge branch 'master' into upstream-merge-26965
|
2017-06-19 15:39:01 -05:00 |
|
|
LetterJay
|
a544d99f9f
|
cleanup and commits
|
2017-06-19 12:35:05 -05:00 |
|
|
CitadelStationBot
|
9985430c31
|
Minor flamethrower fix (#1579)
|
2017-06-17 13:36:31 -07:00 |
|
|
CitadelStationBot
|
4be9681e6b
|
Fixes being unable to cremate one thing (#1464)
|
2017-06-17 13:32:54 -07:00 |
|
|
CitadelStationBot
|
2fa5d08bf5
|
Prevents cyborgs from extruding materials (#1463)
|
2017-06-17 13:32:44 -07:00 |
|
|
CitadelStationBot
|
a090e33a15
|
Adds Prolonging Prism as an application scripture (#1472)
|
2017-06-17 13:31:04 -07:00 |
|
|
CitadelStationBot
|
9301af36da
|
Makes RCD ammo use consistent + small speed tweaks (#1646)
|
2017-06-17 13:14:59 -07:00 |
|
|
CitadelStationBot
|
8a1a4dd671
|
Hand drill, jaws of life, and emitter grammar tweaks
|
2017-06-16 15:19:22 -05:00 |
|
|
LetterJay
|
63ae7e2d58
|
Merge pull request #1612 from Citadel-Station-13/upstream-merge-28456
[MIRROR] Knocked-over chairs have materials.
|
2017-06-16 11:08:35 -05:00 |
|
|
CitadelStationBot
|
c97658e39a
|
Knocked-over chairs have materials.
|
2017-06-15 19:48:25 -05:00 |
|
|
CitadelStationBot
|
ddee871df7
|
Good boy Robustin does a heckin inducer fix
|
2017-06-15 19:04:35 -05:00 |
|
|
LetterJay
|
d6d1a26376
|
Create ghost_role_spawners.dm
|
2017-06-14 14:28:57 -05:00 |
|
|
LetterJay
|
df629847bc
|
Create ghost_role_spawners.dm
|
2017-06-14 13:19:00 -05:00 |
|
|
LetterJay
|
c877fdb501
|
Merge branch 'master' into upstream-merge-28046
|
2017-06-14 13:10:37 -05:00 |
|
|
LetterJay
|
74e6bc7ee2
|
Merge branch 'master' into SyndicateStuff
|
2017-06-14 11:44:32 -05:00 |
|
|
LetterJay
|
813bcc2b8d
|
commit
|
2017-06-14 11:16:54 -05:00 |
|
|
LetterJay
|
ff8b2acf9e
|
Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
|
2017-06-14 08:58:35 -05:00 |
|
|
LetterJay
|
9df28d90bf
|
Merge pull request #1456 from Citadel-Station-13/upstream-merge-28150
[MIRROR] Fixes CE's hand drill changing size
|
2017-06-14 08:54:05 -05:00 |
|
|
LetterJay
|
7dcb2fa68e
|
Update tables_racks.dm
|
2017-06-14 08:30:25 -05:00 |
|
|
LetterJay
|
aba07154d0
|
Delete ghost_role_spawners.dm.rej
|
2017-06-14 08:27:11 -05:00 |
|
|
LetterJay
|
0f966610de
|
Update ghost_role_spawners.dm
|
2017-06-14 08:25:09 -05:00 |
|
|
LetterJay
|
4c1b223248
|
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
|
2017-06-14 06:41:01 -05:00 |
|
|
LetterJay
|
ec415077c1
|
final commit for merge
|
2017-06-14 05:07:20 -05:00 |
|
|
CitadelStationBot
|
5db49fb44b
|
Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#1430)
|
2017-06-13 13:48:36 -07:00 |
|
|
CitadelStationBot
|
44f4059968
|
Weaponizes station charters (#1449)
|
2017-06-13 13:47:17 -07:00 |
|
|
CitadelStationBot
|
e9f3bc7f1e
|
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones (#1453)
|
2017-06-13 13:46:20 -07:00 |
|
|
CitadelStationBot
|
4ef7ad7724
|
Flashlight suduko (#1426)
|
2017-06-13 13:45:58 -07:00 |
|
|
LetterJay
|
d97399169b
|
Merge pull request #1565 from Citadel-Station-13/upstream-merge-28364
[MIRROR] Fixes gang turrets buckle code (atleast most of it)
|
2017-06-13 06:12:37 -05:00 |
|
|
CitadelStationBot
|
b666e5977c
|
Fixes gang turrets buckle code (atleast most of it)
|
2017-06-13 02:34:27 -05:00 |
|
|
CitadelStationBot
|
9c31812e5b
|
Fixes dead PKborgs having active dampener fields
|
2017-06-13 02:24:06 -05:00 |
|
|
LetterJay
|
226345d82a
|
upstream-merge-28109
upstream-merge-28352
|
2017-06-13 01:10:21 -05:00 |
|
|
CitadelStationBot
|
e69c61a4c5
|
Flashdarks can't be used for examining eyes/mouth.
|
2017-06-12 16:37:43 -05:00 |
|
|
LetterJay
|
ee910591ef
|
Merge pull request #1521 from Citadel-Station-13/upstream-merge-28262
[MIRROR] Fixes basic spiderlings becoming ice spiders
|
2017-06-12 12:41:49 -05:00 |
|
|
LetterJay
|
b464a2dc19
|
Merge pull request #1517 from Citadel-Station-13/upstream-merge-28113
[MIRROR] Adds F.R.A.M.E. cartridge
|
2017-06-12 12:33:04 -05:00 |
|
|
LetterJay
|
55d30f865b
|
upstream-merge-28062
|
2017-06-12 12:20:07 -05:00 |
|
|
LetterJay
|
69b2922e58
|
Merge pull request #1548 from Citadel-Station-13/upstream-merge-28318
[MIRROR] IED code cleanup
|
2017-06-12 12:18:26 -05:00 |
|
|
LetterJay
|
8b4d5cb68d
|
Merge pull request #1546 from Citadel-Station-13/upstream-merge-28331
[MIRROR] Lighters need to be on
|
2017-06-12 12:13:35 -05:00 |
|
|
CitadelStationBot
|
024efabf09
|
IED code cleanup
|
2017-06-11 20:47:55 -05:00 |
|
|
CitadelStationBot
|
ea5f6037cf
|
Lighters need to be on
|
2017-06-11 20:44:46 -05:00 |
|
|
CitadelStationBot
|
dcaa6c5db4
|
Fixes #28182 (IED sprites are bugged)
|
2017-06-11 17:28:40 -05:00 |
|
|
LetterJay
|
11ff6a7628
|
upstream-merge-27971
|
2017-06-11 08:21:14 -05:00 |
|
|
LetterJay
|
bd4d42a8a6
|
upstream-merge-28034/compile fix/upstream-merge-28048
|
2017-06-11 08:12:27 -05:00 |
|
|
LetterJay
|
e596e3eea4
|
missing files
|
2017-06-11 00:04:13 -05:00 |
|
|
LetterJay
|
b80a184d97
|
up to upstream-merge-27868
|
2017-06-11 00:04:00 -05:00 |
|
|
CitadelStationBot
|
fb40986f89
|
Fixes basic spiderlings becoming ice spiders
|
2017-06-10 12:22:48 -05:00 |
|
|
CitadelStationBot
|
4bd99124de
|
Adds F.R.A.M.E. cartridge
|
2017-06-10 12:18:31 -05:00 |
|
|
LetterJay
|
522b6d917f
|
updates
|
2017-06-10 09:36:39 -05:00 |
|