Commit Graph

9242 Commits

Author SHA1 Message Date
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 12055144e4 fix it 2017-06-19 16:09:16 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot 1dc24668a1 Refactors PDA cartridge permissions 2017-06-19 13:57:18 -05:00
LetterJay a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot 9863f88366 [READY]Adds examine tooltips 2017-06-18 21:58:37 -05:00
CitadelStationBot 341a229b94 Vending machines accept space cash. 2017-06-18 20:35:08 -05:00
CitadelStationBot ba0e9e8e93 Alien closets now correctly cost two alloy to make (Fixes #28561) 2017-06-18 20:20:49 -05:00
CitadelStationBot e750435b94 Runes now innately support doing damage to their invokers 2017-06-18 15:23:52 -05:00
CitadelStationBot 7ad1ab9f0f Ratvar is no longer stopped by pathetic windows 2017-06-17 22:11:36 -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 4c3f515fd6 Fixes borging factory (#1580) 2017-06-17 13:30:27 -07:00
CitadelStationBot 9301af36da Makes RCD ammo use consistent + small speed tweaks (#1646) 2017-06-17 13:14:59 -07:00
LetterJay a1bd66ef8b Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414
[MIRROR] Adds onions
2017-06-17 10:04:59 -05:00
LetterJay 67db8fc9ad Merge pull request #1630 from Citadel-Station-13/upstream-merge-28492
[MIRROR] Vomit fix
2017-06-17 10:03:11 -05:00
LetterJay e068e34a0e Merge pull request #1629 from Citadel-Station-13/upstream-merge-28493
[MIRROR] Hand drill, jaws of life, and emitter grammar tweaks
2017-06-17 10:02:49 -05:00
CitadelStationBot 3f92d14933 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. 2017-06-16 20:12:20 -05:00
CitadelStationBot f86bda7cda Adds onions 2017-06-16 16:22:38 -05:00
CitadelStationBot 9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
CitadelStationBot 8a1a4dd671 Hand drill, jaws of life, and emitter grammar tweaks 2017-06-16 15:19:22 -05:00
CitadelStationBot 2e9e7f5488 Cultists must be human to run for Cult Master status 2017-06-16 12:53:49 -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 d079026d26 Changes config tag for secret extended 2017-06-13 17:17:18 -05: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