oranges
|
e2dd424fb0
|
Revert "Prompt for observer confirmation now happens when you click it initially"
|
2017-10-01 15:50:27 -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
|
e572d2e529
|
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
[MIRROR] Structure istype define
|
2017-10-01 16:20:56 -04: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 |
|
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 |
|
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 |
|
Leo
|
fd7c9110ca
|
Structure istype define
|
2017-09-30 21:31:57 -05:00 |
|
MoreRobustThanYou
|
e63e05255f
|
Fixes cogscarab sprites not updating (#31142)
* Fixes cogscarab sprites now updating
* fix spacing
* Update extra_drone_types.dm
|
2017-09-30 21:30:48 -05:00 |
|
vuonojenmustaturska
|
e8a1ceffcb
|
Speeds up simple_animals/hostile/proc/CanAttack()
|
2017-09-30 19:48:59 -05:00 |
|
AnturK
|
6411e25110
|
Fixes liches losing spells
|
2017-09-30 14:54:02 -05:00 |
|
AnturK
|
6afd603fe6
|
Fixes some hardset dna misuse
|
2017-09-30 14:51:52 -05:00 |
|
LetterJay
|
04d071deda
|
Merge branch 'master' into upstream-merge-30763
|
2017-09-30 15:30:46 -04:00 |
|
LetterJay
|
9f01bf378d
|
Update hypospray.dm
|
2017-09-30 14:20:25 -05:00 |
|
LetterJay
|
4fd4d77eb1
|
Update shade.dm
|
2017-09-30 14:20:01 -05:00 |
|
LetterJay
|
d4cdba3297
|
Update parrot.dm
|
2017-09-30 14:18:02 -05:00 |
|
LetterJay
|
063a44281e
|
Merge branch 'master' into upstream-merge-31044
|
2017-09-30 14:53:08 -04:00 |
|
LetterJay
|
47a65d829d
|
Merge branch 'master' into upstream-merge-29741
|
2017-09-30 13:35:47 -04:00 |
|
LetterJay
|
f1858a3a63
|
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
[MIRROR] Alt-clicking descriptions when examining
|
2017-09-30 12:57:52 -04:00 |
|
LetterJay
|
10b530920b
|
Merge pull request #3015 from Citadel-Station-13/upstream-merge-31111
[MIRROR] Fixes SM shard extraction
|
2017-09-30 12:57:33 -04:00 |
|
LetterJay
|
2847d71e07
|
Merge pull request #3013 from Citadel-Station-13/upstream-merge-31089
[MIRROR] Fixes PA Href Issue
|
2017-09-30 12:57:21 -04:00 |
|
LetterJay
|
d45a29eca2
|
Merge pull request #3012 from Citadel-Station-13/upstream-merge-31099
[MIRROR] Fixes evidence bag not respecting inventory
|
2017-09-30 12:57:10 -04:00 |
|
LetterJay
|
02e4ce7cf5
|
Merge pull request #3011 from Citadel-Station-13/upstream-merge-31087
[MIRROR] Removes a call to datum/New()
|
2017-09-30 12:57:00 -04:00 |
|
LetterJay
|
77db385078
|
Merge pull request #3026 from Citadel-Station-13/upstream-merge-31158
[MIRROR] [s] Fixes config reading exploit
|
2017-09-30 12:56:04 -04:00 |
|
LetterJay
|
99712e76e9
|
Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873
[MIRROR] Paper markdown
|
2017-09-30 12:55:53 -04:00 |
|