shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,183 Commits 5 Branches 0 Tags
2a33dcd3338900cf72e07b8b7b6ef800982f401f
Commit Graph

12533 Commits

Author SHA1 Message Date
CitadelStationBot e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
CitadelStationBot c0da458c92 Ports folders to Initialize (#1058) 2017-05-21 01:22:53 -05:00
Poojawa 2be5022536 Merge branch 'master' into upstream-merge-27268 2017-05-21 01:22:16 -05:00
Poojawa 909be8c8c7 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 2017-05-21 01:10:53 -05:00
CitadelStationBot c8e9e34d2b [MIRROR] Fixes stat gathering (#1025) 
* Fixes stat gathering

* Delete blackbox.dm.rej

* Update blackbox.dm
 2017-05-21 01:07:14 -05:00
Poojawa 7a3fb9e62e update ticker.dm 2017-05-21 01:05:10 -05:00
Poojawa 110de7902e Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 01:01:11 -05:00
Poojawa a8fa82b7c6 update world.dm 2017-05-21 01:01:10 -05:00
CitadelStationBot 883c5e034d Fixes bootstrapping the feedback database (#1012) 2017-05-21 00:46:44 -05:00
CitadelStationBot 63c64a00f1 [MIRROR] >mysql (#987) 
* >mysql

* Update dbcore.dm

* Delete dbcore.dm.rej
 2017-05-21 00:46:24 -05:00
Poojawa d8299bdcfd delete .rej 2017-05-21 00:45:55 -05:00
Poojawa 186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05:00
CitadelStationBot f624071766 [MIRROR] Ninja Refactor (#1037) 
* Ninja Refactor

* Update antagonists.dm

* Delete antagonists.dm.rej

* Update antagonists.dm

* Update mind.dm

* Update mind.dm

* whatever, I fixed that cunt
 2017-05-21 00:39:26 -05:00
Poojawa f4e7e152df Merge branch 'upstream-merge-27344' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 2017-05-21 00:37:53 -05:00
Poojawa 587bc1795c missing files 2017-05-21 00:37:47 -05:00
Poojawa e28130f70c Update rune_spawn_action.dm 2017-05-21 00:23:00 -05:00
Poojawa c8e9248ebb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 2017-05-21 00:13:39 -05:00
CitadelStationBot e0af0df435 [MIRROR] Adds Mass Insert proc to sql (#986) 
* Adds Mass Insert proc to sql

* Update blackbox.dm

* Update dbcore.dm

* Delete dbcore.dm.rej
 2017-05-20 23:43:16 -05:00
Poojawa 45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot 5455e28d76 Aux Base Fixes (#1067) 2017-05-20 23:20:45 -05:00
CitadelStationBot 12bbacec25 [MIRROR] Adds framework for cult constructs having the ability to make runes (#1010) 
* Adds framework for cult constructs having the ability to make runes

* Delete mobs.dm.rej

* Update runes.dm

* clean .rej
 2017-05-20 23:12:51 -05:00
CitadelStationBot 88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994) 
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition

* Rej cleanup

* update mob.dmi

* Update living_defense.dm
 2017-05-20 23:00:02 -05:00
cebutris 644a31ed98 Misc. guardian stuff (#1066) 
* beep boop

* Fixes one last inconsistency. Oops.

* punctuation
 2017-05-20 17:54:39 -07:00
CitadelStationBot c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot 448dc20c2b Proto-kinetic crushers are significantly better 2017-05-20 12:42:11 -05:00
CitadelStationBot 06c0856799 Fixes buttons under doors. 2017-05-20 11:34:52 -05:00
LetterJay 186a63ad34 Merge pull request #1057 from Citadel-Station-13/upstream-merge-27395 
[MIRROR] Fixes having more movespeed when xenos hug themselves
 2017-05-19 22:54:52 -05:00
LetterJay a6ee50b11b Merge pull request #1059 from Citadel-Station-13/upstream-merge-27389 
[MIRROR] Fixes gravity generator admin spam
 2017-05-19 22:47:03 -05:00
LetterJay 2cb54a5d45 Merge pull request #1061 from Citadel-Station-13/upstream-merge-27398 
[MIRROR] IsAdminAdvancedProcCall returns FALSE in TESTING
 2017-05-19 22:46:52 -05:00
LetterJay 59f367cd23 Merge pull request #1060 from Citadel-Station-13/upstream-merge-27386 
[MIRROR] Pulse Weapons Sprite Update
 2017-05-19 22:46:43 -05:00
LetterJay 4d48592008 Merge pull request #1051 from cebutris/holofixes 
No More Free Parasites
 2017-05-19 22:46:30 -05:00
LetterJay 3f24fa15bf Merge pull request #1062 from Citadel-Station-13/Cryofix 
mob_occupant to occupant
 2017-05-19 22:46:14 -05:00
LetterJay 6733349b3f this didn't mirror for some reason 2017-05-19 22:43:52 -05:00
LetterJay 6d3e9f9c50 mob_occupant to occupant 2017-05-19 22:33:26 -05:00
CitadelStationBot 915fa6cac1 IsAdminAdvancedProcCall returns FALSE in TESTING 2017-05-19 16:00:23 -05:00
CitadelStationBot 461804e635 Pulse Weapons Sprite Update 2017-05-19 13:51:47 -05:00
CitadelStationBot 778d809ff3 Fixes gravity generator admin spam 2017-05-19 13:48:39 -05:00
CitadelStationBot 4430e7d0c3 Fixes having more movespeed when xenos hug themselves 2017-05-19 12:31:59 -05:00
LetterJay 425191a0b6 Merge pull request #1054 from Citadel-Station-13/upstream-merge-27384 
[MIRROR] Fix choice for golems transferring between shells
 2017-05-19 09:05:38 -04:00
LetterJay 7f9f226285 Merge pull request #1053 from Citadel-Station-13/upstream-merge-27385 
[MIRROR] fixes aimed spells not recharging
 2017-05-19 09:05:25 -04:00
LetterJay 20848789f0 Merge pull request #1055 from Citadel-Station-13/upstream-merge-27376 
[MIRROR] If ratvar is alive, turning clockwork floors into clockwork walls is fast
 2017-05-19 09:05:03 -04:00
CitadelStationBot c36eee94bd Adds modified syringe guns 2017-05-19 06:25:23 -05:00
CitadelStationBot b943780a8c If ratvar is alive, turning clockwork floors into clockwork walls is fast 2017-05-19 06:25:19 -05:00
CitadelStationBot a56d1fcb9b Fix choice for golems transferring between shells 2017-05-19 06:21:10 -05:00
CitadelStationBot 45bc120501 fixes aimed spells not recharging 2017-05-19 06:21:06 -05:00
LetterJay af815195bc Merge pull request #1034 from Citadel-Station-13/upstream-merge-27368 
[MIRROR] Fixes bane runtimes
 2017-05-19 05:32:31 -04:00
LetterJay cb5e0eba3a Merge pull request #1039 from Citadel-Station-13/upstream-merge-27367 
[MIRROR] Quick fix for AI language issues.
 2017-05-19 01:00:41 -04:00
kevinz000 c58c6ffdd8 autoloading 2017-05-18 21:24:02 -07:00
LetterJay 653a3100c6 Merge pull request #1049 from Citadel-Station-13/upstream-merge-27340 
[MIRROR] Fixes uplink pens not showing in traitor menu
 2017-05-18 23:46:41 -04:00
LetterJay 2ad02addbd Merge pull request #1048 from Citadel-Station-13/upstream-merge-27335 
[MIRROR] Gives lavaland syndicates the syndicate faction.
 2017-05-18 23:46:30 -04:00