deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
79bbf1085b
|
Merge pull request #4298 from Citadel-Station-13/upstream-merge-33389
[MIRROR] Fixes spelling error
|
2017-12-10 03:06:18 +00:00 |
|
Jordan Brown
|
0c93857bc5
|
Merge pull request #33389 from LuigiBoi/patch-1
Fixes spelling error
|
2017-12-09 15:54:06 -06:00 |
|
Jordan Brown
|
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 |
|
Jordan Brown
|
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 |
|
Jordan Brown
|
7a90baa1f8
|
Merge pull request #33390 from duncathan/atmos-defines
cleans up atmos defines
|
2017-12-09 15:53:34 -06:00 |
|
Jordan Brown
|
7b9bcb37aa
|
Merge pull request #33376 from Xhuis/patch-3
Flickering no longer enables emergency lights
|
2017-12-09 15:53:20 -06:00 |
|
Jordan Brown
|
3de5ed055f
|
Merge pull request #33365 from KomradeSpectre/vox_circuit
Adds AI Vox Sound Output Circuit
|
2017-12-09 15:53:12 -06:00 |
|
Jordan Brown
|
70be12aa1c
|
Merge pull request #33241 from swindly/suicide
Adds some suicide acts
|
2017-12-09 15:52:53 -06:00 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
4600a6eb87
|
Update drinks.dm
|
2017-12-08 14:07:33 -05:00 |
|
deathride58
|
e9932c4f40
|
Merge pull request #4277 from Citadel-Station-13/upstream-merge-33362
[MIRROR] Fixes random in random seeds
|
2017-12-08 18:53:15 +00:00 |
|
deathride58
|
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 |
|
deathride58
|
7cb2337c7f
|
Merge pull request #4266 from Citadel-Station-13/upstream-merge-33345
[MIRROR] Fixes some broken random events
|
2017-12-08 18:47:22 +00:00 |
|
deathride58
|
2275d59305
|
Merge pull request #4276 from Citadel-Station-13/upstream-merge-33359
[MIRROR] Fixes air alarm gas thresholds being impossible to change
|
2017-12-08 18:46:33 +00:00 |
|
deathride58
|
665cef7a35
|
Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231
[MIRROR] Adds pet carriers
|
2017-12-08 18:46:07 +00:00 |
|
deathride58
|
e3f5876419
|
Merge pull request #4275 from Citadel-Station-13/upstream-merge-33329
[MIRROR] hopefully optimizes process_cell() a touch
|
2017-12-08 18:45:17 +00:00 |
|
deathride58
|
d1490a18ed
|
Update protolathe.dm
|
2017-12-08 13:42:41 -05:00 |
|
deathride58
|
32cfebfee7
|
Update circuitprinter.dm
|
2017-12-08 13:41:26 -05:00 |
|
Jordan Brown
|
dfaa796fc2
|
Fixes certain material containers
|
2017-12-08 12:11:46 -06:00 |
|
ACCount
|
111cb9e5b0
|
Fixes random in random seeds (#33362)
* Fixes random in random seeds
* removed kwargs
|
2017-12-08 12:09:34 -06:00 |
|
ACCount
|
7aac99d4d7
|
Fixes air alarm gas thresholds being impossible to change (#33359)
|
2017-12-08 12:08:24 -06:00 |
|
duncathan salt
|
623a105169
|
hopefully optimizes process_cell() a touch (#33329)
* hopeful optimizations + code cleanup to process_cell() and lindaturftile
* minor fixes
* break and right paren
* extraneous define
|
2017-12-08 12:07:14 -06:00 |
|
Dax Dupont
|
17bb149cd1
|
Fixes observer versions of sillicon chat (#33355)
|
2017-12-08 12:07:01 -06:00 |
|
deathride58
|
33364abc06
|
Merge pull request #4264 from Citadel-Station-13/upstream-merge-33116
[MIRROR] Adds a medal for getting to the end of the secret tile dialog.
|
2017-12-08 17:31:14 +00:00 |
|
deathride58
|
d379ec8e41
|
Merge pull request #4265 from Citadel-Station-13/upstream-merge-33343
[MIRROR] makes cat code better
|
2017-12-08 17:30:44 +00:00 |
|
deathride58
|
d826217439
|
Merge pull request #4261 from Citadel-Station-13/upstream-merge-33235
[MIRROR] Slime Blueprint Change
|
2017-12-08 17:18:22 +00:00 |
|
Jordan Brown
|
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 |
|
YPOQ
|
f7d5ab5baf
|
Fixes some broken random events (#33345)
|
2017-12-08 10:34:50 -06:00 |
|
Tlaltecuhtli
|
309f82dc9e
|
commit (#33343)
help what is this
|
2017-12-08 10:34:42 -06:00 |
|
Shadowlight213
|
0496cc9bc7
|
Adds a medal for getting to the end of the secret tile dialog. (#33116)
* Adds medal for reaching the end of the secret room panel list
* fix
|
2017-12-08 10:34:35 -06:00 |
|
oranges
|
10d50dd283
|
Fixes mugs being called "broken bottles"
|
2017-12-08 10:34:27 -06:00 |
|
oranges
|
d619f206c6
|
Merge pull request #33235 from Fox-McCloud/xenobio-console
Slime Blueprint Change
|
2017-12-08 10:34:13 -06:00 |
|
Ashe Higgs
|
315e1d718a
|
Adds pet carriers
|
2017-12-08 10:34:05 -06:00 |
|
oranges
|
c5a61bbca5
|
Merge pull request #33350 from Cyberboss/FixConfig
panic_address -> panic_server_address
|
2017-12-08 10:33:46 -06:00 |
|
deathride58
|
ef9e94a128
|
Merge pull request #4253 from Citadel-Station-13/upstream-merge-33312
[MIRROR] old turf in afterShuttleMove
|
2017-12-08 00:31:17 +00:00 |
|
Jordan Brown
|
28c4705750
|
Merge pull request #33312 from ninjanomnom/oldturf
old turf in afterShuttleMove
|
2017-12-06 22:51:09 -06:00 |
|
oranges
|
dc2d191eba
|
Merge pull request #33332 from AnturK/lightfix
Fixes light breaking
|
2017-12-06 16:20:31 -06:00 |
|
deathride58
|
e7e9a4cc9b
|
Merge pull request #4245 from Citadel-Station-13/upstream-merge-33182
[MIRROR] Fugu improvements
|
2017-12-06 17:52:03 +00:00 |
|
deathride58
|
c2d1c38367
|
Merge pull request #4244 from Citadel-Station-13/upstream-merge-33222
[MIRROR] Makes silicon chat more visible
|
2017-12-06 17:51:17 +00:00 |
|
deathride58
|
d923d355f2
|
Merge pull request #4242 from Citadel-Station-13/upstream-merge-32950
[MIRROR] Adds support for non-1:1 screen ratios (Doesn't add widescreen)
|
2017-12-06 17:50:28 +00:00 |
|
Armhulen
|
45b9b4956c
|
Fugu improvements (#33182)
* come on, you know i wumbo you wumbo he she me wumbo
* it's hip to wumbo
|
2017-12-06 06:32:50 -06:00 |
|
Dax Dupont
|
4b6660814a
|
Makes sillicon chat more visible (#33222)
Made it green on black
Forgot to remove it at the bold thingy
|
2017-12-06 06:20:27 -06:00 |
|
deathride58
|
c1cd970cc4
|
Merge pull request #4236 from Citadel-Station-13/upstream-merge-33274
[MIRROR] Removes ComponentActivated in favor of callbacks
|
2017-12-06 03:53:35 +00:00 |
|