LetterJay
6a8ca2e02c
Merge branch 'master' into upstream-merge-31037
2017-10-01 02:53:03 -04:00
LetterJay
ef96be641a
Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
...
[MIRROR] Adds Nars-Ian and clock hawks
2017-10-01 02:50:31 -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
8be007225b
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
...
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
LetterJay
747312cb6d
updates
2017-10-01 00:59:59 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
LetterJay
4fd4d77eb1
Update shade.dm
2017-09-30 14:20:01 -05:00
LetterJay
d4cdba3297
Update parrot.dm
2017-09-30 14:18:02 -05:00
LetterJay
063a44281e
Merge branch 'master' into upstream-merge-31044
2017-09-30 14:53:08 -04:00
LetterJay
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04: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
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
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
8048ce1842
Update humanoid.dm
2017-09-30 01:37:32 -05:00
LetterJay
eb05246c8b
Update giant_spider.dm
2017-09-29 23:33:54 -05:00
LetterJay
7263926251
Merge pull request #2961 from Citadel-Station-13/upstream-merge-31038
...
[MIRROR] DisplayTimeText for setup time on login
2017-09-29 12:18:25 -04:00
oranges
ba189c041b
Fixes shade attackby
2017-09-29 04:30:50 -05:00
LetterJay
d535514909
Merge pull request #2994 from Citadel-Station-13/upstream-merge-31061
...
[MIRROR] Fixes MMI buckled-warning
2017-09-29 01:45:08 -04:00
LetterJay
75359598b3
Merge pull request #2988 from Citadel-Station-13/upstream-merge-31060
...
[MIRROR] Fixes larva evolving while restrained
2017-09-29 01:43:07 -04: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
Jordan Brown
7621d1da91
Movement delay fixes and optimization
2017-09-28 21:56:52 -05:00
kingofkosmos
977163ae54
Fixes MMI buckled-warning ( #31061 )
...
* Fixes MMI having a buckled-warning when trying to move.
* Comment added.
2017-09-28 21:48:35 -05:00
YPOQ
a780d6f79e
Fixes larva evolving while restrained ( #31060 )
2017-09-28 21:46:43 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
XDTM
9b5a2f7490
Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-28 16:02:31 -05:00
LetterJay
3e27458d11
Merge pull request #2968 from Augustfox/master
...
Organize hair and facial hair in character creation
2017-09-28 12:29:10 -04:00
LetterJay
4e19b5a5f8
Merge pull request #2969 from Citadel-Station-13/upstream-merge-31041
...
[MIRROR] Removes some spawns
2017-09-28 12:25:33 -04:00
LetterJay
e6356d2560
Merge pull request #2955 from Citadel-Station-13/upstream-merge-31020
...
[MIRROR] Variants will not be spawned by gold cores
2017-09-28 12:22:44 -04:00
Ashe Higgs
c14fd6741c
Adds Nars-Ian and clock hawks
2017-09-28 10:43:32 -05:00
Jordan Brown
97b8a6ed3b
Removes some spawns
2017-09-28 10:43:07 -05:00
CitadelStationBot
2d48a0cf50
[MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. ( #2967 )
...
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
2017-09-28 05:59:57 -07:00
Augustfox
612707c999
Alphabetize hair and facial hair in char creation
...
🆑
Reordered hair in a semi-alphabetized list for easier use in character creation.
Alphabetized facial hair for easier use in character creation.
/🆑
No names or content changed other then order in list.
2017-09-27 23:45:15 -05:00
LetterJay
a8043202c2
Update golems.dm
2017-09-27 22:43:57 -05:00
LetterJay
7a0ffb8a67
Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
...
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
LetterJay
4f85246e42
Update robot_modules.dm
2017-09-27 18:42:06 -05:00
LetterJay
35761abdc8
Update robot_modules.dm
2017-09-27 18:40:46 -05:00
LetterJay
574ae23e51
Update robot_modules.dm
2017-09-27 17:58:32 -05:00
LetterJay
6818a3f5c9
Update robot_modules.dm
2017-09-27 17:36:14 -05:00
ShizCalev
fa92394e4e
DisplayTimeText for round time on login
2017-09-27 15:45:05 -05:00
LetterJay
18545eb41c
Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
...
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
Armhulen
0aea66649e
whoops we'll get right on that ( #31020 )
2017-09-27 00:45:49 -05:00
Ashe Higgs
193d929e4b
Clockwork cult rework: Post-merge micro-patch
2017-09-26 19:59:41 -05:00
vuonojenmustaturska
10bf80139c
Fixes MMI to AI law transfer ( #31017 )
...
* Fixes MMI to AI law transfer
* Fixes issue with preloaded laws on AI core
2017-09-26 16:52:17 -05:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
ShizCalev
4bab4181f2
Fixes alium leap exploit
2017-09-26 13:54:26 -05:00
AnturK
fd0bc465cc
Refactors cinematics.
2017-09-26 04:20:59 -05:00
LetterJay
8ff51624e1
Merge pull request #2934 from Citadel-Station-13/upstream-merge-30913
...
[MIRROR] Stops AIs from giving the borg a free secondary light
2017-09-25 13:29:02 -04:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
