Commit Graph
4385 Commits
Author SHA1 Message Date
LetterJayandGitHub d4cdba3297 Update parrot.dm 2017-09-30 14:18:02 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 063a44281e Merge branch 'master' into upstream-merge-31044 2017-09-30 14:53:08 -04:00
LetterJayandGitHub b810f30e10 Update clockwork_slab.dm 2017-09-30 12:48:49 -05:00
LetterJayandGitHub 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 99712e76e9 Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873
[MIRROR] Paper markdown
2017-09-30 12:55:53 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
Raeschen f79ad840b2 Changes MIN_AGE to be in line with server rule 0 2017-09-30 16:30:36 +01:00
AnturKandCitadelStationBot 3ec5a637e5 Fixes dresser being unattackable (#31123) 2017-09-30 10:30:09 -05:00
Jordan BrownandCitadelStationBot 3b64e0ec35 [s] Fixes config reading exploit 2017-09-30 09:45:13 -05:00
nicbnandCitadelStationBot 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
vuonojenmustaturskaandCitadelStationBot 98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
Jordan BrownandCitadelStationBot 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
Tad HardestyandCitadelStationBot 20e7f03910 Strip propriety macros from tooltips (#31113) 2017-09-30 08:03:28 -05:00
orangesandCitadelStationBot 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
LetterJayandGitHub dc2140a88d Update paper.dm 2017-09-30 02:15:40 -05:00
LetterJayandGitHub d7db5f23cb Update humanoid.dm 2017-09-30 02:13:33 -05:00
LetterJayandGitHub ee0c45751b Update simple_animal.dm 2017-09-30 01:45:46 -05:00
LetterJayandGitHub b5cdb64a53 Update extinguisher.dm 2017-09-30 01:44:31 -05:00
LetterJayandGitHub 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
LetterJayandGitHub b728fd6160 Update global_lists.dm 2017-09-30 01:38:27 -05:00
LetterJayandGitHub 8048ce1842 Update humanoid.dm 2017-09-30 01:37:32 -05:00
ShizCalevandCitadelStationBot 7e2873cd46 Corrected shuttle refuel time 2017-09-30 00:59:00 -05:00
LetterJayandGitHub 7b3f91131b Update datum_traitor.dm 2017-09-29 23:45:07 -05:00
LetterJayandGitHub 6cd4e67f36 Update silicon.dm 2017-09-29 23:44:43 -05:00
LetterJayandGitHub 8e1cbb68ca Update assistant.dm 2017-09-29 23:44:23 -05:00
LetterJayandGitHub 9da3470521 Update preferences_savefile.dm 2017-09-29 23:44:08 -05:00
LetterJayandGitHub 03ee5a9303 Update preferences.dm 2017-09-29 23:43:39 -05:00
LetterJayandGitHub 6fe6cfd68e Update ipintel.dm 2017-09-29 23:42:35 -05:00
LetterJayandGitHub be08e0c29f Update mirror.dm 2017-09-29 23:42:12 -05:00
LetterJayandGitHub 7df3c80a39 Update cloning.dm 2017-09-29 23:41:44 -05:00
LetterJayandGitHub e515151610 Update h_sandbox.dm 2017-09-29 23:39:34 -05:00
LetterJayandGitHub 9d40ab978a Update names.dm 2017-09-29 23:38:41 -05:00
LetterJayandGitHub 70d75ffa98 Update global_lists.dm 2017-09-29 23:36:09 -05:00
LetterJayandGitHub eb05246c8b Update giant_spider.dm 2017-09-29 23:33:54 -05:00
ShizCalevandCitadelStationBot f8f599b17b Stops putting RCD, bluespace bags, and staves into ORM 2017-09-29 19:33:37 -05:00
ShizCalevandCitadelStationBot 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
Jordan BrownandCitadelStationBot fdef700001 Fixes AI law weights infinite loop 2017-09-29 17:31:17 -05:00
Jordan BrownandCitadelStationBot cd334646c3 Fixes PA Href Issue 2017-09-29 17:23:59 -05:00
AnturKandCitadelStationBot c37f74035e Fixes evidence bag not respecting inventory 2017-09-29 16:00:30 -05:00