Commit Graph

424 Commits

Author SHA1 Message Date
LetterJay
ef10ac589a Update getrev.dm 2017-10-01 02:39:07 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
92c3a48507 Merge branch 'master' into upstream-merge-31140 2017-10-01 02:53:18 -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
d6ec5791a6 Update dna.dm 2017-09-30 22:35:57 -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
6c4934a34a Update ai_laws.dm 2017-09-30 14:22:12 -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
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04: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
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
7b3f91131b Update datum_traitor.dm 2017-09-29 23:45:07 -05:00
Jordan Brown
fdef700001 Fixes AI law weights infinite loop 2017-09-29 17:31:17 -05:00
LetterJay
e4e741d924 Merge pull request #2997 from Citadel-Station-13/upstream-merge-31074
[MIRROR] Ninja outfit code cleanup
2017-09-29 01:45:54 -04:00
Jordan Brown
116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05:00
oranges
a01540e39b Merge pull request #31074 from pubby/ninjaoutfit
Ninja outfit code cleanup
2017-09-28 21:53:05 -05:00
pubby
3c769e323e Remove unused ninja team var 2017-09-28 21:45:02 -05:00
kevinz000
df16529ed3 Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas. (#30722)
* initial commit

* bugfix

* Update changeling.dm

* Update datum_traitor.dm

* Update datum_traitor.dm

* Update objective.dm

* compile
2017-09-28 21:44:42 -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
AnturK
60952bfb83 Fixes transitions (#31084)
* Fixes transitions

* Cautionary comment.
2017-09-28 10:43:50 -05:00
LetterJay
64ff719843 Merge pull request #2956 from Citadel-Station-13/upstream-merge-30942
[MIRROR] Adds installing cells as part of mech construction and fixes some mech construction bugs.
2017-09-27 23:45:50 -04: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
aa74660722 Update construction_datum.dm 2017-09-27 16:27:09 -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
GLACoding
7b3fa9bdb1 Adds installing cells as part of mech construction and fixes some mech construction bugs. 2017-09-27 04:14:22 -05:00
Jordan Brown
af7dafd383 Some names -> string 2017-09-26 16:00:59 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
LetterJay
8140b2647a Update mind.dm 2017-09-25 12:26:26 -05:00
LetterJay
f5d8051f4d Update mind.dm 2017-09-25 12:08:06 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
pubby
382d549c2f Allow AIs to greentext survive (#30959)
* Change AI objectives from survive to exist

* Cyberboss simplification
2017-09-24 17:38:00 -05:00
AnturK
ea6e1356ba Fixes create antag wizard 2017-09-23 11:12:29 -05:00
CitadelStationBot
442689219e [MIRROR] SendSignal() speedup (#2910)
* SendSignal() speedup (#30929)

* Rename component.dm to _component.dm

* Merges RecieveSignal() into SendSignal()

* Makes ComponentActivated() and AfterComponentActivated() async

* SendSignal() speedup
2017-09-23 05:53:23 -05:00
CitadelStationBot
51d8182b13 [MIRROR] Fixes species being referenced instead of copied when cloning (#2859)
* Fixes species being referenced instead of copied when cloning

* fixes

* wew
2017-09-23 00:34:09 -05:00
CitadelStationBot
eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895)
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
2017-09-22 23:35:36 -05:00
Poojawa
573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
LetterJay
54bd982d6b Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681
[MIRROR] Prevents the creation of Shadowzombiechangelings
2017-09-22 08:43:37 -04:00
LetterJay
8c6c57ff32 Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896
[MIRROR] Removes old debug text
2017-09-22 00:03:30 -04:00
LetterJay
fcb907d2ce Merge pull request #2872 from Citadel-Station-13/upstream-merge-30802
[MIRROR] Stamina regen light
2017-09-21 07:36:45 -04:00
LetterJay
36cdee9f1c Merge pull request #2871 from Citadel-Station-13/upstream-merge-30848
[MIRROR] VV Href Fixes
2017-09-21 07:35:24 -04:00
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
deathride58
0d653c9f44 im unrobust 2017-09-20 22:39:58 -04:00
deathride58
860fe663b5 axes runtime's unstoppable horniness 2017-09-20 22:20:44 -04:00
oranges
51b8f45345 Merge pull request #30802 from CPTANT/Stamina_regen_2
Stamina regen light
2017-09-20 03:52:59 -05:00
oranges
ef867206bb Merge pull request #30848 from tgstation/Cyberboss-patch-2
VV Href Fixes
2017-09-20 03:50:47 -05:00
LetterJay
b996145a84 Update dna_spread.dm 2017-09-19 11:19:36 -05:00