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

3472 Commits

Author SHA1 Message Date
LetterJay b008cdada0 oopsie woopsie 2017-09-11 13:47:33 -05:00
LetterJay e5aed03bcb all of my HATE 2017-09-10 15:20:58 -05:00
LetterJay 50587ea679 Update tools.dm 2017-09-10 15:18:30 -05:00
LetterJay c3fed32afb Update prolonging_prism.dm 2017-09-10 15:17:25 -05:00
LetterJay 33f35fe4d2 Update tools.dm 2017-09-10 11:46:34 -05:00
tortellinitony d73b82cf11 Gets rid of manual overlay manipulation 2017-09-06 23:39:08 -05:00
LetterJay 5829f56727 Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176 
[MIRROR] Adds more round id tracking
 2017-09-06 21:31:28 -05:00
LetterJay 3efa1d6134 Merge pull request #2631 from Citadel-Station-13/upstream-merge-30416 
[MIRROR] Adds "shiny" variants of lavaland mobs
 2017-09-06 20:18:27 -05:00
Ashe Higgs dcd0fa67f0 Adds "shiny" variants of lavaland mobs (#30416) 
* Shiny lavaland mobs!

* Changes based on feedback
 2017-09-06 19:15:25 -05:00
ShizCalev 849deb5e4e Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:42:43 -05:00
LetterJay 2f3f56352c Merge branch 'master' into upstream-merge-30176 2017-09-06 17:43:07 -05:00
LetterJay 9265694418 Update _compile_options.dm 2017-09-06 17:41:02 -05:00
LetterJay f9ef2bb068 commit 2017-09-06 17:36:32 -05:00
LetterJay 17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
LetterJay bbab9d8d5a donation 2017-09-06 14:41:35 -05:00
LetterJay a16ba4e4cd Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953 
[MIRROR] Add logging of deathgasp last words and suicide stats to the death table
 2017-09-06 10:11:16 -05:00
LetterJay 4ed411d353 Merge pull request #2462 from Citadel-Station-13/upstream-merge-30079 
[MIRROR] Fixes missing inhands
 2017-09-06 10:11:08 -05:00
LetterJay d4f018952e Merge pull request #2440 from Citadel-Station-13/upstream-merge-29866 
[MIRROR] You can now click on symptoms in the Pandemic to see their description and stats
 2017-09-06 10:10:58 -05:00
LetterJay 82f36f0d28 Delete client_procs.dm.rej 2017-09-06 09:27:57 -05:00
LetterJay ce1e5c69dc Delete blackbox.dm.rej 2017-09-06 09:27:55 -05:00
LetterJay b07ebeed57 Merge pull request #2480 from Citadel-Station-13/upstream-merge-30140 
[MIRROR] Corrects column name
 2017-09-06 09:26:12 -05:00
LetterJay 24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
LetterJay b2d7ee0e51 Merge pull request #2537 from Citadel-Station-13/upstream-merge-30248 
[MIRROR] Changes sql version to check for schema being ahead
 2017-09-06 09:23:02 -05:00
LetterJay ea10c4402e Merge pull request #2443 from Citadel-Station-13/upstream-merge-30027 
[MIRROR] Fixes hair sticking out of spess helmets
 2017-09-06 09:22:44 -05:00
LetterJay 00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
LetterJay 72a8f7aa54 Merge branch 'master' into upstream-merge-29953 2017-09-06 09:17:57 -05:00
LetterJay cf46abecb3 Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004 
[MIRROR] Moved emagged var to obj/item parent.
 2017-09-06 09:15:11 -05:00
LetterJay b6f6970ebb Update disease.dm 2017-09-06 09:06:59 -05:00
LetterJay 1f872675b0 Update disease.dm 2017-09-06 09:06:30 -05:00
LetterJay f5e8e06041 Update dogborgstuff.dm 2017-09-06 09:04:33 -05:00
LetterJay 2d469c62ef Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve 
Bad mirror resolve
 2017-09-06 08:59:20 -05:00
Poojawa 3ba2f650dd Adds Paradise Sofas (#2623) 
* Adds Paradise Sofas

* Actually enable them to be constructed

* Coding standards, sheesh

* am path guder
 2017-09-06 07:54:23 -05:00
Poojawa fc95b9594c Re-disables sabresune, because wew 2017-09-05 21:23:15 -05:00
LetterJay af409af9cf additional files 2017-09-05 16:29:25 -05:00
LetterJay bae0563d47 initial commit 2017-09-05 16:17:50 -05:00
LetterJay 737c8446c1 Merge pull request #2592 from Citadel-Station-13/ProperDisable 
Disables the swarmer events for now
 2017-09-05 15:57:19 -05:00
Poojawa 9bca718151 Fixes prey digestion noises and loop (#2616) 2017-09-05 12:53:35 -05:00
Poojawa ef83a2db86 enables sabresune but locked for reason. 2017-09-05 07:33:55 -05:00
Poojawa 3a76fdc2e9 Update supply.dm 2017-09-04 21:26:19 -05:00
Poojawa 32742f0b53 fixes skunk tails too 2017-09-04 09:28:50 -05:00
Poojawa 362b4b5a16 Fixes Poly (#2598) 2017-09-04 09:08:25 -05:00
Poojawa 5f1d88ffeb Revert "[MIRROR] Port material containers to datum components" (#2597) 
* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.
 2017-09-04 09:07:40 -05:00
LetterJay 2f95892d6b I feel like it's more appropriate to disable them via vars instead of flatout commenting the entire dm file out. I also feel like it may be better to take another look at these instead of removing them outright anyway. 2017-09-04 05:27:32 -05:00
Poojawa 7f46280d6b Update vg_clothing_packs.dm (#2591) 2017-09-04 04:47:20 -05:00
CitadelStationBot 5c98b9a13b [MIRROR] Gives the detective a mass spectrometer (#2590) 
* Gives the detective a mass spectrometer

* Actually adds it
 2017-09-04 04:39:07 -05:00
LetterJay 92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
CitadelStationBot d959b7538a Decreases hacked ai module cost (#2557) 2017-09-04 04:14:48 -05:00
CitadelStationBot 32300086d5 [MIRROR] Port material containers to datum components (#2562) 
* Port material containers to datum components

* Fixes Rej
 2017-09-04 04:08:42 -05:00
Poojawa a4c92a8155 Update radiation_storm.dm 2017-09-04 03:12:51 -05:00
Poojawa 2c8e2f0679 New tails, new ears, new looks (#2585) 
* Sabresune markings and tail

also a few other fixes

* bluh

* kitsune tails and final tweaks

* enables taur on all other species, because why not
 2017-09-04 02:48:13 -05:00