shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,061 Commits 5 Branches 0 Tags
fcbebe64235143a218bb1fa116191ec18319fac9
Commit Graph
773 Commits
Author SHA1 Message Date
LetterJayandGitHub fcbebe6423 Update life.dm 2017-09-12 01:03:11 -05:00
LetterJayandGitHub 2ae18cd35e Update life.dm 2017-09-12 00:52:07 -05:00
LetterJayandGitHub d045103744 Update life.dm 2017-09-12 00:48:22 -05:00
LetterJayandGitHub 6c9609a7ee Merge branch 'master' into upstream-merge-30580 2017-09-11 23:19:07 -05:00
LetterJayandGitHub 1d19ee6bbf Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117 
[MIRROR] Crew monitoring rework part 1: crew pinpointers
 2017-09-11 22:41:24 -05:00
PoojawaandGitHub 2629d3b87d Adds horse, cow tails, Sergal ears/tails also (#2695) 
* Adds horse, sergal, cow tails

* Slight tweaks before bed

* sprite tweaks
 2017-09-11 20:22:21 -05:00
LetterJayandGitHub beed20c130 Update life.dm 2017-09-11 18:52:14 -05:00
LetterJayandGitHub 5c9ba3593a Merge pull request #2678 from Citadel-Station-13/upstream-merge-30482 
[MIRROR] People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit
 2017-09-11 18:45:22 -05:00
LetterJayandGitHub 5c42666355 Merge pull request #2707 from Citadel-Station-13/upstream-merge-30590 
[MIRROR] Fixes Punpun (again)
 2017-09-11 18:45:06 -05:00
LetterJayandGitHub 16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJayandGitHub bfe633540a Update human_movement.dm 2017-09-11 17:55:35 -05:00
LetterJayandGitHub 6816b83a6d Merge pull request #2673 from Citadel-Station-13/upstream-merge-30509 
[MIRROR] num2text the Instances number
 2017-09-11 17:53:54 -05:00
LetterJayandGitHub 01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
AnturKandCitadelStationBot 1553e26fe2 I missed that in last fix. (#30590) 2017-09-11 14:37:22 -05:00
LetterJayandGitHub c1872907b1 Update robot_modules.dm 2017-09-11 13:10:18 -05:00
LetterJayandGitHub ff17626ce7 Update death.dm 2017-09-11 13:09:30 -05:00
LetterJayandGitHub 0a30d7e962 Merge pull request #2646 from Citadel-Station-13/upstream-merge-30466 
[MIRROR] Fixes drone light toggle while dead
 2017-09-10 15:23:45 -05:00
KorPhaeronandCitadelStationBot 134c3f5f39 Losebreath 2017-09-10 12:37:29 -05:00
KorPhaeronandCitadelStationBot 8a297a3a9c People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit 2017-09-09 21:07:34 -05:00
Kyle Spier-SwensonandCitadelStationBot 8e0ef4f38f num2text the Instances number (#30509) 2017-09-09 14:24:24 -05:00
LetterJayandGitHub 5c4940c832 Merge pull request #2663 from Citadel-Station-13/upstream-merge-30389 
[MIRROR] Adds a short telegraph to the watcher's blasts
 2017-09-09 01:03:15 -05:00
Ashe HiggsandCitadelStationBot 2f438e5f4a Adds a short telegraph to the watcher's blasts (#30389) 
* Adds a telegraph to the watcher's blasts

* hmm
 2017-09-08 10:18:41 -05:00
MilitairesandCitadelStationBot 2ab29ccac4 Adds shamebrero penguin for dumb alphonzo (#30487) 2017-09-08 10:11:21 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot 33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
PoojawaandGitHub ce787e7726 Reverts sav file persistance for poly/pun-pun (#2654) 
* Reverts sav file persistance for poly/pun-pun

* makes sure poly writes to poly
 2017-09-08 06:58:08 -05:00
PoojawaandGitHub 62225acc2b Update verbs.dm 2017-09-08 06:56:31 -05:00
LetterJayandCitadelStationBot ff219f365e Update goliath.dm (#30486) 2017-09-07 11:58:42 -05:00
kingofkosmosandCitadelStationBot f4dbb6dc36 Fixes drone light toggle while dead 2017-09-07 10:34:20 -05:00
LetterJayandGitHub 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
Ashe HiggsandCitadelStationBot dcd0fa67f0 Adds "shiny" variants of lavaland mobs (#30416) 
* Shiny lavaland mobs!

* Changes based on feedback
 2017-09-06 19:15:25 -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
LetterJayandGitHub 72a8f7aa54 Merge branch 'master' into upstream-merge-29953 2017-09-06 09:17:57 -05:00
LetterJayandGitHub 2d469c62ef Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve 
Bad mirror resolve
 2017-09-06 08:59:20 -05:00
PoojawaandGitHub 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
Poojawa ef83a2db86 enables sabresune but locked for reason. 2017-09-05 07:33:55 -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 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 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 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
LetterJay e0eeda1f63 really fixes guilmons this time 2017-09-03 11:37:15 -05:00
LetterJayandGitHub 3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJay 96c790a81f Unruntimes fdel on savefiles 2017-09-02 05:23:35 -05:00
LetterJayandGitHub b1302230c0 Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121 
[MIRROR] Converts npc saves to jsons
 2017-09-02 05:20:31 -05:00
CitadelStationBot 9e90d582e5 Fixes dummy unequip runtimes. 2017-08-31 08:39:56 -05:00
CitadelStationBot 50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00