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

239 Commits

Author SHA1 Message Date
LetterJay 77b4be8b3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528 2017-05-28 21:49:30 -05:00
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 cd554d2537 Fixes crew monitoring console minimaps 2017-05-28 11:09:34 -05:00
LetterJay 33aae484d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-27 22:49:44 -05:00
LetterJay fdb54c3ce3 hat 2017-05-27 22:49:20 -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 c8d071ccf4 25 kill streak with a famas 2017-05-24 12:20:50 -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
LetterJay 56c2405d35 Merge pull request #1143 from Citadel-Station-13/upstream-merge-27556 
[MIRROR] Sketchin Alt Magazine Sprites
 2017-05-24 08:34:19 -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
CitadelStationBot 4191e1f7fd Adds the Beach Bum Language 2017-05-24 05:54:42 -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
LetterJay 1e149d1c89 Merge pull request #1119 from Citadel-Station-13/upstream-merge-27463 
[MIRROR] Auto Rifle Alt Mag Sprites
 2017-05-23 05:13:51 -05:00
CitadelStationBot 6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -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 abbacd2c89 Merge branch 'master' into upstream-merge-27160 2017-05-22 16:29:43 -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 4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
LetterJay 85e03b3e11 Merge pull request #1088 from Citadel-Station-13/upstream-merge-27430 
[MIRROR] Fixes pkborg fields not updating location or draining power
 2017-05-22 08:24:08 -05:00
CitadelStationBot 8bc4cf3f41 Warden Compact Combat Shotgun 2017-05-21 22:29:01 -05:00
CitadelStationBot 1dcad5fa0e Fixes pkborg fields not updating location or draining power 2017-05-21 22:28:20 -05:00
CitadelStationBot 4e5617ad54 Megafauna and lavaland mobs will no longer spawn directly on top of the mining base 2017-05-21 22:28:10 -05:00
CitadelStationBot cd82124ef5 Survival pod doors will properly turn if on shuttles (#1070) 2017-05-21 17:43:53 -07:00
CitadelStationBot e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
CitadelStationBot 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
CitadelStationBot 12bbacec25 [MIRROR] Adds framework for cult constructs having the ability to make runes (#1010) 
* Adds framework for cult constructs having the ability to make runes

* Delete mobs.dm.rej

* Update runes.dm

* clean .rej
 2017-05-20 23:12:51 -05:00
CitadelStationBot 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
CitadelStationBot 461804e635 Pulse Weapons Sprite Update 2017-05-19 13:51:47 -05:00
LetterJay ad219357af Merge pull request #1040 from Citadel-Station-13/upstream-merge-27337 
[MIRROR] Proselytizing alloy shards will now proselytize all the shards in the tile
 2017-05-18 23:44:45 -04:00
CitadelStationBot bbcc6f9be9 Proselytizing alloy shards will now proselytize all the shards in the tile 2017-05-18 16:37:26 -05:00
CitadelStationBot 36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -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
CitadelStationBot 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
CitadelStationBot 257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00