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
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
13ebff97df
Fixes AI door hotkeys & other weirdness
2017-11-15 02:03:17 -06:00
156aa30c61
Merge pull request #32729 from Qustinnus/cheapGBP
...
removes an unused var from radio code
2017-11-15 01:27:24 -06:00
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
4d1ea753c3
Removes some attackby crowbar checks on nuclear bombs and camera assemblies ( #32726 )
2017-11-14 17:44:49 -06:00
66445eb80b
Update syndicatebeacon.dm
2017-11-14 16:07:26 -06:00
ccc9158819
Update station_alert.dm
2017-11-14 16:06:54 -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
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
aea2e8716d
Merge pull request #3937 from Citadel-Station-13/upstream-merge-32636
...
[MIRROR] Heirophant Relay sprites
2017-11-14 15:55:55 -06:00
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
7fa3a16a0b
Merge pull request #3934 from Citadel-Station-13/upstream-merge-32598
...
[MIRROR] Cult Scaling Refactor
2017-11-14 15:54:08 -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
d9ce438bbb
Merge pull request #3929 from Citadel-Station-13/upstream-merge-32656
...
[MIRROR] Directional computer sprites
2017-11-14 15:51:35 -06:00
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
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
a970bc2283
Fixes a runtime with glowshrooms ( #32719 )
2017-11-14 15:36:53 -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
eba429f5b1
Hand teleporter and portal fixes. ( #32689 )
2017-11-14 13:11:55 -06:00
8868a354b6
Update multitool.dm
2017-11-14 13:06:43 -06:00
594da93554
Heirophant Relay sprites ( #32636 )
2017-11-14 13:04:34 -06:00
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
bd0cbee581
Cult pop scaling refactor ( #32598 )
2017-11-14 07:44:28 -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
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
d486d784ad
Update AI Airlock UI to use TGUI
2017-11-14 05:00:58 -06:00
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
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
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
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
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
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
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
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
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
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
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
9ff35c5b2c
Merge branch 'master' into upstream-merge-32435
2017-11-13 11:30:06 -06:00
182b81a721
Adds ambience for Reebe. ( #32623 )
...
* spooky
* fix 1
* fix 2
2017-11-13 03:45:03 -06:00
3c35202b5e
Performance and usability improvement for blueprints
2017-11-13 03:32:35 -06:00
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
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
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
LetterJay