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
4e80c2574a
Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069
...
[MIRROR] Cleanup to various loc assignments and nearby code
2017-10-01 15:08:21 -04:00
490885a36f
update
2017-10-01 13:02:52 -05:00
926db45b54
Update world.dm
2017-10-01 03:06:11 -05:00
0ab234ceb0
Merge branch 'master' into upstream-merge-31000
2017-10-01 03:31:49 -04:00
f621fb704b
Merge branch 'master' into upstream-merge-31069
2017-10-01 02:56:28 -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
81e40cc5c8
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
...
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
747312cb6d
updates
2017-10-01 00:59:59 -05: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
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
9e48311632
Update cloning.dm
2017-09-30 14:27:04 -05:00
07c95ef168
Update aifixer.dm
2017-09-30 14:26:41 -05:00
cc9e462988
Update camera_assembly.dm
2017-09-30 14:26:22 -05:00
410ca14e17
Update h_sandbox.dm
2017-09-30 14:25:58 -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
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
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
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
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
99712e76e9
Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873
...
[MIRROR] Paper markdown
2017-09-30 12:55:53 -04:00
3ec5a637e5
Fixes dresser being unattackable ( #31123 )
2017-09-30 10:30:09 -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
98d6927eb6
Cleanup to various loc assignments and nearby code
2017-09-30 08:10:52 -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
b5cdb64a53
Update extinguisher.dm
2017-09-30 01:44:31 -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
be08e0c29f
Update mirror.dm
2017-09-29 23:42:12 -05:00
7df3c80a39
Update cloning.dm
2017-09-29 23:41:44 -05:00
e515151610
Update h_sandbox.dm
2017-09-29 23:39:34 -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
e8f581bb56
Merge branch 'master' into upstream-merge-31077
2017-09-29 12:46:25 -04:00
a12df2019f
Merge pull request #2966 from Citadel-Station-13/upstream-merge-31024
...
[MIRROR] Air tanks get their own sprite, plus reset fix.
2017-09-29 12:19:27 -04:00
7f2d8bdaff
Update Malf_Modules.dm
2017-09-29 11:18:58 -05:00
c80237c969
Update tank_types.dm
2017-09-29 00:48:53 -05:00
2d1d0b7fd8
Update tank_types.dm
2017-09-29 00:48:01 -05:00
8762540452
Merge pull request #2999 from Citadel-Station-13/upstream-merge-31072
...
[MIRROR] Add a fingerprint to pipes when interacted with by a wrench
2017-09-29 01:46:14 -04:00
781b0359ae
Merge pull request #2993 from Citadel-Station-13/upstream-merge-30714
...
[MIRROR] Shooting walls can create bullet holes/dents
2017-09-29 01:44:54 -04:00
d6a89948a2
Merge pull request #2991 from Citadel-Station-13/upstream-merge-31078
...
[MIRROR] Cleanup operative landmarks
2017-09-29 01:44:17 -04:00
LetterJay