kevinz000
b13f2012fb
Update closed.dm
2017-10-01 08:42:26 -05:00
LetterJay
926db45b54
Update world.dm
2017-10-01 03:06:11 -05:00
LetterJay
0ab234ceb0
Merge branch 'master' into upstream-merge-31000
2017-10-01 03:31:49 -04:00
LetterJay
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
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
747312cb6d
updates
2017-10-01 00:59:59 -05:00
LetterJay
f55c86edfb
Merge branch 'master' into upstream-merge-31045
2017-10-01 01:17:52 -04:00
LetterJay
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
LetterJay
dddf85a7df
Update bags.dm
2017-09-30 14:23:03 -05:00
LetterJay
fdb101596d
Update bodybag.dm
2017-09-30 14:22:39 -05:00
LetterJay
6d59f3b06f
Update misc_walls.dm
2017-09-30 14:19:40 -05:00
LetterJay
b88081e106
Update misc_floor.dm
2017-09-30 14:19:27 -05:00
LetterJay
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
LetterJay
063a44281e
Merge branch 'master' into upstream-merge-31044
2017-09-30 14:53:08 -04:00
LetterJay
b810f30e10
Update clockwork_slab.dm
2017-09-30 12:48:49 -05: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
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
LetterJay
99712e76e9
Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873
...
[MIRROR] Paper markdown
2017-09-30 12:55:53 -04:00
AnturK
3ec5a637e5
Fixes dresser being unattackable ( #31123 )
2017-09-30 10:30:09 -05:00
nicbn
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
oranges
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
LetterJay
b5cdb64a53
Update extinguisher.dm
2017-09-30 01:44:31 -05:00
LetterJay
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
LetterJay
be08e0c29f
Update mirror.dm
2017-09-29 23:42:12 -05:00
LetterJay
7df3c80a39
Update cloning.dm
2017-09-29 23:41:44 -05:00
LetterJay
e515151610
Update h_sandbox.dm
2017-09-29 23:39:34 -05:00
ShizCalev
f8f599b17b
Stops putting RCD, bluespace bags, and staves into ORM
2017-09-29 19:33:37 -05:00
ShizCalev
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
LetterJay
e8f581bb56
Merge branch 'master' into upstream-merge-31077
2017-09-29 12:46:25 -04:00
LetterJay
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
LetterJay
7f2d8bdaff
Update Malf_Modules.dm
2017-09-29 11:18:58 -05:00
LetterJay
c80237c969
Update tank_types.dm
2017-09-29 00:48:53 -05:00
LetterJay
2d1d0b7fd8
Update tank_types.dm
2017-09-29 00:48:01 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
1715845fe1
Merge pull request #2990 from Citadel-Station-13/upstream-merge-31081
...
[MIRROR] You can now light cigars on burning people
2017-09-29 01:43:59 -04:00
LetterJay
80e92ebdc5
Merge pull request #2987 from Citadel-Station-13/upstream-merge-30858
...
[MIRROR] [READY]Refactors timestops to use fields
2017-09-29 01:42:56 -04:00
LetterJay
c8a03440cb
Merge pull request #2978 from Citadel-Station-13/upstream-merge-30834
...
[MIRROR] Self replacement fix
2017-09-29 01:42:17 -04:00
LetterJay
8f5d02be55
Merge pull request #2977 from Citadel-Station-13/upstream-merge-31027
...
[MIRROR] GetAllContents performance increase
2017-09-29 01:41:58 -04:00
LetterJay
cef4ae4fd6
Merge pull request #2975 from Citadel-Station-13/upstream-merge-30661
...
[MIRROR] Advanced camera consoles use a list for z lock rather than a single z level
2017-09-29 01:41:32 -04:00
LetterJay
02a5c92233
Merge pull request #2974 from Citadel-Station-13/upstream-merge-31046
...
[MIRROR] AFK players count as dead for the assassinate objective
2017-09-29 01:41:16 -04:00
LetterJay
595f2cb08f
Merge pull request #2983 from Citadel-Station-13/upstream-merge-30985
...
[MIRROR] Fixes frozen PDAs in the game logs
2017-09-29 01:39:50 -04:00
LetterJay
4af02dff06
Merge pull request #2984 from Citadel-Station-13/upstream-merge-30613
...
[MIRROR] Applying PDA overhaul Upstream
2017-09-29 01:39:28 -04:00
LetterJay
157d9cc6e6
Merge pull request #2982 from Citadel-Station-13/upstream-merge-30864
...
[MIRROR] Secure containers give more hints, no RNG, for hacking
2017-09-29 01:39:03 -04:00
Jordan Brown
116041d621
Server tools API v3.1
2017-09-28 22:20:46 -05:00
ShizCalev
9da41c3596
Stops revheads from being metagamed with healthscanners & medical HUDs. ( #31110 )
...
* Stops revheads metagaming
* Added comment.
2017-09-28 22:00:16 -05:00
