LetterJay
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
LetterJay
ce0ce0b6b9
Update changeling.dm
2017-11-15 10:38:57 -06:00
LetterJay
668248b987
combines the missed microwave PR
2017-11-15 10:31:41 -06:00
LetterJay
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
LetterJay
c725b0d30c
Update machinery_sounds.dm
2017-11-15 10:25:34 -06:00
LetterJay
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
LetterJay
16019df886
Merge branch 'master' into upstream-merge-32280
2017-11-15 10:21:04 -06:00
Emmett Gaines
ab21f8d5ed
511 client fix and a config to make the version warning a popup
2017-11-15 04:39:36 -06:00
AnturK
13ebff97df
Fixes AI door hotkeys & other weirdness
2017-11-15 02:03:17 -06:00
oranges
156aa30c61
Merge pull request #32729 from Qustinnus/cheapGBP
...
removes an unused var from radio code
2017-11-15 01:27:24 -06:00
Matt Smith
c4789d497a
Alternative grille sprite update ( #32630 )
...
* Update grille sprite
* Add damaged grille sprite
* Add 4 varients to the damaged grille
2017-11-14 23:55:25 -06:00
deathride58
f1274b41f2
redisables slime splitting
2017-11-14 19:27:19 -05:00
Emmett Gaines
9b75113631
[512] Makes gas mouse transparent ( #32569 )
...
* Makes gas mouse transparent
* readability cleanup
* future proofing
2017-11-14 17:47:01 -06:00
Leo
4d1ea753c3
Removes some attackby crowbar checks on nuclear bombs and camera assemblies ( #32726 )
2017-11-14 17:44:49 -06:00
LetterJay
0885c57b39
Update mob.dm
2017-11-14 16:10:46 -06:00
LetterJay
66445eb80b
Update syndicatebeacon.dm
2017-11-14 16:07:26 -06:00
LetterJay
ccc9158819
Update station_alert.dm
2017-11-14 16:06:54 -06:00
LetterJay
fb49013241
Merge branch 'master' into upstream-merge-32221
2017-11-14 15:59:47 -06:00
LetterJay
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
LetterJay
44d15b07fb
Merge pull request #3942 from Citadel-Station-13/upstream-merge-32607
...
[MIRROR] Alt clicking additions
2017-11-14 15:57:06 -06:00
LetterJay
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
LetterJay
b4c1ca31d9
Merge pull request #3940 from Citadel-Station-13/upstream-merge-32687
...
[MIRROR] Fixes leg day
2017-11-14 15:56:47 -06:00
LetterJay
62c7cfc4e7
Merge pull request #3938 from Citadel-Station-13/upstream-merge-32689
...
[MIRROR] Fixes a bunch of hand tele/portal issues.
2017-11-14 15:56:08 -06:00
LetterJay
aea2e8716d
Merge pull request #3937 from Citadel-Station-13/upstream-merge-32636
...
[MIRROR] Heirophant Relay sprites
2017-11-14 15:55:55 -06:00
LetterJay
528255833f
Merge pull request #3935 from Citadel-Station-13/upstream-merge-32684
...
[MIRROR] Fix the station integrity report to read the correct Z
2017-11-14 15:54:44 -06:00
LetterJay
7fa3a16a0b
Merge pull request #3934 from Citadel-Station-13/upstream-merge-32598
...
[MIRROR] Cult Scaling Refactor
2017-11-14 15:54:08 -06:00
LetterJay
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
LetterJay
2d137b2bf9
Update medicine_reagents.dm
2017-11-14 15:51:58 -06:00
LetterJay
d9ce438bbb
Merge pull request #3929 from Citadel-Station-13/upstream-merge-32656
...
[MIRROR] Directional computer sprites
2017-11-14 15:51:35 -06:00
LetterJay
829d981fa5
Merge pull request #3928 from Citadel-Station-13/upstream-merge-32594
...
[MIRROR] Update AI Airlock UI to use TGUI
2017-11-14 15:51:18 -06:00
LetterJay
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
MoreRobustThanYou
a970bc2283
Fixes a runtime with glowshrooms ( #32719 )
2017-11-14 15:36:53 -06:00
Jordan Brown
c6584399fe
Adds some server tools info to getrev ( #32692 )
2017-11-14 15:36:45 -06:00
vuonojenmustaturska
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
LetterJay
9c7da6a133
Merge pull request #3905 from Citadel-Station-13/upstream-merge-32570
...
[MIRROR] Checks for nulls in weakrefs
2017-11-14 14:58:07 -06:00
LetterJay
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
Robustin
6a0b00ead6
Tesla no longer NOTHING PERSONNEL's the power beacon
2017-11-14 14:13:27 -06:00
vuonojenmustaturska
157998e974
Greatly increases the performance of station-ending plasma fires
2017-11-14 13:51:45 -06:00
AutomaticFrenzy
b9c9b87441
Alt clicking additions ( #32607 )
...
Adds alt clicking to lock/unlock for apc and air alarm
2017-11-14 13:49:32 -06:00
Robustin
2fc1e5c8e5
More nuanced damage examination ( #32707 )
...
* More nuanced damage examinations
* Tweaking examination values
* Redundancy Removal
2017-11-14 13:48:20 -06:00
LetterJay
7aea98f749
Update meat.dm
2017-11-14 13:40:58 -06:00
LetterJay
ec2078d448
Update machinery_sounds.dm
2017-11-14 13:40:45 -06:00
Jordan Brown
9708ed6003
Merge pull request #32687 from AnturK/client_timer_fix
...
Fixes leg day
2017-11-14 13:16:26 -06:00
kevinz000
eba429f5b1
Hand teleporter and portal fixes. ( #32689 )
2017-11-14 13:11:55 -06:00
LetterJay
e0d291eb19
Update weakrefs.dm
2017-11-14 13:06:53 -06:00
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