 LetterJay
|
5486f71010
|
woo
|
2018-01-01 07:30:50 -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
|
7d4a51f659
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463
|
2018-01-01 04:36:29 -06:00 |
|
|
LetterJayandGitHub
|
515092bd1c
|
Merge branch 'master' into upstream-merge-33919
|
2018-01-01 04:11:29 -06:00 |
|
|
LetterJayandGitHub
|
07adb3fdd6
|
Update teleporter.dm
|
2018-01-01 04:06:33 -06:00 |
|
|
LetterJayandGitHub
|
4899131230
|
Update teleporter.dm
|
2018-01-01 04:06:14 -06:00 |
|
|
LetterJayandGitHub
|
3a8f27a2bf
|
Merge pull request #4623 from Citadel-Station-13/upstream-merge-33960
[MIRROR] Corrects flamethrower capitalization
|
2017-12-31 15:23:14 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
54032f9c6d
|
Merge pull request #33960 from ShizCalev/flamer
Corrects flamethrower capitalization
|
2017-12-31 10:02:59 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
4e0efc64d5
|
Merge pull request #33957 from ninjanomnom/helper-cleanup
cleans up some behaviour for PlaceOnTop/Bottom
|
2017-12-31 10:01:46 -06:00 |
|
|
LetterJayandGitHub
|
7a6cf002d3
|
Revert "[MIRROR] Fix PDA message photos not being viewable"
|
2017-12-31 06:41:03 -06:00 |
|
|
LetterJayandGitHub
|
d8e85b5f15
|
Merge pull request #4613 from Citadel-Station-13/upstream-merge-33945
[MIRROR] Improves loot drop spawners, adds AI law spawners to cores
|
2017-12-31 02:52:44 -06:00 |
|
|
LetterJayandGitHub
|
88df151bd7
|
Merge pull request #4612 from Citadel-Station-13/upstream-merge-33947
[MIRROR] Last resort now requires a confirmation.
|
2017-12-31 02:52:29 -06:00 |
|
|
LetterJayandGitHub
|
515c4a0472
|
Merge pull request #4611 from Citadel-Station-13/upstream-merge-33940
[MIRROR] Fix PDA message photos not being viewable
|
2017-12-31 02:52:03 -06:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
LetterJayandGitHub
|
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 |
|
|
vuonojenmustaturskaandCitadelStationBot
|
9dd9d9413a
|
Improves loot drop spawners, adds AI law spawners to cores (#33945)
* hymn to breaking strain
* remove subtypes as requested
* no-one saw that
|
2017-12-31 02:27:12 -06:00 |
|
|
F-OSandCitadelStationBot
|
9c8959f2ff
|
Last resort now requires a confirmation. (#33947)
* Update headcrab.dm
* fixed
* fuck
* Update headcrab.dm
* Update headcrab.dm
|
2017-12-31 02:24:53 -06:00 |
|
|
Tad HardestyandCitadelStationBot
|
38870f4056
|
Fix PDA message photos not being viewable
|
2017-12-30 21:27:31 -06:00 |
|
|
orangesandCitadelStationBot
|
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 |
|
|
LetterJayandGitHub
|
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 BrownandCitadelStationBot
|
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 BrownandCitadelStationBot
|
75f492f416
|
Always use the area name when selecting a teleport beacon
|
2017-12-30 13:55:17 -06:00 |
|
|
LetterJayandGitHub
|
7c69a835be
|
Update teleporter.dm
|
2017-12-30 13:32:29 -06:00 |
|
|
LetterJayandGitHub
|
47174097e1
|
Update communications.dm
|
2017-12-30 13:32:19 -06:00 |
|
|
LetterJayandGitHub
|
a160997587
|
Update talisman.dm
|
2017-12-30 13:32:02 -06:00 |
|
|
LetterJayandGitHub
|
a8d6fa7fd7
|
Update runes.dm
|
2017-12-30 13:31:51 -06:00 |
|
|
LetterJayandGitHub
|
6c59d4134a
|
Update ritual.dm
|
2017-12-30 13:31:24 -06:00 |
|
|
LetterJayandGitHub
|
f0214dd06d
|
Update overmind.dm
|
2017-12-30 13:31:13 -06:00 |
|
|
LetterJayandGitHub
|
dae3c3efb5
|
Merge branch 'master' into upstream-merge-33621
|
2017-12-30 13:23:39 -06:00 |
|
|
LetterJayandGitHub
|
8452cc74d0
|
Update newscaster.dm
|
2017-12-30 13:21:31 -06:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
Jordan BrownandCitadelStationBot
|
cbb8d807f1
|
turfs changed to /space/basic are instead turned into /space
|
2017-12-30 13:14:04 -06:00 |
|
|
LetterJayandGitHub
|
f860fa0cd3
|
Update closed.dm
|
2017-12-30 05:12:10 -06:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
LetterJayandGitHub
|
4599680f68
|
Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
[MIRROR] Internal radio implant
|
2017-12-30 05:03:48 -06:00 |
|
|
LetterJayandGitHub
|
2d9a70a487
|
Update uplink_kits.dm
|
2017-12-29 18:42:44 -06:00 |
|
|
LetterJayandGitHub
|
a3ebaa5de8
|
Merge branch 'master' into upstream-merge-32311
|
2017-12-29 18:38:50 -06:00 |
|
|
Tad HardestyandCitadelStationBot
|
0418ee4df6
|
Replace explicit z-level checks with defines
|
2017-12-29 13:41:10 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
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 |
|
|
LetterJayandGitHub
|
a56882556b
|
Update _eminence.dm
|
2017-12-29 07:36:03 -06:00 |
|
|
LetterJayandGitHub
|
a64a1e4a5c
|
Merge branch 'master' into upstream-merge-33783
|
2017-12-29 06:49:47 -06:00 |
|
|
LetterJayandGitHub
|
e17f9fdc07
|
Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895
[MIRROR] Corrects abductor uncuffing message
|
2017-12-29 06:47:56 -06:00 |
|
|
LetterJayandGitHub
|
80ce187d3d
|
Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
|
2017-12-29 06:26:06 -06:00 |
|
|
LetterJayandGitHub
|
0f328e22b2
|
Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
|
2017-12-29 06:24:09 -06:00 |
|
|
LetterJayandGitHub
|
b13d4dd721
|
Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807
[MIRROR] Made atoms not smooth with shuttles
|
2017-12-29 06:23:12 -06:00 |
|
|
LetterJayandGitHub
|
f093bb8fec
|
Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
|
2017-12-29 06:22:35 -06:00 |
|
|
LetterJayandGitHub
|
bbaee9f3d7
|
Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880
[MIRROR] Fixes wall CanPass
|
2017-12-29 06:22:13 -06:00 |
|
|
LetterJay
|
c7db4e8310
|
also syncs a bunch of shit
|
2017-12-29 04:12:43 -06:00 |
|
|
XDTMandCitadelStationBot
|
6eabea6a71
|
Corrects abductor uncuffing message (#33895)
* Corrects abductor uncuffing message
* breaks
|
2017-12-29 02:56:30 -06:00 |
|
|
MoreRobustThanYouandCitadelStationBot
|
07ba4e8189
|
The Radiance (eminence after ratvar awakens) can now ignore chapel tiles (#33873)
|
2017-12-29 02:55:03 -06:00 |
|