163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
2f71e0f724
Merge pull request #3944 from Citadel-Station-13/upstream-merge-32714
...
[MIRROR] Tesla no longer NOTHING PERSONNEL's the power beacon
2017-11-15 10:40:59 -06:00
46ba6cbc7b
Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620
...
[MIRROR] Greatly increases the performance of station-ending plasma fires
2017-11-15 10:40:40 -06:00
37085ee10e
Merge pull request #3930 from Citadel-Station-13/upstream-merge-32723
...
[MIRROR] Makes cryoxadone heal clone damage again
2017-11-15 10:40:13 -06:00
853e9a0ed5
Merge pull request #3918 from Citadel-Station-13/upstream-merge-32280
...
[MIRROR] Performance and usability improvement for blueprints
2017-11-15 10:39:40 -06:00
668248b987
combines the missed microwave PR
2017-11-15 10:31:41 -06:00
3c28ea5426
Merge pull request #3713 from Citadel-Station-13/upstream-merge-32277
...
[MIRROR] Removes golem debug code that spams world
2017-11-15 10:30:31 -06:00
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
16019df886
Merge branch 'master' into upstream-merge-32280
2017-11-15 10:21:04 -06:00
ab21f8d5ed
511 client fix and a config to make the version warning a popup
2017-11-15 04:39:36 -06:00
f1274b41f2
redisables slime splitting
2017-11-14 19:27:19 -05:00
9b75113631
[512] Makes gas mouse transparent ( #32569 )
...
* Makes gas mouse transparent
* readability cleanup
* future proofing
2017-11-14 17:47:01 -06:00
0885c57b39
Update mob.dm
2017-11-14 16:10:46 -06:00
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
44d15b07fb
Merge pull request #3942 from Citadel-Station-13/upstream-merge-32607
...
[MIRROR] Alt clicking additions
2017-11-14 15:57:06 -06:00
7ce3b246ad
Merge pull request #3941 from Citadel-Station-13/upstream-merge-32707
...
[MIRROR] More nuanced damage examination
2017-11-14 15:56:57 -06:00
19abbdfd5f
Merge pull request #3931 from Citadel-Station-13/upstream-merge-32685
...
[MIRROR] Little things 2 Revenge of atmos components
2017-11-14 15:52:32 -06:00
2d137b2bf9
Update medicine_reagents.dm
2017-11-14 15:51:58 -06:00
bbef661092
Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481
...
[MIRROR] [READY]integrated circuitry port+upgrade.
2017-11-14 15:51:03 -06:00
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
c3b60e502e
Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371
...
[MIRROR] SSoverlay improvements and tweaks
2017-11-14 14:56:34 -06:00
6a0b00ead6
Tesla no longer NOTHING PERSONNEL's the power beacon
2017-11-14 14:13:27 -06:00
157998e974
Greatly increases the performance of station-ending plasma fires
2017-11-14 13:51:45 -06:00
b9c9b87441
Alt clicking additions ( #32607 )
...
Adds alt clicking to lock/unlock for apc and air alarm
2017-11-14 13:49:32 -06:00
2fc1e5c8e5
More nuanced damage examination ( #32707 )
...
* More nuanced damage examinations
* Tweaking examination values
* Redundancy Removal
2017-11-14 13:48:20 -06:00
7aea98f749
Update meat.dm
2017-11-14 13:40:58 -06:00
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
c3a4d0d06a
Makes cryoxadone heal clone damage again
2017-11-14 05:01:17 -06:00
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
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
2f4c556ad8
reeeeEEEEEEEEEEEEEEE
2017-11-13 22:55:18 -05:00
1d4ae5196c
it works 👍
2017-11-13 17:00:26 -05:00
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
d983c7d928
Update examine.dm
2017-11-13 11:54:18 -06:00
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
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
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
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
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
f46db62f48
Update examine.dm
2017-11-13 11:49:47 -06:00
f610a6110b
Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597
...
[MIRROR] Fixes stimulum decay
2017-11-13 11:45:00 -06:00
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
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
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
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
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
09f2c19f0f
Update admin_verbs.dm
2017-11-13 11:40:22 -06:00
9ff35c5b2c
Merge branch 'master' into upstream-merge-32435
2017-11-13 11:30:06 -06:00
3c35202b5e
Performance and usability improvement for blueprints
2017-11-13 03:32:35 -06:00
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
LetterJay