64fc055c75
Automatic changelog generation for PR #4290 [ci skip]
2017-12-09 21:08:59 -06:00
1906ead618
Merge pull request #4290 from Citadel-Station-13/upstream-merge-33241
...
[MIRROR] Adds some suicide acts
2017-12-10 03:08:57 +00:00
fe4864f8ed
Merge pull request #4291 from Citadel-Station-13/upstream-merge-33365
...
[MIRROR] Adds AI Vox Sound Output Circuit
2017-12-10 03:08:19 +00:00
65ab675b29
Automatic changelog generation for PR #4292 [ci skip]
2017-12-09 21:07:57 -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
f83da95eb0
Merge pull request #4294 from Citadel-Station-13/upstream-merge-33390
...
[MIRROR] cleans up atmos defines
2017-12-10 03:07:27 +00:00
9387b4a9c8
Merge pull request #4295 from Citadel-Station-13/upstream-merge-33386
...
[MIRROR] Remove meaningless "Type too long" message from VV
2017-12-10 03:06:57 +00:00
15b51f6c6c
Merge pull request #4297 from Citadel-Station-13/upstream-merge-33384
...
[MIRROR] Allows for qdel in shuttleMove procs
2017-12-10 03:06:31 +00:00
79bbf1085b
Merge pull request #4298 from Citadel-Station-13/upstream-merge-33389
...
[MIRROR] Fixes spelling error
2017-12-10 03:06:18 +00:00
e0a78afcf3
Automatic changelog generation for PR #4296 [ci skip]
2017-12-09 21:06:06 -06:00
7d3739dddb
Merge pull request #4296 from Citadel-Station-13/upstream-merge-33397
...
[MIRROR] Fixes emergency lights having infinite power, and replaces their magic number with a define
2017-12-10 03:06:03 +00:00
648d16ec1a
Merge pull request #4299 from Citadel-Station-13/upstream-merge-33371
...
[MIRROR] Step backwards version of hex2num
2017-12-10 03:05:36 +00:00
fefdde0a36
Automatic changelog generation for PR #4286 [ci skip]
2017-12-09 21:05:24 -06:00
d7cd7b806e
Merge pull request #4286 from Citadel-Station-13/upstream-merge-33095
...
[MIRROR] Cycle-link airlocks in the mining base
2017-12-10 03:05:21 +00:00
0d42a65029
Step backwards version of hex2num
2017-12-09 15:54:14 -06:00
ae48e14876
Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell
...
Step backwards version of hex2num
2017-12-09 15:54:14 -06:00
de9b130f0a
Fixes spelling error
2017-12-09 15:54:07 -06:00
0c93857bc5
Merge pull request #33389 from LuigiBoi/patch-1
...
Fixes spelling error
2017-12-09 15:54:06 -06:00
a71c61a97e
Allows for qdel in shuttleMove procs
2017-12-09 15:53:57 -06:00
b6653dd94c
Merge pull request #33384 from ninjanomnom/deletes-in-my-shutle-subsystem
...
Allows for qdel in shuttleMove procs
2017-12-09 15:53:57 -06:00
0df98071ff
Fixes emergency lights having infinite power, and replaces their magic number with a define
2017-12-09 15:53:49 -06: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
0d8af43f8d
Remove meaningless "Type too long" message from VV
2017-12-09 15:53:42 -06:00
906ed84674
Merge pull request #33386 from AutomaticFrenzy/patch/type-too-long
...
Remove meaningless "Type too long" message from VV
2017-12-09 15:53:42 -06:00
db4fdd22c7
cleans up atmos defines
2017-12-09 15:53:34 -06:00
7a90baa1f8
Merge pull request #33390 from duncathan/atmos-defines
...
cleans up atmos defines
2017-12-09 15:53:34 -06:00
f72af85e3f
Flickering no longer enables emergency lights
2017-12-09 15:53:20 -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
6584f859f9
Adds AI Vox Sound Output Circuit
2017-12-09 15:53:12 -06:00
3de5ed055f
Merge pull request #33365 from KomradeSpectre/vox_circuit
...
Adds AI Vox Sound Output Circuit
2017-12-09 15:53:12 -06:00
2274b74e03
Adds some suicide acts
2017-12-09 15:52:53 -06:00
70be12aa1c
Merge pull request #33241 from swindly/suicide
...
Adds some suicide acts
2017-12-09 15:52:53 -06:00
edce62494d
Merge pull request #4082 from deathride58/donoritemmodularization
...
Donator item modularization + manual sync of sprites with upstream + manual mirrors + donor item fixes
2017-12-09 15:52:44 -06:00
99c07951f0
Merge pull request #4282 from Citadel-Station-13/revert-4280-upstream-merge-33098
...
Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets."
2017-12-09 07:25:14 -06:00
5d8ea96de8
Cycle-link airlocks in the mining base
2017-12-09 01:52:03 -06:00
047800c51c
Cycle-link airlocks in the mining base ( #33095 )
2017-12-09 01:52:03 -06:00
75eab09dff
Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets."
2017-12-08 19:16:49 -08:00
b8e55b6404
fixes compiling errors
2017-12-08 20:25:55 -05:00
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00
99283df12b
Merge pull request #4280 from Citadel-Station-13/upstream-merge-33098
...
[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets.
2017-12-08 16:17:25 -06:00
d24ae8a05a
[ready]Timer queuing tweaks: binary sorted inserts and rolling buckets.
2017-12-08 15:02:18 -06:00
811517ecb2
[ready]Timer queuing tweaks: binary sorted inserts and rolling buckets. ( #33098 )
...
* Timer queuing tweaks: binary sorted inserts and rolling buckets.
Client time timers now uses a binary search algorithm for its sorted inserts.
Processing now uses a binary sorted insert, rather then sorting it with sortTim during bucket_shifts.
Buckets now automatically wrap around rather then get regenerated every minute. (Rolling queue)
* Fixes some queue management bugs.
* Fixes a Order of Operations goof up in the ticks<->ds macros.
@ninjanomnom your pain is my success
* Remove debug line
* Fixes some binary insert bugs, fixes client time timers, moved id over to GUID
* Fixes initialization-time timers fucking everything up
2017-12-08 15:02:18 -06:00
a8311d6adf
Merge pull request #4263 from Citadel-Station-13/upstream-merge-33341
...
[MIRROR] Fixes mugs being called "broken bottles"
2017-12-08 20:24:51 +00:00
7ca945c96b
Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370
...
[MIRROR] Fixes certain material containers
2017-12-08 19:35:43 +00:00
a08586b850
fixes compiling errors
2017-12-08 14:35:30 -05:00
4600a6eb87
Update drinks.dm
2017-12-08 14:07:33 -05:00
d37599a0c5
Automatic changelog generation for PR #4279 [ci skip]
2017-12-08 13:06:49 -06:00
0c8bdab295
Merge pull request #4279 from Citadel-Station-13/upstream-merge-33357
...
[MIRROR] Prevents (cat)grilles from magically regenerating.
2017-12-08 19:06:46 +00:00
f79534045c
Automatic changelog generation for PR #4176 [ci skip]
2017-12-08 12:55:02 -06:00
f75b36af75
Merge pull request #4176 from Michiyamenotehifunana/holy-crap-it-took-so-long-to-make-this-armor
...
Adds RGB knights and more!
2017-12-08 18:54:59 +00:00
CitadelStationBot