4be6f22669
Merge branch 'master' into upstream-merge-31108
2017-10-01 02:53:27 -04:00
b15f639621
Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722
...
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
2017-10-01 02:51:56 -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
1d1a862e1b
Merge pull request #3003 from Citadel-Station-13/upstream-merge-31045
...
[MIRROR] Reebe is fancier now
2017-10-01 02:20:23 -04:00
747312cb6d
updates
2017-10-01 00:59:59 -05:00
0cc54029e2
Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096
...
[MIRROR] Cleans up some unused code
2017-10-01 01:19:36 -04: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
f55c86edfb
Merge branch 'master' into upstream-merge-31045
2017-10-01 01:17:52 -04:00
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
d6ec5791a6
Update dna.dm
2017-09-30 22:35:57 -05:00
aaa2a214cb
[MIRROR] Fixes material container flags precedence ( #3029 )
...
* Fixes material container flags precedence
* Update material_container.dm
2017-09-30 12:39:57 -07:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
99319f5d4d
Update shuttle.dm
2017-09-30 14:23:40 -05:00
dddf85a7df
Update bags.dm
2017-09-30 14:23:03 -05:00
fdb101596d
Update bodybag.dm
2017-09-30 14:22:39 -05:00
6ec50aeae2
Update observer.dm
2017-09-30 14:20:50 -05: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
6d59f3b06f
Update misc_walls.dm
2017-09-30 14:19:40 -05:00
b88081e106
Update misc_floor.dm
2017-09-30 14:19:27 -05:00
a6a4deb94c
Merge pull request #2973 from Citadel-Station-13/upstream-merge-31084
...
[MIRROR] Fixes transitions
2017-09-30 15:18:26 -04:00
d4cdba3297
Update parrot.dm
2017-09-30 14:18:02 -05:00
825f05b3f9
Merge pull request #2962 from Citadel-Station-13/upstream-merge-31032
...
[MIRROR] Fixes doomsday not working with multiz stations
2017-09-30 15:17:14 -04:00
063a44281e
Merge branch 'master' into upstream-merge-31044
2017-09-30 14:53:08 -04:00
b810f30e10
Update clockwork_slab.dm
2017-09-30 12:48:49 -05:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
2bbc880bf1
Merge pull request #3009 from Citadel-Station-13/upstream-merge-31092
...
[MIRROR] Fixes subsystems not returning a qdel hint
2017-09-30 12:58:30 -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
e52d346e7e
Merge pull request #3028 from Raeschen/master
...
Changes MIN_AGE to be in line with server rule 0
2017-09-30 12:56:20 -04:00
73e7fb458c
Merge pull request #3027 from Citadel-Station-13/upstream-merge-31123
...
[MIRROR] Fixes dresser being unattackable
2017-09-30 12:56:13 -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
435865f23d
Merge pull request #3022 from Citadel-Station-13/upstream-merge-31098
...
[MIRROR] RegisterSignal() can now accept a list
2017-09-30 12:55:44 -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
f79ad840b2
Changes MIN_AGE to be in line with server rule 0
2017-09-30 16:30:36 +01:00
3ec5a637e5
Fixes dresser being unattackable ( #31123 )
2017-09-30 10:30:09 -05: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
08ecb0e322
RegisterSignal() can now accept a list ( #31098 )
...
* RegisterSignal may now accept a list of signals
* Update old calls to RegisterSignal()
2017-09-30 08:09:42 -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
b5cdb64a53
Update extinguisher.dm
2017-09-30 01:44:31 -05:00
LetterJay