shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,959 Commits 5 Branches 0 Tags
4d610b95bdfdb377f2ef7eb0f67eff02920f4595
Commit Graph

4243 Commits

Author SHA1 Message Date
Jordan Brown
4d610b95bd Maplist is loaded regardless of maprotation config setting (#31172) 
* Uncomments map rotation in default config

* Maplist is loaded regardless of maprotation config setting

Also logs loading of the map file
 2017-10-01 15:27:51 -05:00
LetterJay
1057b4b636 Merge pull request #3035 from Citadel-Station-13/upstream-merge-31137 
[MIRROR] Fixes meteors not working with multi z
 2017-10-01 16:21:08 -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
b2a01d688d Merge pull request #3044 from Citadel-Station-13/upstream-merge-31136 
[MIRROR] Adds a single comment to is_helpers.dm
 2017-10-01 15:56:43 -04:00
LetterJay
21302e3fdc Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141 
[MIRROR] Speeds up simple_animals/hostile/proc/CanAttack()
 2017-10-01 15:49:44 -04:00
LetterJay
6572781b63 Update forced_movement.dm 2017-10-01 14:43:06 -05:00
LetterJay
fafd98ed0e Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142 
[MIRROR] Fixes cogscarab sprites not updating
 2017-10-01 15:42:35 -04: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
5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -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
LetterJay
eb24540ba3 Merge pull request #3017 from Citadel-Station-13/upstream-merge-31108 
[MIRROR] Corrected shuttle refuel time
 2017-10-01 15:07:43 -04:00
LetterJay
490885a36f update 2017-10-01 13:02:52 -05:00
LetterJay
9f05ef16df Merge branch 'master' into upstream-merge-31108 2017-10-01 04:31:36 -04:00
LetterJay
926db45b54 Update world.dm 2017-10-01 03:06:11 -05:00
LetterJay
80a84db919 Update adminhelp.dm 2017-10-01 02:39:24 -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
22b148f078 Merge pull request #3014 from Citadel-Station-13/upstream-merge-31140 
[MIRROR] Fixes AI law weights infinite loop
 2017-10-01 03:26:42 -04:00
LetterJay
37942a2279 Update hostile.dm 2017-10-01 01:57:49 -05:00
LetterJay
49c63dd794 Update randomverbs.dm 2017-10-01 01:57:03 -05:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJay
4be6f22669 Merge branch 'master' into upstream-merge-31108 2017-10-01 02:53:27 -04:00
LetterJay
92c3a48507 Merge branch 'master' into upstream-merge-31140 2017-10-01 02:53:18 -04:00
LetterJay
6a8ca2e02c Merge branch 'master' into upstream-merge-31037 2017-10-01 02:53:03 -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
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
1d1a862e1b Merge pull request #3003 from Citadel-Station-13/upstream-merge-31045 
[MIRROR] Reebe is fancier now
 2017-10-01 02:20:23 -04:00
LetterJay
747312cb6d updates 2017-10-01 00:59:59 -05:00
ninjanomnom
009532b907 for completeness sake 2017-10-01 00:21:47 -05:00
LetterJay
0cc54029e2 Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096 
[MIRROR] Cleans up some unused code
 2017-10-01 01:19:36 -04:00
LetterJay
33b481dffb Merge pull request #3008 from Citadel-Station-13/upstream-merge-31073 
[MIRROR] Log attempted injections as well as successful ones
 2017-10-01 01:19:20 -04:00
LetterJay
f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
LetterJay
11b558c367 Merge branch 'master' into upstream-merge-31093 2017-10-01 00:50:26 -04:00
LetterJay
d6ec5791a6 Update dna.dm 2017-09-30 22:35:57 -05:00
KorPhaeron
e53fd73557 Fixes meteors not working with multi z (#31137) 2017-09-30 21:33:06 -05:00
Leo
fd7c9110ca Structure istype define 2017-09-30 21:31:57 -05:00
MoreRobustThanYou
e63e05255f Fixes cogscarab sprites not updating (#31142) 
* Fixes cogscarab sprites now updating

* fix spacing

* Update extra_drone_types.dm
 2017-09-30 21:30:48 -05:00
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