shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,006 Commits 5 Branches 0 Tags
64ced3f6f4591bee0ffff8b82ef0cf4556c0207d
Commit Graph

438 Commits

Author SHA1 Message Date
LetterJay
1ecebee19d Merge pull request #3057 from Citadel-Station-13/upstream-merge-31171 
[MIRROR] Lastest
 2017-10-01 16:55:54 -04:00
LetterJay
5b81614e87 Merge pull request #3051 from Citadel-Station-13/upstream-merge-31200 
[MIRROR] Fixes warning spam
 2017-10-01 16:32:46 -04:00
LetterJay
e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138 
[MIRROR] Structure istype define
 2017-10-01 16:20:56 -04:00
LetterJay
6572781b63 Update forced_movement.dm 2017-10-01 14:43:06 -05:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117 
[MIRROR] Fixes liches losing spells
 2017-10-01 15:42:12 -04:00
LetterJay
4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069 
[MIRROR] Cleanup to various loc assignments and nearby code
 2017-10-01 15:08:21 -04:00
kevinz000
d76eb00634 Update viral.dm 2017-10-01 13:11:05 -05:00
Jordan Brown
9082c8d241 Merge pull request #31200 from AnturK/pleasestop 
Fixes warning spam
 2017-10-01 08:43:36 -05:00
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
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -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
Leo
fd7c9110ca Structure istype define 2017-09-30 21:31:57 -05:00
AnturK
6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -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
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
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
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
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