Commit Graph

9021 Commits

Author SHA1 Message Date
vuonojenmustaturska e8a1ceffcb Speeds up simple_animals/hostile/proc/CanAttack() 2017-09-30 19:48:59 -05:00
AnturK 6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -05:00
AnturK 6afd603fe6 Fixes some hardset dna misuse 2017-09-30 14:51:52 -05:00
CitadelStationBot 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
LetterJay 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay 9e48311632 Update cloning.dm 2017-09-30 14:27:04 -05:00
LetterJay 07c95ef168 Update aifixer.dm 2017-09-30 14:26:41 -05:00
LetterJay cc9e462988 Update camera_assembly.dm 2017-09-30 14:26:22 -05:00
LetterJay 410ca14e17 Update h_sandbox.dm 2017-09-30 14:25:58 -05:00
LetterJay 7193e9da83 Update wires.dm 2017-09-30 14:25:29 -05:00
LetterJay cae6983aea Update wizarditis.dm 2017-09-30 14:25:05 -05:00
LetterJay 99319f5d4d Update shuttle.dm 2017-09-30 14:23:40 -05: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 6c4934a34a Update ai_laws.dm 2017-09-30 14:22:12 -05:00
LetterJay 6ec50aeae2 Update observer.dm 2017-09-30 14:20:50 -05:00
LetterJay 9f01bf378d Update hypospray.dm 2017-09-30 14:20:25 -05:00
LetterJay 4fd4d77eb1 Update shade.dm 2017-09-30 14:20:01 -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 a6a4deb94c Merge pull request #2973 from Citadel-Station-13/upstream-merge-31084
[MIRROR] Fixes transitions
2017-09-30 15:18:26 -04:00
LetterJay d4cdba3297 Update parrot.dm 2017-09-30 14:18:02 -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 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
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
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
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
Raeschen f79ad840b2 Changes MIN_AGE to be in line with server rule 0 2017-09-30 16:30:36 +01: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
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
vuonojenmustaturska 98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -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
Tad Hardesty 20e7f03910 Strip propriety macros from tooltips (#31113) 2017-09-30 08:03:28 -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 d7db5f23cb Update humanoid.dm 2017-09-30 02:13:33 -05:00
LetterJay ee0c45751b Update simple_animal.dm 2017-09-30 01:45:46 -05:00
LetterJay b5cdb64a53 Update extinguisher.dm 2017-09-30 01:44:31 -05:00