Commit Graph

12455 Commits

Author SHA1 Message Date
LetterJay 8868a354b6 Update multitool.dm 2017-11-14 13:06:43 -06:00
KorPhaeron 594da93554 Heirophant Relay sprites (#32636) 2017-11-14 13:04:34 -06:00
Tad Hardesty aa8581d430 Fix the station integrity report to read the correct Z
Fixes a bug where the integrity of CentCom was being taken instead,
coming out at about 85% no matter what happened during the round. Also
removes the gang territory calculation now that it isn't used anywhere.
2017-11-14 12:45:47 -06:00
Robustin bd0cbee581 Cult pop scaling refactor (#32598) 2017-11-14 07:44:28 -06:00
Jalleo 23983c48bf Old debug objects which one has been replaced and another nobody needs at the moment. Also removal of comments that I forgot to removal at _machinery.dm (#32685) 2017-11-14 05:01:25 -06:00
Jordan Brown c3a4d0d06a Makes cryoxadone heal clone damage again 2017-11-14 05:01:17 -06:00
ike709 a23935c037 Directional computer sprites (#32656)
Technically I did fix it. It just wasn't a good fix. That's a good description of most of my coding.
2017-11-14 05:01:09 -06:00
Matt Smith d486d784ad Update AI Airlock UI to use TGUI 2017-11-14 05:00:58 -06:00
arsserpentarium d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay 4afc4f5b39 Merge pull request #3922 from deathride58/earlygoonchatfixmirror
Early mirror of https://github.com/tgstation/tgstation/pull/32705
2017-11-13 23:23:03 -06:00
deathride58 2f4c556ad8 reeeeEEEEEEEEEEEEEEE 2017-11-13 22:55:18 -05:00
deathride58 1d4ae5196c it works 👍 2017-11-13 17:00:26 -05:00
LetterJay ab42a6242f Merge pull request #3920 from Citadel-Station-13/LetterJay-patch-2
Fixes flavor text on examine
2017-11-13 13:14:25 -06:00
LetterJay d983c7d928 Update examine.dm 2017-11-13 11:54:18 -06:00
LetterJay 36778e9404 Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623
[MIRROR] Adds ambience for Reebe.
2017-11-13 11:53:21 -06:00
LetterJay 648477ebe1 Merge pull request #3917 from Citadel-Station-13/upstream-merge-32637
[MIRROR] Adds a timer to falsewall code
2017-11-13 11:53:08 -06:00
LetterJay 5591672deb Merge pull request #3915 from Citadel-Station-13/upstream-merge-32618
[MIRROR] Fixes readapt removing hivemind communication.
2017-11-13 11:52:48 -06:00
LetterJay 304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
LetterJay 07cb443ba0 Merge pull request #3913 from Citadel-Station-13/upstream-merge-32553
[MIRROR] Xrays go through walls but stop on mobs/blob
2017-11-13 11:51:59 -06:00
LetterJay f0a852ef1e Merge pull request #3911 from Citadel-Station-13/upstream-merge-32658
[MIRROR] Fixes latejoin chaplains not getting their weapon on spawn
2017-11-13 11:51:38 -06:00
LetterJay a4c2084404 Merge pull request #3910 from Citadel-Station-13/upstream-merge-32557
[MIRROR] Adds Extended Drill Hair
2017-11-13 11:51:30 -06:00
LetterJay 32bfa75c3a Merge pull request #3908 from Citadel-Station-13/upstream-merge-32558
[MIRROR] Prevent placing posters on diagonal wall corners
2017-11-13 11:50:36 -06:00
LetterJay bc23305ef9 Merge pull request #3907 from Citadel-Station-13/upstream-merge-32613
[MIRROR]  Fixes cryo overlay system
2017-11-13 11:50:23 -06:00
LetterJay f46db62f48 Update examine.dm 2017-11-13 11:49:47 -06:00
LetterJay a21a5cf30d Merge pull request #3906 from Citadel-Station-13/upstream-merge-32640
[MIRROR] Adds a multitool_act and a proper check on tool_check
2017-11-13 11:46:41 -06:00
LetterJay 083100a4df Merge branch 'master' into upstream-merge-32570 2017-11-13 11:45:39 -06:00
LetterJay 0a21e6e83b Merge pull request #3904 from Citadel-Station-13/upstream-merge-32642
[MIRROR] Makes clown box consistent with the rest of the boxes
2017-11-13 11:45:13 -06:00
LetterJay f610a6110b Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597
[MIRROR] Fixes stimulum decay
2017-11-13 11:45:00 -06:00
LetterJay 228aed8b35 Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546
[MIRROR] Refactor of base machinery a tiny bit more. DONE
2017-11-13 11:44:46 -06:00
LetterJay 55e2d08b06 Merge pull request #3901 from Citadel-Station-13/upstream-merge-32566
[MIRROR] Space vacuum damage doubled
2017-11-13 11:44:33 -06:00
LetterJay 6e3e6ef6b8 Merge pull request #3900 from Citadel-Station-13/upstream-merge-32585
[MIRROR] adjusted default internet song volume to 25
2017-11-13 11:44:25 -06:00
LetterJay 0d65074f44 Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635
[MIRROR] Fixes fleeing the station message accuracy
2017-11-13 11:44:16 -06:00
LetterJay 4142105fe6 Merge pull request #3895 from Citadel-Station-13/upstream-merge-32435
[MIRROR] Disposal pipes and pipe dispensers refactor
2017-11-13 11:44:04 -06:00
LetterJay 97757d2c87 Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559
[MIRROR] Makes false alarm use more explicit in event code.
2017-11-13 11:42:53 -06:00
LetterJay 9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582
[MIRROR] Fixes 512 compile reminders
2017-11-13 11:42:40 -06:00
LetterJay 34b3607211 Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504
[MIRROR] Weakrefs
2017-11-13 11:41:38 -06:00
LetterJay 3e55cec1b0 Merge pull request #3862 from Citadel-Station-13/upstream-merge-32498
[MIRROR] Fixes VV not displaying false values in keyed lists
2017-11-13 11:41:18 -06:00
LetterJay 09f2c19f0f Update admin_verbs.dm 2017-11-13 11:40:22 -06:00
LetterJay 9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
Qustinnus 182b81a721 Adds ambience for Reebe. (#32623)
* spooky

* fix 1

* fix 2
2017-11-13 03:45:03 -06:00
Emmett Gaines 3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -06:00
nicbn a0f70c9364 Adds a timer to falsewall code (#32637)
* Adds a timer to falsewall code

* better code

* removes a parameter
2017-11-13 03:29:21 -06:00
oranges 51b0c286a9 Fixes readapt removing hivemind communication. 2017-11-13 03:20:50 -06:00
oranges 43113cd9b5 Merge pull request #31947 from AnturK/yarr
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
oranges 033f336ed1 Merge pull request #32553 from ExcessiveUseOfCobblestone/ihategoofxray
Xrays go through walls but stop on mobs/blob
2017-11-13 03:17:24 -06:00
Ashe Higgs 9dff28b50d Improves the deep fryer 2017-11-13 03:16:11 -06:00
KorPhaeron 3f297ccb79 Fixes chaplain not getting his weapon on spawn (#32658) 2017-11-13 03:16:01 -06:00
oranges 7c45ae5cb7 Adds Extended Drill Hair 2017-11-13 03:12:44 -06:00
Tad Hardesty 96b30fa61e Prevent placing posters on diagonally-smoothed walls (#32558)
Posters are also knocked off the walls if they change to being
diagonally smoothed later.
2017-11-13 02:33:30 -06:00
LetterJay 7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00