53ab4feb2f
Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324
...
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 18:47:56 +00: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
c5a61bbca5
Merge pull request #33350 from Cyberboss/FixConfig
...
panic_address -> panic_server_address
2017-12-08 10:33:46 -06:00
193879529c
Merge pull request #33308 from tgstation/Cyberboss-patch-3
...
Fixes every config flag updating world.sleep_offline
2017-12-06 16:26:49 -06:00
57b45e8dc3
Merge pull request #33278 from tgstation/Cyberboss-patch-9-1
...
Allows read-only VV of feedback
2017-12-05 14:33:42 -06:00
24d205f9c9
Merge pull request #4223 from Citadel-Station-13/upstream-merge-33243
...
[MIRROR] Adds a CRASH on invalid calls to record_feedback
2017-12-05 20:22:38 +00:00
0f76084794
Merge pull request #33243 from tgstation/Cyberboss-patch-5
...
Adds a CRASH on invalid calls to record_feedback
2017-12-05 03:23:46 -06:00
5c1ccad969
Adds server tools version to feedback ( #33244 )
...
* Adds server tools version to feedback
* Fix incorrect call to record_feedback
* Add number to record feedback calls
2017-12-05 03:23:15 -06:00
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
1a32bdc053
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
...
[MIRROR] Datumizes saymodes
2017-12-04 21:19:53 +00:00
29ba71765c
Datumizes saymodes
2017-12-03 12:56:03 -06:00
b1e15a0da2
Crash to timers and INFINITY check to beams. ( #33219 )
...
* beams
* timers
* >= instead of !=
* whooops
2017-12-03 12:45:27 -06:00
00f7be5c36
Merge pull request #33072 from AnturK/ibelievedinyoukornowlook
...
Fixes non-advanced diseases vaccines.
2017-11-27 08:25:55 -06:00
794a793b27
Fixes latejoins ( #33096 )
...
length() is 0 on null lists.
Update job.dm
2017-11-26 05:11:09 -06:00
20014e6f44
Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
...
Adds spawn override system
2017-11-25 16:37:46 -06:00
ff94b3e1e1
Merge pull request #4113 from Citadel-Station-13/upstream-merge-32998
...
[MIRROR] Revises the_station_areas list
2017-11-24 23:47:34 +00:00
7125a50340
Merge pull request #4104 from Citadel-Station-13/upstream-merge-33006
...
[MIRROR] Adds a config to optionally hard reboot DD
2017-11-24 23:12:45 +00:00
521277292d
Revises the_station_areas list
2017-11-24 14:12:53 -06:00
dc0310eb5d
Adds a config to optionally hard reboot DD ( #33006 )
2017-11-24 13:00:02 -06:00
0b07f80b62
custom docker improvements ( #32626 )
2017-11-24 12:59:17 -06:00
c76cacdf77
Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
...
[MIRROR] [READY]NTnet refactor, assimilates exonet
2017-11-23 01:40:54 +00:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
2615ddd226
Merge pull request #32945 from tgstation/Cyberboss-patch-1
...
Fixes bad text2file call
2017-11-22 15:39:16 -06:00
8efbcc9cb0
Update time_track.dm
2017-11-22 14:28:25 -05:00
2934effd36
Update blackbox.dm
2017-11-22 14:27:10 -05:00
aedf16a76e
merges #4011
2017-11-21 15:07:31 -05:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
8a64287249
Integrated circuit fixes and code improvements
2017-11-21 03:04:17 -06:00
d2b251d23c
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
...
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
298035b339
Merge pull request #32900 from AnturK/actuallyfixesthatthing
...
Fixes lobby timer on setup failure
2017-11-20 10:11:04 -06:00
e5edaa4656
Fixes setup failure edge case ( #32812 )
2017-11-18 13:51:40 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00: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
ab21f8d5ed
511 client fix and a config to make the version warning a popup
2017-11-15 04:39:36 -06:00
b4c1ca31d9
Merge pull request #3940 from Citadel-Station-13/upstream-merge-32687
...
[MIRROR] Fixes leg day
2017-11-14 15:56:47 -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
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
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
9708ed6003
Merge pull request #32687 from AnturK/client_timer_fix
...
Fixes leg day
2017-11-14 13:16:26 -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
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -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
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
9fefd15f66
Merge branch 'master' into upstream-merge-32247
2017-11-12 23:09:10 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
4605b252f3
Update config_entry.dm
2017-11-11 15:53:20 -06:00
35a49d5178
Merge pull request #3873 from Citadel-Station-13/upstream-merge-32516
...
[MIRROR] removes pipe construction cache
2017-11-11 12:38:45 -06:00
deathride58