Commit Graph

12455 Commits

Author SHA1 Message Date
LetterJay 34b4976c28 Merge pull request #4614 from Citadel-Station-13/upstream-merge-33949
[MIRROR] Makes it clear that command reports are IC.
2017-12-31 02:53:22 -06:00
LetterJay d8e85b5f15 Merge pull request #4613 from Citadel-Station-13/upstream-merge-33945
[MIRROR] Improves loot drop spawners, adds AI law spawners to cores
2017-12-31 02:52:44 -06:00
LetterJay 88df151bd7 Merge pull request #4612 from Citadel-Station-13/upstream-merge-33947
[MIRROR] Last resort now requires a confirmation.
2017-12-31 02:52:29 -06:00
LetterJay 515c4a0472 Merge pull request #4611 from Citadel-Station-13/upstream-merge-33940
[MIRROR] Fix PDA message photos not being viewable
2017-12-31 02:52:03 -06:00
LetterJay 7998f037bd Merge pull request #4609 from Citadel-Station-13/upstream-merge-33580
[MIRROR] Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-31 02:51:44 -06:00
LetterJay ab11e4be2e Merge pull request #4606 from Citadel-Station-13/upstream-merge-33937
[MIRROR] printplayer fix for jobless minds
2017-12-31 02:50:34 -06:00
LetterJay 503f8e2635 Merge pull request #4605 from Citadel-Station-13/upstream-merge-33805
[MIRROR] Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
2017-12-31 02:50:21 -06:00
LetterJay 8f2aab0908 Merge pull request #4595 from Citadel-Station-13/upstream-merge-33930
[MIRROR] Fixes assistants spawning naked
2017-12-31 02:50:00 -06:00
Jordan Brown a57eba6a16 Explosions now cause camera shake based on distance (#33570)
* Explosions now cause camera shake based on distance

* Explosion close camera shake down to 2.5s

* Explosion camera shake max 100 close intensity, 50 far
2017-12-31 02:32:41 -06:00
BeeSting12 7dac76651e Makes it clear that command reports are IC. (#33949)
* fixes #33936

* sticky's idea was better
2017-12-31 02:28:25 -06:00
vuonojenmustaturska 9dd9d9413a Improves loot drop spawners, adds AI law spawners to cores (#33945)
* hymn to breaking strain

* remove subtypes as requested

* no-one saw that
2017-12-31 02:27:12 -06:00
F-OS 9c8959f2ff Last resort now requires a confirmation. (#33947)
* Update headcrab.dm

* fixed

* fuck

* Update headcrab.dm

* Update headcrab.dm
2017-12-31 02:24:53 -06:00
Tad Hardesty 38870f4056 Fix PDA message photos not being viewable 2017-12-30 21:27:31 -06:00
oranges 3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -06:00
LetterJay dad7c72a3e Merge pull request #4579 from Citadel-Station-13/upstream-merge-33663
[MIRROR] [Ready]Adds the Pax reagent, small tweaks to pacifism
2017-12-30 14:13:23 -06:00
LetterJay 4237a8910c Merge pull request #4483 from Citadel-Station-13/upstream-merge-33682
[MIRROR] Makes newscaster feedback messages and comments always a list.
2017-12-30 14:13:03 -06:00
Jordan Brown 3128c26698 Merge pull request #33937 from AnturK/printplayerfix
printplayer fix for jobless minds
2017-12-30 14:04:05 -06:00
Jordan Brown 3802cf8586 Merge pull request #33805 from Cruix/shuttle_machines
Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
2017-12-30 13:56:43 -06:00
Jordan Brown 75f492f416 Always use the area name when selecting a teleport beacon 2017-12-30 13:55:17 -06:00
LetterJay 211f3942a6 Merge branch 'master' into upstream-merge-33930 2017-12-30 13:37:52 -06:00
LetterJay c1c67ced1a Update color.dm 2017-12-30 13:37:30 -06:00
LetterJay 4d3b7ddcbd Update color.dm 2017-12-30 13:37:23 -06:00
LetterJay 32291c247b Update megafauna.dm 2017-12-30 13:33:45 -06:00
LetterJay 2994b4b7c2 Update blood_drunk_miner.dm 2017-12-30 13:33:37 -06:00
LetterJay 449ae34621 Update hostile.dm 2017-12-30 13:33:25 -06:00
LetterJay 96358f62f2 Update aux_base.dm 2017-12-30 13:33:15 -06:00
LetterJay 10643a192e Update vent_clog.dm 2017-12-30 13:33:01 -06:00
LetterJay de10a5b223 Update spider_infestation.dm 2017-12-30 13:32:53 -06:00
LetterJay f698fd5329 Update disease_outbreak.dm 2017-12-30 13:32:46 -06:00
LetterJay 2fe40198a2 Update alien_infestation.dm 2017-12-30 13:32:38 -06:00
LetterJay 7c69a835be Update teleporter.dm 2017-12-30 13:32:29 -06:00
LetterJay 47174097e1 Update communications.dm 2017-12-30 13:32:19 -06:00
LetterJay a160997587 Update talisman.dm 2017-12-30 13:32:02 -06:00
LetterJay a8d6fa7fd7 Update runes.dm 2017-12-30 13:31:51 -06:00
LetterJay 6c59d4134a Update ritual.dm 2017-12-30 13:31:24 -06:00
LetterJay f0214dd06d Update overmind.dm 2017-12-30 13:31:13 -06:00
LetterJay c8f3fdfe38 Merge branch 'master' into upstream-merge-33663 2017-12-30 13:29:36 -06:00
LetterJay dda430131a Update roundend.dm 2017-12-30 13:28:58 -06:00
LetterJay dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
LetterJay 35574263b1 Update outlet_injector.dm 2017-12-30 13:23:02 -06:00
LetterJay 70fea88a39 Update cryo.dm 2017-12-30 13:22:54 -06:00
LetterJay 95714a0207 Update volume_pump.dm 2017-12-30 13:22:46 -06:00
LetterJay 8452cc74d0 Update newscaster.dm 2017-12-30 13:21:31 -06:00
LetterJay b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
LetterJay d3f6cf4dd8 Merge branch 'master' into upstream-merge-33537 2017-12-30 13:14:48 -06:00
Jordan Brown cbb8d807f1 turfs changed to /space/basic are instead turned into /space 2017-12-30 13:14:04 -06:00
cebutris 8c6d660611 adds functional cebusoap 2017-12-30 10:04:03 -05:00
LetterJay f860fa0cd3 Update closed.dm 2017-12-30 05:12:10 -06:00
LetterJay 68b44e73f4 Merge pull request #4533 from Citadel-Station-13/upstream-merge-33734
[MIRROR] Makes cyclelinkeddir rotate with shuttle
2017-12-30 05:06:32 -06:00
LetterJay 0402595242 Merge pull request #4540 from Citadel-Station-13/upstream-merge-33835
[MIRROR] Adds coordinates to href logs
2017-12-30 05:06:19 -06:00