 AnonmareandCitadelStationBot
|
52da86e214
|
Fixes booze-o-mats not having booze (#33418)
* Update vending.dm
* Update vending.dm
* Update vending_items.dm
* Adds a missing close parenthisis
* I'm drunk and blind, don't sue me
* Update vending_items.dm
* Update vending_items.dm
|
2017-12-10 13:20:06 -06:00 |
|
|
deathride58andGitHub
|
e18457f92e
|
Merge pull request #4284 from Citadel-Station-13/upstream-merge-33356
[MIRROR] Fixes meth explosions throwing warnings
|
2017-12-10 03:12:19 +00:00 |
|
|
CitadelStationBot
|
59ed54b571
|
Automatic changelog generation for PR #4283 [ci skip]
|
2017-12-09 21:11:57 -06:00 |
|
|
deathride58andGitHub
|
a17e7ae3cf
|
Merge pull request #4283 from Citadel-Station-13/upstream-merge-33358
[MIRROR] Replace pAI verb tab with an action button
|
2017-12-10 03:11:54 +00:00 |
|
|
deathride58andGitHub
|
80ae897f5e
|
Merge pull request #4285 from Citadel-Station-13/upstream-merge-33373
[MIRROR] Add a proc to check if a weather type is affecting an area
|
2017-12-10 03:09:50 +00:00 |
|
|
CitadelStationBot
|
5a7a4e3daa
|
Automatic changelog generation for PR #4289 [ci skip]
|
2017-12-09 21:09:31 -06:00 |
|
|
deathride58andGitHub
|
6ef12d993b
|
Merge pull request #4289 from Citadel-Station-13/upstream-merge-33263
[MIRROR] People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
|
2017-12-10 03:09:28 +00:00 |
|
|
CitadelStationBot
|
64fc055c75
|
Automatic changelog generation for PR #4290 [ci skip]
|
2017-12-09 21:08:59 -06:00 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
CitadelStationBot
|
65ab675b29
|
Automatic changelog generation for PR #4292 [ci skip]
|
2017-12-09 21:07:57 -06:00 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
79bbf1085b
|
Merge pull request #4298 from Citadel-Station-13/upstream-merge-33389
[MIRROR] Fixes spelling error
|
2017-12-10 03:06:18 +00:00 |
|
|
CitadelStationBot
|
e0a78afcf3
|
Automatic changelog generation for PR #4296 [ci skip]
|
2017-12-09 21:06:06 -06:00 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
CitadelStationBot
|
fefdde0a36
|
Automatic changelog generation for PR #4286 [ci skip]
|
2017-12-09 21:05:24 -06:00 |
|
|
deathride58andGitHub
|
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 |
|
|
CitadelStationBot
|
0d42a65029
|
Step backwards version of hex2num
|
2017-12-09 15:54:14 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
ae48e14876
|
Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell
Step backwards version of hex2num
|
2017-12-09 15:54:14 -06:00 |
|
|
CitadelStationBot
|
de9b130f0a
|
Fixes spelling error
|
2017-12-09 15:54:07 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
0c93857bc5
|
Merge pull request #33389 from LuigiBoi/patch-1
Fixes spelling error
|
2017-12-09 15:54:06 -06:00 |
|
|
CitadelStationBot
|
a71c61a97e
|
Allows for qdel in shuttleMove procs
|
2017-12-09 15:53:57 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
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 |
|
|
CitadelStationBot
|
0df98071ff
|
Fixes emergency lights having infinite power, and replaces their magic number with a define
|
2017-12-09 15:53:49 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
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 |
|
|
CitadelStationBot
|
0d8af43f8d
|
Remove meaningless "Type too long" message from VV
|
2017-12-09 15:53:42 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
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 |
|
|
CitadelStationBot
|
db4fdd22c7
|
cleans up atmos defines
|
2017-12-09 15:53:34 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
7a90baa1f8
|
Merge pull request #33390 from duncathan/atmos-defines
cleans up atmos defines
|
2017-12-09 15:53:34 -06:00 |
|
|
CitadelStationBot
|
f72af85e3f
|
Flickering no longer enables emergency lights
|
2017-12-09 15:53:20 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
7b9bcb37aa
|
Merge pull request #33376 from Xhuis/patch-3
Flickering no longer enables emergency lights
|
2017-12-09 15:53:20 -06:00 |
|
|
CitadelStationBot
|
6584f859f9
|
Adds AI Vox Sound Output Circuit
|
2017-12-09 15:53:12 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
3de5ed055f
|
Merge pull request #33365 from KomradeSpectre/vox_circuit
Adds AI Vox Sound Output Circuit
|
2017-12-09 15:53:12 -06:00 |
|
|
CitadelStationBot
|
2274b74e03
|
Adds some suicide acts
|
2017-12-09 15:52:53 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
70be12aa1c
|
Merge pull request #33241 from swindly/suicide
Adds some suicide acts
|
2017-12-09 15:52:53 -06:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
CitadelStationBot
|
be33f9e72e
|
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
|
2017-12-09 15:52:35 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
00c17ad6e5
|
Merge pull request #33263 from kevinz000/patch-402
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
|
2017-12-09 15:52:35 -06:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
CitadelStationBot
|
5d8ea96de8
|
Cycle-link airlocks in the mining base
|
2017-12-09 01:52:03 -06:00 |
|
|
Tad HardestyandCitadelStationBot
|
047800c51c
|
Cycle-link airlocks in the mining base (#33095)
|
2017-12-09 01:52:03 -06:00 |
|
|
CitadelStationBot
|
6bd60f9981
|
Add a proc to check if a weather type is affecting an area
|
2017-12-09 01:36:40 -06:00 |
|
|
orangesandCitadelStationBot
|
98a0602b1a
|
Add a proc to check if a weather type is affecting an area (#33373)
|
2017-12-09 01:36:40 -06:00 |
|
|
CitadelStationBot
|
0bc9c77287
|
Fixes meth explosions throwing warnings
|
2017-12-09 01:09:04 -06:00 |
|
|
ACCountandCitadelStationBot
|
3c9758fe80
|
Fixes meth explosion throwing warnings (#33356)
|
2017-12-09 01:09:04 -06:00 |
|
|
CitadelStationBot
|
4dc06b284c
|
Replace pAI verb tab with an action button
|
2017-12-08 22:46:30 -06:00 |
|