kevinz000
|
ecd0723fd4
|
Merge pull request #811 from Citadel-Station-13/upstream-merge-26985
[MIRROR] Fixes really long Ratvar shuttle calls
|
2017-05-06 14:19:02 -07:00 |
|
kevinz000
|
d4057bf862
|
Merge pull request #731 from Citadel-Station-13/upstream-merge-26814
[MIRROR] Clockwork component generation is twice as fast, but scriptures cost up to twice as much
|
2017-05-06 14:18:45 -07:00 |
|
kevinz000
|
638250993c
|
Merge pull request #770 from Citadel-Station-13/upstream-merge-26873
[MIRROR] Fixes grammar error on spawner grenades
|
2017-05-06 14:11:18 -07:00 |
|
kevinz000
|
760ab46274
|
Merge pull request #783 from Citadel-Station-13/upstream-merge-26896
[MIRROR] Fixes answering a holocall not disconnecting other calls
|
2017-05-06 14:10:58 -07:00 |
|
kevinz000
|
b6231af063
|
Merge pull request #682 from Citadel-Station-13/upstream-merge-26731
[MIRROR] Buffs mercury and lithium [Travis error unrelated to PR]
|
2017-05-06 14:08:51 -07:00 |
|
kevinz000
|
cc8d113c0f
|
Merge branch 'master' into upstream-merge-26928
|
2017-05-06 14:05:16 -07:00 |
|
kevinz000
|
3e1a1588b5
|
Merge pull request #805 from Citadel-Station-13/upstream-merge-26927
[MIRROR] Replaces stun/weaken from Miner's salve
|
2017-05-06 14:04:56 -07:00 |
|
kevinz000
|
bf5a9a5037
|
Update mob.dm
|
2017-05-06 14:04:17 -07:00 |
|
kevinz000
|
d3d335d835
|
Update mob.dm
|
2017-05-06 14:03:52 -07:00 |
|
kevinz000
|
8af1d05cc4
|
Delete mob.dm.rej
|
2017-05-06 14:02:42 -07:00 |
|
kevinz000
|
5aff0de6dd
|
Merge pull request #737 from Citadel-Station-13/upstream-merge-26811
[MIRROR] adds a safety catch to spin()
|
2017-05-06 14:02:14 -07:00 |
|
kevinz000
|
d1a8f643d6
|
Merge pull request #738 from Citadel-Station-13/upstream-merge-26774
[MIRROR] Fixes alien eggs
|
2017-05-06 13:59:33 -07:00 |
|
kevinz000
|
28f6096503
|
Merge pull request #788 from Citadel-Station-13/upstream-merge-26911
[MIRROR] Improves vending machine user feedback
|
2017-05-06 13:59:05 -07:00 |
|
kevinz000
|
ec8a5f713b
|
Merge pull request #782 from Citadel-Station-13/upstream-merge-26895
[MIRROR] Sigils of Transgression are slightly more visible and glow very faintly
|
2017-05-06 13:58:28 -07:00 |
|
CitadelStationBot
|
e9ff2203cf
|
Fixes really long Ratvar shuttle calls
|
2017-05-06 15:13:33 -05:00 |
|
kevinz000
|
6f90d11a38
|
Merge pull request #787 from Citadel-Station-13/upstream-merge-26913
[MIRROR] Players may no longer commite suicide
|
2017-05-06 12:21:57 -07:00 |
|
kevinz000
|
b440ba70b0
|
Delete suicide.dm.rej
|
2017-05-06 11:49:26 -07:00 |
|
kevinz000
|
c5f7644452
|
Update suicide.dm
|
2017-05-06 11:48:24 -07:00 |
|
kevinz000
|
6a855bcee3
|
Merge pull request #804 from Citadel-Station-13/upstream-merge-26929
[MIRROR] Fixes HTTPSGet being unprotected
|
2017-05-06 11:43:19 -07:00 |
|
kevinz000
|
3f67f8bf24
|
Merge pull request #747 from Citadel-Station-13/upstream-merge-26798
[MIRROR] Adds examining mouths with flashlights
|
2017-05-06 11:41:36 -07:00 |
|
kevinz000
|
62b8f929bb
|
Merge pull request #746 from Citadel-Station-13/upstream-merge-26794
[MIRROR] Turrets no longer target invisible creatures
|
2017-05-06 11:39:01 -07:00 |
|
kevinz000
|
332733f90a
|
Merge pull request #745 from Citadel-Station-13/upstream-merge-26784
[MIRROR] Revenant now goes into stasis until ectoplasm is destroyed [FINISHED]
|
2017-05-06 11:35:29 -07:00 |
|
CitadelStationBot
|
10846d5d37
|
Replaces stun/weaken from Miner's salve
|
2017-05-06 10:48:07 -05:00 |
|
CitadelStationBot
|
310f23db5c
|
Fixes HTTPSGet being unprotected
|
2017-05-06 10:46:00 -05:00 |
|
LetterJay
|
32651c31cb
|
Merge pull request #743 from Citadel-Station-13/upstream-merge-26806
[MIRROR] Hopefully makes flightsuit processing less taxing on the server
|
2017-05-06 10:26:16 -05:00 |
|
CitadelStationBot
|
0fb29b2650
|
Improves vending machine user feedback
|
2017-05-05 18:10:01 -05:00 |
|
CitadelStationBot
|
7288549dec
|
Players may no longer commite suicide
|
2017-05-05 18:08:56 -05:00 |
|
LetterJay
|
bd90067ed1
|
Merge pull request #781 from Citadel-Station-13/upstream-merge-26899
[MIRROR] Tesla light
|
2017-05-05 15:37:20 -05:00 |
|
LetterJay
|
c489186c3f
|
message code
|
2017-05-05 10:38:03 -05:00 |
|
CitadelStationBot
|
684c4a5244
|
Fixes answering a holocall not disconnecting other calls
|
2017-05-05 10:28:26 -05:00 |
|
CitadelStationBot
|
426430369e
|
Sigils of Transgression are slightly more visible and glow very faintly
|
2017-05-05 10:28:22 -05:00 |
|
CitadelStationBot
|
55c71ff5a9
|
Tesla light
|
2017-05-05 10:27:18 -05:00 |
|
LetterJay
|
acf8cb1597
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876
|
2017-05-05 10:26:02 -05:00 |
|
LetterJay
|
1bb43eb7ae
|
woo
|
2017-05-05 10:21:53 -05:00 |
|
LetterJay
|
d0e6790993
|
Merge pull request #761 from kevinz000/patch-3
Switches off flightsuit processing because lag
|
2017-05-05 10:20:39 -05:00 |
|
LetterJay
|
811c74b45d
|
Merge pull request #701 from Citadel-Station-13/upstream-merge-26477
[MIRROR] Subsystem change for the SM and TEG and slight QoL
|
2017-05-05 10:20:11 -05:00 |
|
LetterJay
|
caaf0fc2ee
|
Merge pull request #698 from Citadel-Station-13/upstream-merge-25743
[MIRROR] Holocalls
|
2017-05-05 10:19:28 -05:00 |
|
LetterJay
|
bbf43a464a
|
yey
|
2017-05-05 10:00:17 -05:00 |
|
LetterJay
|
20f3280c96
|
this one time i ate boiled peanuts
|
2017-05-05 09:52:47 -05:00 |
|
LetterJay
|
f7572e62cf
|
Merge pull request #769 from Citadel-Station-13/upstream-merge-26860
[MIRROR] Removes changeling genetic damage
|
2017-05-05 09:46:23 -05:00 |
|
LetterJay
|
590aaf4cc2
|
Merge pull request #773 from Citadel-Station-13/upstream-merge-26807
[MIRROR] Mobs that are faking death won't bleed.
|
2017-05-05 09:44:36 -05:00 |
|
LetterJay
|
c38d507791
|
Merge pull request #779 from Citadel-Station-13/upstream-merge-26880
[MIRROR] Only one successful Gang Tool recall per gang
|
2017-05-05 09:44:16 -05:00 |
|
LetterJay
|
f6f56a8b8f
|
Merge pull request #728 from Citadel-Station-13/upstream-merge-26823
[MIRROR] Ports pastries to Initialize
|
2017-05-05 09:43:17 -05:00 |
|
LetterJay
|
5d0f7eafaa
|
Merge pull request #719 from Citadel-Station-13/upstream-merge-26771
[MIRROR] Removes vestigial list from minds.
|
2017-05-05 09:40:28 -05:00 |
|
LetterJay
|
2f44824951
|
Merge pull request #717 from Citadel-Station-13/upstream-merge-26767
[MIRROR] The alien hivemind uses a mob's real_name
|
2017-05-05 09:40:08 -05:00 |
|
LetterJay
|
cd1d049c18
|
Merge pull request #714 from Citadel-Station-13/upstream-merge-26707
[MIRROR] Makes the cult Talisman of Horrors ranged
|
2017-05-05 09:39:54 -05:00 |
|
LetterJay
|
1198a3cbb4
|
Merge pull request #708 from Citadel-Station-13/upstream-merge-26752
[MIRROR] Plants now react with turfs on squash()
|
2017-05-05 09:39:17 -05:00 |
|
LetterJay
|
da4e4bbefe
|
Merge pull request #707 from Citadel-Station-13/upstream-merge-26746
[MIRROR] Makes admin sound announcement use the right span
|
2017-05-05 09:39:04 -05:00 |
|
LetterJay
|
91f3059be1
|
Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
[MIRROR] Moves tips from config to strings tree
|
2017-05-05 09:33:45 -05:00 |
|
CitadelStationBot
|
933a8646ba
|
Only one successful Gang Tool recall per gang
|
2017-05-05 06:05:05 -05:00 |
|