6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
0c7bc2f3fe
Merge pull request #4292 from Citadel-Station-13/upstream-merge-33376
...
[MIRROR] Flickering no longer enables emergency lights
2017-12-10 03:07:54 +00:00
2029473a48
Merge pull request #33397 from Xhuis/em_light_fix
...
Fixes emergency lights having infinite power, and replaces their magic number with a define
2017-12-09 15:53:49 -06:00
7b9bcb37aa
Merge pull request #33376 from Xhuis/patch-3
...
Flickering no longer enables emergency lights
2017-12-09 15:53:20 -06:00
8b9e15d1b5
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
...
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
dc2d191eba
Merge pull request #33332 from AnturK/lightfix
...
Fixes light breaking
2017-12-06 16:20:31 -06:00
3526d4045a
Merge pull request #4214 from Citadel-Station-13/upstream-merge-33288
...
[MIRROR] Fixes powernets
2017-12-05 20:17:33 +00:00
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
005c6dcb59
Fixes powernets ( #33288 )
2017-12-05 03:22:33 -06:00
64aadb868e
Merge branch 'master' into upstream-merge-33213
2017-12-04 21:39:30 +00:00
84fe88153e
merges #4208
2017-12-04 16:17:43 -05:00
4d29723302
Update lighting.dm
2017-12-03 18:25:54 -05:00
a95b5a2b91
Merge pull request #4171 from Citadel-Station-13/upstream-merge-33144
...
[MIRROR] Fix turbine computer showing broken
2017-12-03 23:20:40 +00:00
5621507b4a
Adds emergency lights, built into light fixtures
2017-12-03 12:54:48 -06:00
a0cdca9e7c
Fix turbine computer showing broken
2017-11-30 17:01:38 -06:00
9601136df2
sm soundtweak ( #33154 )
2017-11-30 17:01:29 -06:00
837779b683
Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025
...
[MIRROR] Fixes Lord Singuloth hungering for more than he should
2017-11-24 23:15:09 +00:00
541b8db684
Merge pull request #32985 from YPOQ/airlockfix
...
Fixes AIs being unable to interact with unscrewed airlocks
2017-11-24 14:11:39 -06:00
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
694958f587
Update Turbine computer to use TGUI
2017-11-21 22:28:14 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
752bc654ae
Makes some turning procs consistently turn clockwise
2017-11-19 22:25:17 -06:00
6a05a54c96
Update cell.dm
2017-11-18 23:31:32 -05:00
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
98ce27d0ad
Update cell.dm
2017-11-17 23:37:32 -05:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -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
6a0b00ead6
Tesla no longer NOTHING PERSONNEL's the power beacon
2017-11-14 14:13:27 -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
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -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
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
3ea8808201
Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
...
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
300c471da9
Refactor of base machinery a tiny bit more. DONE ( #32546 )
...
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.
* Just checking something
* Does this fix the compiling not working properly?
* And this?
* What is going wrong ugh!
* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?
* Slight tidying up for what Cyberboss and Antur likes.
* Fixes the things that I was asked to fix
2017-11-12 13:19:23 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
7f9800e8fa
Assmos tweaks/minor additions. ( #32400 )
...
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.
* Review response.
* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:31:16 -06:00
59f3a714e2
Merge pull request #32250 from ninjanomnom/map-cable-color
...
Makes greyscaled cables' color viewable in map editing
2017-10-31 15:30:45 -05:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
1d8184e206
Merge pull request #32142 from optimumtact/boiwhatarethose
...
Remove stray parent proc call in collector code
2017-10-27 17:31:19 -05:00
141de52658
Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
...
[MIRROR] Assmos part 1, #2
2017-10-27 02:47:56 -04:00
6b0bb7268e
Merge pull request #3611 from Citadel-Station-13/upstream-merge-31945
...
[MIRROR] Adds ambience to the SM and portable generators
2017-10-27 02:16:02 -04:00
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
c7d3696636
Adds ambience to the SM and portable generators ( #31945 )
...
* Adds aambience to the SM and portable generators
* lowered pitch of supermatter
* start and end fix
2017-10-25 23:37:14 -05:00
ae86a75362
Greyscale cables
2017-10-25 21:46:57 -05:00
a1236008f3
Merge pull request #3552 from Citadel-Station-13/upstream-merge-31355
...
[MIRROR] Code Consistency: luminosity --> light_range
2017-10-23 03:44:46 -04:00
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
AnturK