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
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
3d2b5e99c9
Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143
...
[MIRROR] adds a space
2017-10-01 16:29:35 -04:00
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
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
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
e3810ef517
Merge branch 'master' into upstream-merge-31128
2017-10-01 15:46:15 -04:00
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
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
5ec781502c
Merge branch 'master' into upstream-merge-31116
2017-10-01 15:09:10 -04:00
cae3dd615d
Fixes events with sleeps.
2017-10-01 07:34:01 -05:00
770a0a1154
Fixes aliums being able to attack the SM crystal
2017-10-01 05:04:30 -05:00
80a84db919
Update adminhelp.dm
2017-10-01 02:39:24 -05:00
0ab234ceb0
Merge branch 'master' into upstream-merge-31000
2017-10-01 03:31:49 -04:00
37942a2279
Update hostile.dm
2017-10-01 01:57:49 -05:00
49c63dd794
Update randomverbs.dm
2017-10-01 01:57:03 -05:00
6a8ca2e02c
Merge branch 'master' into upstream-merge-31037
2017-10-01 02:53:03 -04:00
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
81e40cc5c8
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
...
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
8be007225b
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
...
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
747312cb6d
updates
2017-10-01 00:59:59 -05:00
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
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
318d28976f
Merge pull request #31143 from praisenarsie/patch-2
...
adds a space
2017-09-30 21:45:47 -05:00
d845fc7aa8
Removes irccheck admin restriction
2017-09-30 21:34:22 -05:00
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
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
e8a1ceffcb
Speeds up simple_animals/hostile/proc/CanAttack()
2017-09-30 19:48:59 -05:00
6411e25110
Fixes liches losing spells
2017-09-30 14:54:02 -05:00
6afd603fe6
Fixes some hardset dna misuse
2017-09-30 14:51:52 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
9f01bf378d
Update hypospray.dm
2017-09-30 14:20:25 -05:00
4fd4d77eb1
Update shade.dm
2017-09-30 14:20:01 -05:00
d4cdba3297
Update parrot.dm
2017-09-30 14:18:02 -05:00
063a44281e
Merge branch 'master' into upstream-merge-31044
2017-09-30 14:53:08 -04:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
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
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
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
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
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
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
99712e76e9
Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873
...
[MIRROR] Paper markdown
2017-09-30 12:55:53 -04:00
6969777c06
Merge pull request #3020 from Citadel-Station-13/upstream-merge-31113
...
[MIRROR] Strip propriety macros from tooltips
2017-09-30 12:55:36 -04:00
3b64e0ec35
[s] Fixes config reading exploit
2017-09-30 09:45:13 -05:00
078128aa91
Paper markdown ( #30873 )
...
* why it doesn't work
* list thing
* oops
* fixes list. maybe
* Less regex
* wip
* Done I think. I think
* return your functions
* Replace $10 by $a
2017-09-30 08:11:01 -05:00
20e7f03910
Strip propriety macros from tooltips ( #31113 )
2017-09-30 08:03:28 -05:00
384332fe20
Small refactor to movement ( #31071 )
...
You can now move an object into nullspace, which will call exited on
it's parent and parent area but will not call any entered.
Note that you cannot pass null into forceMove it will crash, instead use
the new proc that will call the underlying logic with a null destination
Some of the force move procs have been refactored to check that their
parent move succeeded before doing updates
2017-09-30 07:23:35 -05:00
dc2140a88d
Update paper.dm
2017-09-30 02:15:40 -05:00
d7db5f23cb
Update humanoid.dm
2017-09-30 02:13:33 -05:00
LetterJay