oranges
|
3208404f14
|
Merge pull request #33580 from Xhuis/defenses_balancing
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
|
2017-12-30 16:59:07 -06:00 |
|
LetterJay
|
dad7c72a3e
|
Merge pull request #4579 from Citadel-Station-13/upstream-merge-33663
[MIRROR] [Ready]Adds the Pax reagent, small tweaks to pacifism
|
2017-12-30 14:13:23 -06:00 |
|
LetterJay
|
4237a8910c
|
Merge pull request #4483 from Citadel-Station-13/upstream-merge-33682
[MIRROR] Makes newscaster feedback messages and comments always a list.
|
2017-12-30 14:13:03 -06:00 |
|
Jordan Brown
|
3128c26698
|
Merge pull request #33937 from AnturK/printplayerfix
printplayer fix for jobless minds
|
2017-12-30 14:04:05 -06:00 |
|
Jordan Brown
|
3802cf8586
|
Merge pull request #33805 from Cruix/shuttle_machines
Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
|
2017-12-30 13:56:43 -06:00 |
|
Jordan Brown
|
75f492f416
|
Always use the area name when selecting a teleport beacon
|
2017-12-30 13:55:17 -06:00 |
|
LetterJay
|
211f3942a6
|
Merge branch 'master' into upstream-merge-33930
|
2017-12-30 13:37:52 -06:00 |
|
LetterJay
|
c1c67ced1a
|
Update color.dm
|
2017-12-30 13:37:30 -06:00 |
|
LetterJay
|
4d3b7ddcbd
|
Update color.dm
|
2017-12-30 13:37:23 -06:00 |
|
LetterJay
|
32291c247b
|
Update megafauna.dm
|
2017-12-30 13:33:45 -06:00 |
|
LetterJay
|
2994b4b7c2
|
Update blood_drunk_miner.dm
|
2017-12-30 13:33:37 -06:00 |
|
LetterJay
|
449ae34621
|
Update hostile.dm
|
2017-12-30 13:33:25 -06:00 |
|
LetterJay
|
96358f62f2
|
Update aux_base.dm
|
2017-12-30 13:33:15 -06:00 |
|
LetterJay
|
10643a192e
|
Update vent_clog.dm
|
2017-12-30 13:33:01 -06:00 |
|
LetterJay
|
de10a5b223
|
Update spider_infestation.dm
|
2017-12-30 13:32:53 -06:00 |
|
LetterJay
|
f698fd5329
|
Update disease_outbreak.dm
|
2017-12-30 13:32:46 -06:00 |
|
LetterJay
|
2fe40198a2
|
Update alien_infestation.dm
|
2017-12-30 13:32:38 -06:00 |
|
LetterJay
|
7c69a835be
|
Update teleporter.dm
|
2017-12-30 13:32:29 -06:00 |
|
LetterJay
|
47174097e1
|
Update communications.dm
|
2017-12-30 13:32:19 -06:00 |
|
LetterJay
|
a160997587
|
Update talisman.dm
|
2017-12-30 13:32:02 -06:00 |
|
LetterJay
|
a8d6fa7fd7
|
Update runes.dm
|
2017-12-30 13:31:51 -06:00 |
|
LetterJay
|
6c59d4134a
|
Update ritual.dm
|
2017-12-30 13:31:24 -06:00 |
|
LetterJay
|
f0214dd06d
|
Update overmind.dm
|
2017-12-30 13:31:13 -06:00 |
|
LetterJay
|
c8f3fdfe38
|
Merge branch 'master' into upstream-merge-33663
|
2017-12-30 13:29:36 -06:00 |
|
LetterJay
|
dda430131a
|
Update roundend.dm
|
2017-12-30 13:28:58 -06:00 |
|
LetterJay
|
dae3c3efb5
|
Merge branch 'master' into upstream-merge-33621
|
2017-12-30 13:23:39 -06:00 |
|
LetterJay
|
35574263b1
|
Update outlet_injector.dm
|
2017-12-30 13:23:02 -06:00 |
|
LetterJay
|
70fea88a39
|
Update cryo.dm
|
2017-12-30 13:22:54 -06:00 |
|
LetterJay
|
95714a0207
|
Update volume_pump.dm
|
2017-12-30 13:22:46 -06:00 |
|
LetterJay
|
8452cc74d0
|
Update newscaster.dm
|
2017-12-30 13:21:31 -06:00 |
|
LetterJay
|
b260704381
|
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
[MIRROR] Turns the baseturf var into a part time list
|
2017-12-30 13:19:00 -06:00 |
|
LetterJay
|
d3f6cf4dd8
|
Merge branch 'master' into upstream-merge-33537
|
2017-12-30 13:14:48 -06:00 |
|
Jordan Brown
|
cbb8d807f1
|
turfs changed to /space/basic are instead turned into /space
|
2017-12-30 13:14:04 -06:00 |
|
cebutris
|
8c6d660611
|
adds functional cebusoap
|
2017-12-30 10:04:03 -05:00 |
|
LetterJay
|
f860fa0cd3
|
Update closed.dm
|
2017-12-30 05:12:10 -06:00 |
|
LetterJay
|
68b44e73f4
|
Merge pull request #4533 from Citadel-Station-13/upstream-merge-33734
[MIRROR] Makes cyclelinkeddir rotate with shuttle
|
2017-12-30 05:06:32 -06:00 |
|
LetterJay
|
0402595242
|
Merge pull request #4540 from Citadel-Station-13/upstream-merge-33835
[MIRROR] Adds coordinates to href logs
|
2017-12-30 05:06:19 -06:00 |
|
LetterJay
|
19c6db6a6e
|
Merge pull request #4591 from Citadel-Station-13/upstream-merge-33905
[MIRROR] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
|
2017-12-30 05:06:03 -06:00 |
|
LetterJay
|
61203ed9f6
|
Merge pull request #4588 from Citadel-Station-13/upstream-merge-33914
[MIRROR] Prevent infinite loops in orbit checks
|
2017-12-30 05:05:30 -06:00 |
|
LetterJay
|
72d0ca2f1a
|
Merge pull request #4590 from Citadel-Station-13/upstream-merge-33796
[MIRROR] Monkeymode fixes
|
2017-12-30 05:05:20 -06:00 |
|
LetterJay
|
de0ade801c
|
Merge pull request #4589 from Citadel-Station-13/upstream-merge-33903
[MIRROR] Fixes mobs targeting from inside things.
|
2017-12-30 05:04:09 -06:00 |
|
LetterJay
|
4599680f68
|
Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
[MIRROR] Internal radio implant
|
2017-12-30 05:03:48 -06:00 |
|
Jordan Brown
|
d306c8fa62
|
Removes suit sensors from bural garbs (#33915)
* Removes suit sensors from bural garbs
* Dew it right
|
2017-12-29 21:36:35 -06:00 |
|
LetterJay
|
2d9a70a487
|
Update uplink_kits.dm
|
2017-12-29 18:42:44 -06:00 |
|
LetterJay
|
d820575f78
|
Update orbit.dm
|
2017-12-29 18:41:57 -06:00 |
|
LetterJay
|
6f8c2c1daf
|
Update item_attack.dm
|
2017-12-29 18:40:58 -06:00 |
|
LetterJay
|
54b6eddebc
|
Merge branch 'master' into upstream-merge-33660
|
2017-12-29 18:40:29 -06:00 |
|
LetterJay
|
86c5f3cb0b
|
Update detective_work.dm
|
2017-12-29 18:39:28 -06:00 |
|
LetterJay
|
a3ebaa5de8
|
Merge branch 'master' into upstream-merge-32311
|
2017-12-29 18:38:50 -06:00 |
|
LetterJay
|
010c1e17ad
|
Update client_procs.dm
|
2017-12-29 18:38:32 -06:00 |
|