shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,356 Commits 5 Branches 0 Tags
750baf3dcafe2e9c5bd2fb22b24e886ad934a1bd
Commit Graph

99 Commits

Author SHA1 Message Date
LetterJay 745437e0eb Merge pull request #1170 from Citadel-Station-13/upstream-merge-27595 
[MIRROR] Improves collector feedback
 2017-05-28 19:47:09 -05:00
CitadelStationBot 0706161afe Lets bayonets butcher, fixes bayoneting typo (#1242) 2017-05-28 15:10:46 -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
CitadelStationBot e9d00c2aff [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#1191) 2017-05-27 13:36:44 -07:00
CitadelStationBot a84bcdd42e Adds goliath cloak & a recipe (Lavaland PvE primitive item) 2017-05-26 11:14:20 -05:00
CitadelStationBot 7998cdcd9a Gang Icons and Fixes 2017-05-25 08:45:28 -05:00
LetterJay a9aa36e5c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27557 2017-05-24 12:13:44 -05:00
CitadelStationBot 5fe4c7eb07 Sketchin Alt Magazine Sprites 2017-05-24 00:14:08 -05:00
CitadelStationBot ab7e9539bd Tactical Energy Gun Unique Sprites 2017-05-24 00:13:03 -05:00
LetterJay 2deead1ab2 Merge pull request #1096 from Citadel-Station-13/upstream-merge-27427 
[MIRROR] Warden Compact Combat Shotgun
 2017-05-23 07:13:52 -05:00
LetterJay b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync 
Syncs all gang related PRs with upstream
 2017-05-23 06:17:29 -05:00
LetterJay b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
LetterJay 72b654b198 Merge pull request #1116 from Citadel-Station-13/upstream-merge-27518 
[MIRROR] Adds a toy weapon vendor into the syndie lavaland base firing range
 2017-05-23 05:14:48 -05:00
CitadelStationBot 1d5c29b7b6 Auto Rifle Alt Mag Sprites 2017-05-22 22:16:06 -05:00
CitadelStationBot 4ac787e3bb Adds a toy weapon vendor into the syndie lavaland base firing range 2017-05-22 22:10:47 -05:00
LetterJay 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 8bc4cf3f41 Warden Compact Combat Shotgun 2017-05-21 22:29:01 -05:00
CitadelStationBot cd82124ef5 Survival pod doors will properly turn if on shuttles (#1070) 2017-05-21 17:43:53 -07:00
CitadelStationBot c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot 461804e635 Pulse Weapons Sprite Update 2017-05-19 13:51:47 -05:00
CitadelStationBot bbcc6f9be9 Proselytizing alloy shards will now proselytize all the shards in the tile 2017-05-18 16:37:26 -05:00
CitadelStationBot a5f858d8fb [MIRROR] Adds an underlay to turrets which gives them a base (#1002) 
* Adds an underlay to turrets which gives them a base

* Update turrets.dmi
 2017-05-18 13:12:17 -05:00
CitadelStationBot e6a55a4131 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#1017) 2017-05-18 12:41:30 -05:00
CitadelStationBot fadbb378aa Adds Bonfire Grills (#1003) 2017-05-18 12:23:07 -05:00
CitadelStationBot 6a2916a171 [MIRROR] Bluespace Launchpads (#879) 
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
 2017-05-18 07:12:13 -05:00
CitadelStationBot eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
LetterJay fe582cad7c Merge pull request #989 from Citadel-Station-13/upstream-merge-27214 
[MIRROR] Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
 2017-05-17 10:50:20 -04:00
LetterJay 133a032ed2 adds the correct dmi for the hunter hats directional facings. 2017-05-16 23:08:23 -05:00
CitadelStationBot 1f66249428 Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband 2017-05-15 17:04:23 -05:00
CitadelStationBot 41f110380c [MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935) 
* [READY]Gives the clown a pie cannon, also improves pneumatic cannons

* Delete gang.dm.rej
 2017-05-14 20:18:02 -07:00
LetterJay bf26c247e0 Merge pull request #931 from Citadel-Station-13/upstream-merge-27167 
[MIRROR] Ports dakimakuras from HippieStation.
 2017-05-14 16:32:40 -04:00
CitadelStationBot b9e3e99faa Adds Several Butter-filled Foods 2017-05-13 18:00:57 -05:00
CitadelStationBot 474fd582ea Ports dakimakuras from HippieStation. 2017-05-13 18:00:32 -05:00
LetterJay a1c04dd314 Merge pull request #898 from LetterJay/master 
Adds a hunter hat to the game/clothesmate
 2017-05-12 16:24:17 -04:00
CitadelStationBot 4a818bee1f Adds Sticks of Butter, Mayonnaise, and Mix function to grinder (#896) 2017-05-10 16:16:48 -07:00
LetterJay 43dd22425b Citadel hat DMI/DM 
Cleans up pointless files
 2017-05-10 17:33:13 -05:00
CitadelStationBot faf8829d30 [MIRROR] Adamantine golem leadership (#785) 
* Adamantine golem leadership

* Update stylesheet.dm

* Delete golems.dm.rej

* Delete stylesheet.dm.rej

* Update golems.dm

* fuck line endings
 2017-05-08 22:16:09 -07:00
kevinz000 2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
kevinz000 d9908a74a7 Merge pull request #748 from Citadel-Station-13/upstream-merge-26808 
[MIRROR] Adds aesthetic basalt floor tiles
 2017-05-07 06:24:50 -07:00
kevinz000 1168d06c9e Merge pull request #759 from Citadel-Station-13/upstream-merge-26849 
[MIRROR] New Tree Sprites
 2017-05-06 21:25:06 -07:00
CitadelStationBot 30f7e170a3 Makes medbay vending machines buildable 2017-05-06 13:52:12 -05:00
CitadelStationBot 4a142759a0 New Tree Sprites 2017-05-04 17:58:58 -05:00
CitadelStationBot da781e0d76 Adds aesthetic basalt floor tiles 2017-05-04 06:12:26 -05:00
CitadelStationBot 33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
CitadelStationBot 4141b6549f Adds eyeball soup and spaghetti to the game: it's now been 8 days edition 2017-05-03 01:42:35 -05:00
CitadelStationBot de997bba41 Fixes the 'stuffed legion' recipie 2017-05-01 08:37:09 -05:00
CitadelStationBot 87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines 2017-05-01 07:24:41 -05:00
LetterJay fca3f200b3 fixed RD PDA sprite 2017-04-29 08:27:54 -05:00
LetterJay 7740e1bfee fix missing icon for the carbine 2017-04-27 14:33:41 -05:00