JJRcop
7c88f10db0
played_url now includes ckey
2017-10-01 19:30:43 -05:00
deathride58
70f06cfe35
config. > CONFIG_GET
2017-10-01 19:56:44 -04:00
deathride58
8e65f4fb23
Merge branch 'master' into crewobjectivesandmiscreants
2017-10-01 23:45:49 +00:00
Daniel0Mclovin
d4321ac0b5
Accidentally put a comma
2017-10-01 17:26:45 -05:00
Daniel0Mclovin
2d835e1d73
Nerfed overall healing
...
dialed down to 0.7
2017-10-01 17:25:20 -05:00
Daniel0Mclovin
d3ae434b56
Changed a few stats
...
Darkness now does oxy damage and slight toxin, added a bit more heat mod, no longer heals toxin damage, oxygen loss healing nerfed. Can eat in the dark to try to combat starvation, added slight toxin damage to make it harder to stay in the dark with a shit ton of food.
2017-10-01 17:20:44 -05:00
LetterJay
64ced3f6f4
Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114
...
[MIRROR] Fixes space vision
2017-10-01 16:56:24 -04:00
oranges
e2dd424fb0
Revert "Prompt for observer confirmation now happens when you click it initially"
2017-10-01 15:50:27 -05:00
LetterJay
353739071f
Update lib_items.dm
2017-10-01 15:46:53 -05:00
LetterJay
0480bebc8b
Merge pull request #3058 from Citadel-Station-13/upstream-merge-31167
...
[MIRROR] Prompt for observer confirmation now happens when you click it initially
2017-10-01 16:38:27 -04:00
LetterJay
77bdebd020
Merge pull request #3053 from Citadel-Station-13/upstream-merge-31155
...
[MIRROR] Fixes station name in cargo stock displays
2017-10-01 16:37:31 -04:00
LetterJay
cef0d9ef68
Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165
...
[MIRROR] fixes delete hotkey triggering messages when the user isn't even a living mob
2017-10-01 16:35:53 -04:00
LetterJay
c8647565fc
Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157
...
[MIRROR] Fixes events with sleeps.
2017-10-01 16:32:00 -04:00
LetterJay
f538d91fe8
Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145
...
[MIRROR] Fixes aliums being able to attack the SM crystal
2017-10-01 16:31:44 -04:00
LetterJay
3d2b5e99c9
Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143
...
[MIRROR] adds a space
2017-10-01 16:29:35 -04:00
LetterJay
2d8e3b301f
Merge pull request #3037 from Citadel-Station-13/upstream-merge-31128
...
[MIRROR] Removes irccheck admin restriction
2017-10-01 16:29:04 -04:00
LetterJay
676abb946c
Update halloween.dm
2017-10-01 15:26:56 -05:00
LetterJay
f1f99fc26c
Update electrical_storm.dm
2017-10-01 15:26:32 -05:00
LetterJay
00aa312610
Update carp_migration.dm
2017-10-01 15:26:15 -05:00
kevinz000
4274a875db
Ashwalker tendrils now drop everything on victims before consuming ( #31177 )
...
* Update ash_walker_den.dm
* Update ash_walker_den.dm
2017-10-01 15:22:26 -05:00
LetterJay
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
oranges
eeeae1b855
Fixes grown runtime spam
2017-10-01 15:20:07 -05:00
oranges
d701230090
Merge pull request #31114 from AnturK/spacevision
...
Fixes space vision
2017-10-01 15:15:54 -05:00
bawhoppen
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
LetterJay
21302e3fdc
Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141
...
[MIRROR] Speeds up simple_animals/hostile/proc/CanAttack()
2017-10-01 15:49:44 -04:00
LetterJay
e3810ef517
Merge branch 'master' into upstream-merge-31128
2017-10-01 15:46:15 -04:00
LetterJay
6ca3deb8d1
Merge branch 'master' into upstream-merge-31129
2017-10-01 15:45:54 -04:00
oranges
c56bb27bbd
Merge pull request #31167 from tgstation/Cyberboss-patch-2
...
Prompt for observer confirmation now happens when you click it initially
2017-10-01 14:43:52 -05:00
LetterJay
fafd98ed0e
Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142
...
[MIRROR] Fixes cogscarab sprites not updating
2017-10-01 15:42:35 -04:00
LetterJay
40f541b9da
Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
...
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
LetterJay
5ec781502c
Merge branch 'master' into upstream-merge-31116
2017-10-01 15:09:10 -04:00
Jordan Brown
3a83b28bae
Adds the Cargo-Tech-of-the-Shift award
2017-10-01 09:43:20 -05:00
vuonojenmustaturska
e79cd3369f
Fixes station name in cargo stock displays ( #31155 )
2017-10-01 09:26:37 -05:00
kevinz000
40bcb74a56
Fixes delete hotkey triggering messages when the user isn't even a living mob ( #31165 )
2017-10-01 09:25:27 -05:00
AnturK
cae3dd615d
Fixes events with sleeps.
2017-10-01 07:34:01 -05:00
ShizCalev
770a0a1154
Fixes aliums being able to attack the SM crystal
2017-10-01 05:04:30 -05:00
LetterJay
80a84db919
Update adminhelp.dm
2017-10-01 02:39:24 -05:00
LetterJay
0ab234ceb0
Merge branch 'master' into upstream-merge-31000
2017-10-01 03:31:49 -04:00
LetterJay
37942a2279
Update hostile.dm
2017-10-01 01:57:49 -05:00
LetterJay
49c63dd794
Update randomverbs.dm
2017-10-01 01:57:03 -05:00
LetterJay
6a8ca2e02c
Merge branch 'master' into upstream-merge-31037
2017-10-01 02:53:03 -04:00
LetterJay
ef96be641a
Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
...
[MIRROR] Adds Nars-Ian and clock hawks
2017-10-01 02:50:31 -04:00
LetterJay
81e40cc5c8
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
...
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
LetterJay
8be007225b
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
...
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
LetterJay
747312cb6d
updates
2017-10-01 00:59:59 -05:00
LetterJay
33b481dffb
Merge pull request #3008 from Citadel-Station-13/upstream-merge-31073
...
[MIRROR] Log attempted injections as well as successful ones
2017-10-01 01:19:20 -04:00
LetterJay
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
Leo
318d28976f
Merge pull request #31143 from praisenarsie/patch-2
...
adds a space
2017-09-30 21:45:47 -05:00
Leo
d845fc7aa8
Removes irccheck admin restriction
2017-09-30 21:34:22 -05:00
ShizCalev
2635689e79
Cleans up some antag/event landmark checks
2017-09-30 21:33:13 -05:00
