shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,805 Commits 5 Branches 0 Tags
00199af27d8df893b9e02c0947d37c76ab0d075b
Commit Graph
4805 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 27ae29664b Merge pull request #2444 from Citadel-Station-13/upstream-merge-30035 
[MIRROR] Moves playtime tracking change entry below header
 2017-09-06 09:09:59 -05:00
LetterJayandGitHub edb8177a81 Merge branch 'master' into upstream-merge-30035 2017-09-06 09:09:52 -05:00
LetterJayandGitHub 2086ba6895 Delete database_changelog.txt.rej 2017-09-06 09:09:20 -05:00
LetterJayandGitHub e7c62f9759 Update database_changelog.txt.rej 2017-09-06 09:09:08 -05:00
LetterJayandGitHub b6f6970ebb Update disease.dm 2017-09-06 09:06:59 -05:00
LetterJayandGitHub 1f872675b0 Update disease.dm 2017-09-06 09:06:30 -05:00
LetterJayandGitHub f5e8e06041 Update dogborgstuff.dm 2017-09-06 09:04:33 -05:00
LetterJayandGitHub 2d469c62ef Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve 
Bad mirror resolve
 2017-09-06 08:59:20 -05:00
CitadelStationBot 76f8b02ee6 Automatic changelog generation for PR #2623 [ci skip] 2017-09-06 07:54:25 -05:00
PoojawaandGitHub 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
CitadelStationBot ff4f4c63d5 Automatic changelog generation for PR #2625 [ci skip] 2017-09-06 07:06:48 -05:00
RaeschenandPoojawa 0a97730ded Disables oldstation.dmm (#2625) 2017-09-06 07:06:46 -05:00
PoojawaandGitHub 1be71b61dc It's a good version (#2621) 2017-09-06 07:05:51 -05:00
PoojawaandGitHub e13ff54c44 disables Pubby from rotation (#2624) 2017-09-06 07:05:16 -05:00
PoojawaandGitHub fc95b9594c Re-disables sabresune, because wew 2017-09-05 21:23:15 -05:00
LetterJayandGitHub 4c6585de7a Update merge-upstream-pull-request.sh 2017-09-05 20:11:43 -05:00
LetterJayandGitHub ef79e47884 Update merge-upstream-pull-request.sh 2017-09-05 17:00:16 -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
CitadelStationBot 06437a49e6 Automatic changelog generation for PR #2592 [ci skip] 2017-09-05 15:57:21 -05:00
LetterJayandGitHub 737c8446c1 Merge pull request #2592 from Citadel-Station-13/ProperDisable 
Disables the swarmer events for now
 2017-09-05 15:57:19 -05:00
PoojawaandGitHub 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
PoojawaandGitHub 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
PoojawaandGitHub 362b4b5a16 Fixes Poly (#2598) 2017-09-04 09:08:25 -05:00
PoojawaandGitHub 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
Poojawa f39bf40e76 Fixes rabbit ears 2017-09-04 09:07:22 -05:00
Poojawa 44d5b21a43 sprite fix on kitsune tails 2017-09-04 05:59:42 -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
PoojawaandGitHub 7f46280d6b Update vg_clothing_packs.dm (#2591) 2017-09-04 04:47:20 -05:00
CitadelStationBot 201e07033f Automatic changelog generation for PR #2590 [ci skip] 2017-09-04 04:39:08 -05:00
CitadelStationBotandPoojawa 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
LetterJayandPoojawa 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 241a10d88d Automatic changelog generation for PR #2557 [ci skip] 2017-09-04 04:14:49 -05:00
CitadelStationBotandPoojawa d959b7538a Decreases hacked ai module cost (#2557) 2017-09-04 04:14:48 -05:00
CitadelStationBotandPoojawa 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
PoojawaandGitHub a4c92a8155 Update radiation_storm.dm 2017-09-04 03:12:51 -05:00
PoojawaandGitHub 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
PoojawaandGitHub f0b01508bb Removes swarmers from random events (#2584) 
Greytide: Blue lightning meme is dead.
 2017-09-04 02:47:56 -05:00
PoojawaandGitHub 8767fa299b Fixes headpatting *wag and Vore spaceworthiness (#2582) 
* no you're not supposed to die in a gut

* Re added tailwagging when patted

* adjust sounds, adding belly noises mode

* lowers sounds.

* Adds Noisy belly mode
 2017-09-04 02:47:39 -05:00
CitadelStationBotandPoojawa e353091c47 [MIRROR] Fixes shield blobs not blocking atmos (#2575) 
* Fixes shield blobs not blocking atmos

* atmosia blocking
 2017-09-04 02:47:09 -05:00
CitadelStationBotandPoojawa 2ab11de906 [MIRROR] Removes a Redundant Check (#2572) 
* Removes a Redundant Check

* Removes redundant check
 2017-09-04 02:41:41 -05:00
CitadelStationBot e4101c8f6c Automatic changelog generation for PR #2568 [ci skip] 2017-09-04 02:41:17 -05:00
CitadelStationBotandPoojawa ad43c951b8 [MIRROR] Slime people can eat anything again (#2568) 
* Slime people can eat anything again

* slimes can eat. Furry food prefs
 2017-09-04 02:41:15 -05:00
kevinz000andPoojawa c00d7aa3f6 Update ears.dm (#2489) 2017-09-04 02:39:20 -05:00
CitadelStationBot dccffe6e74 Automatic changelog generation for PR #2559 [ci skip] 2017-09-04 01:36:01 -05:00
CitadelStationBotandPoojawa 9b00f12ba0 Makes the shuttle code a little bit more robust by removing a snowflake loop (#2559) 2017-09-04 01:36:00 -05:00