LetterJay
|
b49009d481
|
Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621
[MIRROR] removes silly garbage defines
|
2018-01-02 04:52:57 -06:00 |
|
LetterJay
|
9ede14fbce
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574
|
2018-01-01 14:14:06 -06:00 |
|
LetterJay
|
168519c328
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311
|
2018-01-01 07:00:34 -06:00 |
|
LetterJay
|
d986ca1ee3
|
Merge pull request #4594 from Citadel-Station-13/upstream-merge-33911
[MIRROR] Adds white and rainbow gloves to the gloves/color/random selection pool
|
2018-01-01 04:26:56 -06:00 |
|
LetterJay
|
1463a442a5
|
Merge pull request #4596 from Citadel-Station-13/upstream-merge-33915
[MIRROR] Removes suit sensors from bural garbs
|
2018-01-01 04:25:37 -06:00 |
|
LetterJay
|
2db4000f08
|
Merge pull request #4618 from Citadel-Station-13/upstream-merge-33951
[MIRROR] Fixes reset_perspective runtimes
|
2017-12-31 15:22:25 -06:00 |
|
Jordan Brown
|
19c35c63d6
|
Merge pull request #33951 from AnturK/perspective_fix
Fixes reset_perspective runtimes
|
2017-12-31 09:58:02 -06:00 |
|
AnturK
|
bbca0afa37
|
Fixes thermals, also drops the see invisible from thermals. (#33950)
|
2017-12-31 06:30:34 -06:00 |
|
LetterJay
|
34b4976c28
|
Merge pull request #4614 from Citadel-Station-13/upstream-merge-33949
[MIRROR] Makes it clear that command reports are IC.
|
2017-12-31 02:53:22 -06:00 |
|
LetterJay
|
7998f037bd
|
Merge pull request #4609 from Citadel-Station-13/upstream-merge-33580
[MIRROR] Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
|
2017-12-31 02:51:44 -06:00 |
|
LetterJay
|
503f8e2635
|
Merge pull request #4605 from Citadel-Station-13/upstream-merge-33805
[MIRROR] Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
|
2017-12-31 02:50:21 -06:00 |
|
LetterJay
|
8f2aab0908
|
Merge pull request #4595 from Citadel-Station-13/upstream-merge-33930
[MIRROR] Fixes assistants spawning naked
|
2017-12-31 02:50:00 -06:00 |
|
BeeSting12
|
7dac76651e
|
Makes it clear that command reports are IC. (#33949)
* fixes #33936
* sticky's idea was better
|
2017-12-31 02:28:25 -06:00 |
|
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 |
|
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 |
|
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
|
c8f3fdfe38
|
Merge branch 'master' into upstream-merge-33663
|
2017-12-30 13:29:36 -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
|
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
|
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
|
d820575f78
|
Update orbit.dm
|
2017-12-29 18:41:57 -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 |
|
LetterJay
|
ac7750202b
|
Update shuttle_rotate.dm
|
2017-12-29 18:38:05 -06:00 |
|
oranges
|
a958de3d96
|
Fixes assistants spawning naked
|
2017-12-29 17:11:05 -06:00 |
|
ShizCalev
|
0c84651ec4
|
white and rainbow
|
2017-12-29 13:45:25 -06:00 |
|
Jordan Brown
|
d38a4a2aa5
|
Merge pull request #33905 from ShizCalev/jumpsuit-fix
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
|
2017-12-29 10:10:30 -06:00 |
|
MoreRobustThanYou
|
459d4f35c7
|
Monkeymode fixes (#33796)
* Monkey fixes
* Update say.dm
|
2017-12-29 10:08:17 -06:00 |
|
Jordan Brown
|
8059894d7d
|
Merge pull request #33903 from AnturK/pilot-fixes
Fixes mobs targeting from inside things.
|
2017-12-29 10:01:57 -06:00 |
|
Jordan Brown
|
0b9ffdd3e3
|
Prevent infinite loops in orbit checks
|
2017-12-29 10:00:44 -06:00 |
|
LetterJay
|
a64a1e4a5c
|
Merge branch 'master' into upstream-merge-33783
|
2017-12-29 06:49:47 -06:00 |
|
LetterJay
|
6d52395643
|
Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899
[MIRROR] Fixes air alarm contaminated mode
|
2017-12-29 06:48:09 -06:00 |
|
LetterJay
|
464edc7699
|
Merge pull request #4585 from Citadel-Station-13/upstream-merge-33896
[MIRROR] Fixes apple/banana/potato juicing
|
2017-12-29 06:30:04 -06:00 |
|
LetterJay
|
b8370a7786
|
Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882
[MIRROR] Spell action buttons finally fixed
|
2017-12-29 06:25:54 -06:00 |
|
LetterJay
|
71a51528c3
|
Merge pull request #4581 from Citadel-Station-13/upstream-merge-33847
[MIRROR] Adds colour shift to timestop
|
2017-12-29 06:25:41 -06:00 |
|
LetterJay
|
9d7dc29efc
|
Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874
[MIRROR] CTF flags are no longer locked to CTF.
|
2017-12-29 06:24:57 -06:00 |
|
LetterJay
|
cbc43aeacf
|
Merge pull request #4576 from Citadel-Station-13/upstream-merge-33875
[MIRROR] Makes default admin websound volume work again.
|
2017-12-29 06:24:42 -06:00 |
|