Commit Graph

5836 Commits

Author SHA1 Message Date
LetterJay
063a44281e Merge branch 'master' into upstream-merge-31044 2017-09-30 14:53:08 -04:00
CitadelStationBot
38c7e2e958 Automatic changelog generation for PR #2950 [ci skip] 2017-09-30 13:52:10 -05:00
LetterJay
910f74dd5f Merge pull request #2950 from Citadel-Station-13/upstream-merge-29741
[MIRROR] (Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-30 14:52:07 -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
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
CitadelStationBot
1a6cce145f Automatic changelog generation for PR #2996 [ci skip] 2017-09-30 11:57:54 -05: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
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
LetterJay
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
LetterJay
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
CitadelStationBot
d6b3c59eb3 Automatic changelog generation for PR #3028 [ci skip] 2017-09-30 11:56:22 -05:00
LetterJay
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
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
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
CitadelStationBot
3b9e2be106 Automatic changelog generation for PR #3024 [ci skip] 2017-09-30 11:55:56 -05: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
LetterJay
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
LetterJay
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
LetterJay
4d87b63621 Merge pull request #3019 from Citadel-Station-13/upstream-merge-31071
[MIRROR] Small refactor to movement
2017-09-30 12:55:24 -04:00
Raeschen
f79ad840b2 Changes MIN_AGE to be in line with server rule 0 2017-09-30 16:30:36 +01:00
CitadelStationBot
7afdb1067f Fixes dresser being unattackable 2017-09-30 10:30:09 -05:00
AnturK
3ec5a637e5 Fixes dresser being unattackable (#31123) 2017-09-30 10:30:09 -05:00
Jordan Brown
3b64e0ec35 [s] Fixes config reading exploit 2017-09-30 09:45:13 -05:00
CitadelStationBot
8c794da2de Paper markdown 2017-09-30 08:11:01 -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
CitadelStationBot
eb6f058e52 RegisterSignal() can now accept a list 2017-09-30 08:09:42 -05:00
Jordan Brown
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
CitadelStationBot
84c3161899 Strip propriety macros from tooltips 2017-09-30 08:03:28 -05:00
Tad Hardesty
20e7f03910 Strip propriety macros from tooltips (#31113) 2017-09-30 08:03:28 -05:00
CitadelStationBot
dc2aca9351 Small refactor to movement 2017-09-30 07:23:35 -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
dc2140a88d Update paper.dm 2017-09-30 02:15:40 -05:00
LetterJay
b5cdb64a53 Update extinguisher.dm 2017-09-30 01:44:31 -05:00
CitadelStationBot
fceb289072 Automatic changelog generation for PR #2979 [ci skip] 2017-09-30 01:41:41 -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
69744eae23 Merge pull request #2976 from Citadel-Station-13/upstream-merge-31077
[MIRROR] Back and inhands for air tanks.
2017-09-30 02:41:21 -04:00
LetterJay
eb05246c8b Update giant_spider.dm 2017-09-29 23:33:54 -05:00
CitadelStationBot
9f483cf8d5 Fixes SM shard extraction 2017-09-29 18:43:41 -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
CitadelStationBot
e77dc56c06 Fixes PA Href Issue 2017-09-29 17:23:59 -05:00
Jordan Brown
cd334646c3 Fixes PA Href Issue 2017-09-29 17:23:59 -05:00
CitadelStationBot
a709765ecd Fixes evidence bag not respecting inventory 2017-09-29 16:00:30 -05:00
AnturK
c37f74035e Fixes evidence bag not respecting inventory 2017-09-29 16:00:30 -05:00
CitadelStationBot
9790a19fe9 Removes a call to datum/New() 2017-09-29 15:59:19 -05:00
Jordan Brown
77c2c77f0e Removes a call to datum/New() 2017-09-29 15:59:19 -05:00
CitadelStationBot
46eae783f4 Fixes subsystems not returning a qdel hint 2017-09-29 15:59:04 -05:00
Jordan Brown
da29f2c8d4 Fixes subsystems not returning a qdel hint 2017-09-29 15:59:04 -05:00
LetterJay
e8f581bb56 Merge branch 'master' into upstream-merge-31077 2017-09-29 12:46:25 -04:00