shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,048 Commits 5 Branches 0 Tags
00a4b5ce8cbcc898050ed2567addd5800586b129
Commit Graph
149 Commits
Author SHA1 Message Date
LetterJayandGitHub 310ff0ea94 Merge pull request #1599 from Verkister/master 
A new dogborgo.
 2017-06-14 16:38:56 -05:00
Verkister 4f3d39c693 A new dogborgo. 
-Stole some virgo borgo modifications for them puppies.
-Added janiborgo dog.
-Nuked the fine balance with horribly abusable exploits :^)
-Y'all hubbie 4chog gamerkids can suck my egg.
-This update received Jay's blessing before I even started porting these.
 2017-06-14 23:13:38 +03:00
LetterJayandGitHub defb7d75c1 Merge pull request #1598 from Citadel-Station-13/SyndicateStuff 
New syndicate cosmetics, turfs, and spawners.
 2017-06-14 12:28:08 -05:00
LetterJayandGitHub be70bbbd5c Merge pull request #1597 from Citadel-Station-13/GulimonsRus 
Adds guilmon as a race (via Muffin)
 2017-06-14 11:47:09 -05:00
LetterJayandGitHub 74e6bc7ee2 Merge branch 'master' into SyndicateStuff 2017-06-14 11:44:32 -05:00
LetterJay 813bcc2b8d commit 2017-06-14 11:16:54 -05:00
LetterJay c11b9632dd incorrect layer fix 2017-06-14 10:46:15 -05:00
LetterJay 67770a25be final commit(?) 2017-06-14 09:54:14 -05:00
LetterJayandGitHub 4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
LetterJay 28d726d1af Still need to fix the head. 2017-06-14 04:54:28 -05:00
LetterJay 226345d82a upstream-merge-28109 
upstream-merge-28352
 2017-06-13 01:10:21 -05:00
LetterJayandGitHub 212491e1ab Merge pull request #1524 from Citadel-Station-13/upstream-merge-28290 
[MIRROR] Made bedsheets on back more accurate towards their sprites
 2017-06-12 12:41:04 -05:00
LetterJay 55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
CitadelStationBot 721842d8fa Fixes duffel bags not appearing on backs 2017-06-11 08:37:39 -05:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot 5fb4997ed7 Made bedsheets on back more accurate towards their sprites 2017-06-10 16:17:26 -05:00
CitadelStationBot 9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
CitadelStationBotandkevinz000 2c7e3ad4f7 Makes op belts less brown (#1336) 2017-06-02 21:18:26 -07:00
LetterJay 2d41b7fe17 EHHH 2017-05-28 15:49:22 -05:00
LetterJay 42edd006b8 A BUNCH OF SHIT 2017-05-28 14:57:17 -05:00
LetterJay fdb54c3ce3 hat 2017-05-27 22:49:20 -05:00
LetterJay c8d071ccf4 25 kill streak with a famas 2017-05-24 12:20:50 -05:00
LetterJay 34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
LetterJayandGitHub abbacd2c89 Merge branch 'master' into upstream-merge-27160 2017-05-22 16:29:43 -05:00
LetterJayandGitHub ab50a3eca5 Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283 
[MIRROR] Decentralized and Vastly Improved Gang Influence System
 2017-05-22 16:28:57 -05:00
CitadelStationBot 4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
CitadelStationBot e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBot c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBotandPoojawa 626959d96e [MIRROR] Fixes a bunch more cult bugs (#853) 
* Fixes a bunch more cult bugs

* Resolves .rejs and icons
 2017-05-18 03:21:07 -05:00
LetterJayandGitHub 4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
LetterJay eac970c1f1 aids 2017-05-16 16:00:28 -05:00
LetterJay f71a918ac8 screen rem 2017-05-16 15:53:44 -05:00
LetterJay ddee13467a fuck icons 2017-05-16 15:52:22 -05:00
LetterJayandGitHub 3ba7433371 Delete screen_alert.dmi 
fix conflict with Cult rework
 2017-05-16 15:44:23 -05:00
CitadelStationBot 962d114339 Petting is better 2017-05-14 07:36:55 -05:00
LetterJayandGitHub a1c04dd314 Merge pull request #898 from LetterJay/master 
Adds a hunter hat to the game/clothesmate
 2017-05-12 16:24:17 -04:00
LetterJay 43dd22425b Citadel hat DMI/DM 
Cleans up pointless files
 2017-05-10 17:33:13 -05:00
kevinz000andGitHub 41341e50a5 Merge pull request #696 from Citadel-Station-13/upstream-merge-25458 
[MIRROR] Belligerent now prevents you from running even between chants
 2017-05-07 23:19:35 -07:00
CitadelStationBot 617bb4ed38 Mega arachnid 2017-05-07 08:55:11 -05:00
CitadelStationBot f85a44ed52 2017 Cult Overhaul P1: Cult Master and Datum Cult 2017-05-06 11:56:16 -05:00
CitadelStationBot 49a85dca36 Fixes the Slimecore HUD's neck slot 2017-05-03 04:07:38 -05:00
LetterJayandGitHub 818940cbc3 Merge pull request #645 from Citadel-Station-13/upstream-merge-26598 
[MIRROR] Cult Construct Non-Balance Update
 2017-05-02 11:16:12 -05:00
CitadelStationBot 301ad1b0fc Belligerent now prevents you from running even between chants 2017-05-01 12:49:28 -05:00
CitadelStationBot 480b4db2e1 Cult Construct Non-Balance Update 2017-04-28 21:11:31 -05:00
CitadelStationBot 3fa6f63608 Replaces Mending Motor with Mending Mantra 2017-04-28 20:57:31 -05:00
CitadelStationBotandPoojawa b1d6b6a277 [MIRROR] Drake swooping is smoother and more dangerous (#571) 
* Drake swooping is smoother and more dangerous

* Update dragon.dm

* Delete dragon.dm.rej
 2017-04-26 10:11:33 -05:00
LetterJayandGitHub 417b80bb42 Merge pull request #516 from Verkister/master 
Bringing back the dogborgos.
 2017-04-26 06:24:26 -05:00
CitadelStationBot fb61c31470 Small abductors refactor 2017-04-25 03:59:08 -05:00