Commit Graph

864 Commits

Author SHA1 Message Date
CitadelStationBot
8a1a4dd671 Hand drill, jaws of life, and emitter grammar tweaks 2017-06-16 15:19:22 -05:00
LetterJay
5933ad0d78 Merge pull request #1614 from Citadel-Station-13/upstream-merge-28477
[MIRROR] Fixes Geis counting dead servants
2017-06-16 11:09:08 -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
3b5d55260a Fixes Geis counting dead servants 2017-06-15 19:55:41 -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
b602462cbb Create portable_turret.dm 2017-06-14 12:05:31 -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
e1e60417f2 Merge pull request #1325 from Citadel-Station-13/upstream-merge-27884
[MIRROR] CereStation Security Department Revamp (and other misc fixes/changes)
2017-06-14 08:49:01 -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
5c2acd599e [MIRROR] HOTFIX: Cult now gets a functioning summon objective (#1509)
* HOTFIX: Cult now gets a functioning summon objective

* Update datum_cult.dm

* Delete datum_cult.dm.rej
2017-06-13 20:40:49 -07:00
CitadelStationBot
97005222ff Blood Cult Nerf: Restricted Nar-Sie summoning locations (#1479) 2017-06-13 13:48:49 -07: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
6b79f26c9b Fix #28176 : You can EMP Proof a camera with a sheet of plasma (#1478) 2017-06-13 13:46:42 -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
CitadelStationBot
afd9131e2f Changeling transform sting is stealthy again (#1448) 2017-06-13 13:44:28 -07:00
CitadelStationBot
f5dda16b01 Removes legacy LateInitialize support (#1452) 2017-06-13 13:44:11 -07:00
CitadelStationBot
16f968f5e5 Some other code now uses ai status display list (#1506) 2017-06-13 13:43:04 -07:00
CitadelStationBot
c9e8454c3b Deepstorage Ruin Revamp (#1407) 2017-06-13 13:42:03 -07:00
CitadelStationBot
33eb60747f Refactored advanced camera consoles (#1576) 2017-06-13 13:39:47 -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
21c3bbcd56 Merge pull request #1529 from Citadel-Station-13/upstream-merge-28291
[MIRROR] Some minor refactor to doomsday device
2017-06-12 12:40:28 -05:00
LetterJay
2b0a1c5ab1 Merge pull request #1528 from Citadel-Station-13/upstream-merge-28271
[MIRROR] Fixes pipe dispensers
2017-06-12 12:40:03 -05:00
LetterJay
46f4472bca Merge pull request #1507 from Citadel-Station-13/upstream-merge-28207
[MIRROR] Medical record summaries are now single inputs as well
2017-06-12 12:38:41 -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
47315c27e2 Merge pull request #1549 from Citadel-Station-13/upstream-merge-28320
[MIRROR] AI liquid dispensers are now more usable
2017-06-12 12:18:12 -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
LetterJay
169f206f04 Merge pull request #1545 from Citadel-Station-13/upstream-merge-28188
[MIRROR] Adds the ability to attach papers and photos to airlocks
2017-06-12 12:13:10 -05:00
LetterJay
2c7dc70426 Merge pull request #1543 from Citadel-Station-13/upstream-merge-28317
[MIRROR] Fixes #28182 (IED sprites are bugged)
2017-06-12 12:12:24 -05:00
CitadelStationBot
edf026a41d AI liquid dispensers are now more usable 2017-06-11 20:51:02 -05:00
CitadelStationBot
024efabf09 IED code cleanup 2017-06-11 20:47:55 -05:00