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
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
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
ee0c45751b
Update simple_animal.dm
2017-09-30 01:45:46 -05:00
e63f93979f
Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572
...
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-30 02:41:38 -04:00
8048ce1842
Update humanoid.dm
2017-09-30 01:37:32 -05:00
6cd4e67f36
Update silicon.dm
2017-09-29 23:44:43 -05:00
8e1cbb68ca
Update assistant.dm
2017-09-29 23:44:23 -05:00
9da3470521
Update preferences_savefile.dm
2017-09-29 23:44:08 -05:00
03ee5a9303
Update preferences.dm
2017-09-29 23:43:39 -05:00
6fe6cfd68e
Update ipintel.dm
2017-09-29 23:42:35 -05:00
eb05246c8b
Update giant_spider.dm
2017-09-29 23:33:54 -05:00
f8f599b17b
Stops putting RCD, bluespace bags, and staves into ORM
2017-09-29 19:33:37 -05:00
c54ea1b9bf
Fixes SM shard extraction ( #31111 )
...
* Fixes SM shard extraction
* Space-OSHA called. They want to have a word.
2017-09-29 18:43:41 -05:00
cd334646c3
Fixes PA Href Issue
2017-09-29 17:23:59 -05:00
c37f74035e
Fixes evidence bag not respecting inventory
2017-09-29 16:00:30 -05:00
77c2c77f0e
Removes a call to datum/New()
2017-09-29 15:59:19 -05:00
a4992bae90
Log attempted injections as well as successful ones
2017-09-29 15:57:50 -05:00
2858c53788
Merge pull request #2958 from Michiyamenotehifunana/wave3guns
...
Wave 3 of guns
2017-09-29 12:45:52 -04:00
7263926251
Merge pull request #2961 from Citadel-Station-13/upstream-merge-31038
...
[MIRROR] DisplayTimeText for setup time on login
2017-09-29 12:18:25 -04:00
ba189c041b
Fixes shade attackby
2017-09-29 04:30:50 -05:00
ee0d1f15f8
Merge pull request #3001 from Citadel-Station-13/upstream-merge-31064
...
[MIRROR] Silver slime extracts create proper fried foods
2017-09-29 01:46:40 -04:00
c2f6c7dbf8
Merge pull request #2998 from Citadel-Station-13/upstream-merge-31063
...
[MIRROR] Profile access is granted when holder is created
2017-09-29 01:46:05 -04:00
ShizCalev