shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,371 Commits 5 Branches 0 Tags
a1202bcec7bdbef048a6980f2f00a4939142ad21
Commit Graph

252 Commits

Author SHA1 Message Date
LetterJay
655467f966 Merge pull request #3160 from Kevak/Spritefixes 
Plasmamans now have organssprites again.
 2017-10-06 02:12:21 -04:00
Kevak
a5f86b1e67 Fixes plasmaman sprites 2017-10-05 09:59:13 -07:00
LetterJay
05770366b5 Merge pull request #3122 from Citadel-Station-13/upstream-merge-31273 
[MIRROR] Moves all stack object sprites from items_and_weapons.dmi to their own file
 2017-10-05 06:10:55 -04:00
LetterJay
1a70aa0227 Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887 
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
 2017-10-04 19:06:02 -04:00
LetterJay
ade361855a missing icon for cult sword 2017-10-04 17:40:22 -05:00
bawhoppen
460fea66c8 Moves all stack object sprites from items_and_weapons.dmi to their own file 2017-10-04 11:59:53 -05:00
Leo
5b8eb58266 Merge pull request #31260 from ShizCalev/alium-sheets 
Adds missing abductor metal sheet sprites
 2017-10-04 06:15:07 -05:00
LetterJay
719b433ede Merge pull request #3108 from Citadel-Station-13/upstream-merge-31179 
[MIRROR] Adds the advanced medical scanner, gives one to the CMO
 2017-10-04 02:14:07 -04:00
XDTM
1782fbeed7 Adds the advanced medical scanner, gives one to the CMO 2017-10-03 18:16:29 -05:00
Kevak
f4ce4a3a27 Shock Collars Are Now A Thing. 
Exactly what it says on the tin.
 2017-10-03 08:03:03 -07:00
LetterJay
ef671d8764 OOOOOOOH SHIIIIIIIIIIT 2017-10-03 03:55:05 -05:00
LetterJay
b95d35d56d FUCK. 2017-10-03 03:42:13 -05:00
LetterJay
c8f52d272e donation item 2017-10-03 00:18:21 -05:00
Jordan Brown
3a83b28bae Adds the Cargo-Tech-of-the-Shift award 2017-10-01 09:43:20 -05:00
LetterJay
f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJay
2858c53788 Merge pull request #2958 from Michiyamenotehifunana/wave3guns 
Wave 3 of guns
 2017-09-29 12:45:52 -04:00
Joan Lung
e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
RandomMarine
ab28e2facb Air tanks get their own sprite, plus reset fix. 2017-09-27 15:45:41 -05:00
Michiyamenotehifunana
59541efffb Wave 3 of guns 
Reskinnable stetchkins, magrifle, flechette gun, Hyper-burst rifle, and 10mm soporific bullets.
 2017-09-27 23:08:36 +08:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
LetterJay
47a8ce6ae8 Merge pull request #2939 from Citadel-Station-13/upstream-merge-30863 
[MIRROR] Bluespace pipes
 2017-09-26 14:58:23 -04:00
LetterJay
e878e75c42 donator item 2017-09-25 23:49:06 -05:00
Jordan Brown
0a43bddaa1 Merge pull request #30863 from pubby/bluepipe 
Bluespace pipes
 2017-09-25 12:28:14 -05:00
LetterJay
1c9061058f Merge pull request #2928 from Citadel-Station-13/upstream-merge-30899 
[MIRROR] Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period
 2017-09-24 11:34:01 -04:00
LetterJay
8cb93a512c Merge pull request #2907 from Michiyamenotehifunana/wave2ofguns 
Wave 2 of guns
 2017-09-24 11:32:41 -04:00
Joan Lung
3505e14b45 Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period (#30899) 
* Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period

* tweak

* fix
 2017-09-24 10:10:22 -05:00
LetterJay
d25746fd66 donations items 2017-09-23 10:07:15 -05:00
Michiyamenotehifunana
05bbc43782 Wave 2 of guns 
Spinfusor, X9, Magpistol.
 2017-09-23 15:05:11 +08:00
CitadelStationBot
a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875) 
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
 2017-09-22 23:35:54 -05:00
CitadelStationBot
2c78f7122c [MIRROR] Adds some new plushies (#2866) 
* Adds some new plushies

* Update packs.dm
 2017-09-22 22:31:07 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
LetterJay
8507f25f8d Merge pull request #2865 from Citadel-Station-13/upstream-merge-30473 
[MIRROR] Airlocks animate faster
 2017-09-21 07:30:23 -04:00
LetterJay
5b38d23bfd oops 2017-09-21 02:28:37 -05:00
PopNotes
83d178bc08 Airlocks animate faster (#30473) 
* Add files via upload

* Add files via upload
 2017-09-19 15:53:22 -05:00
LetterJay
e410b452ea Merge pull request #2817 from Michiyamenotehifunana/master 
Adds Anti Tank pistols
 2017-09-19 12:15:01 -04:00
Michiyamenotehifunana
1f84944dee Anti Tank Pistol Improvements and Implementation 
Fixes the issues with the ATP, modifies its sprite slightly, and adds it to the nukeops uplink list.
 2017-09-18 23:11:14 +08:00
CitadelStationBot
2d7ead37d5 [MIRROR] Adds a new buckknife sprite! (#2793) 
* Merge pull request #30680 from Armhulen/help-a-friend-out

Adds a new buckknife sprite!

* Adds a new buckknife sprite!

* update kitchen.dmi
 2017-09-18 01:45:25 -05:00
CitadelStationBot
e2e85e9294 [MIRROR] Window Spawner Refactor (#2815) 
* Window spawner refactor (#30747)

* Window Spawner Refactor
 2017-09-17 22:42:22 -05:00
CitadelStationBot
201cb984c8 [MIRROR] Fix ingredient box icon (again) (#2823) 
* Fix ingredient boxes

* Fix ingredient box icon (again)
 2017-09-17 22:36:21 -05:00
Michiyamenotehifunana
fb8128d934 Adds Anti Tank pistols 
Due to balance concerns and unironed out bugs, adminspawn only.
 2017-09-17 21:38:57 +08:00
LetterJay
c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
LetterJay
81fdf521fb Merge pull request #2712 from Citadel-Station-13/upstream-merge-30502 
[MIRROR] Makes shiny versions of lavaland monsters slightly more distinct
 2017-09-12 19:10:21 -05:00
LetterJay
c511e4babb missing banner icons 2017-09-12 05:46:24 -05:00
LetterJay
01b0e754c2 Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531 
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
 2017-09-12 02:35:17 -05:00
LetterJay
caca1d1794 Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553 
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
 2017-09-12 01:22:11 -05:00
LetterJay
a5a8f8faba Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530 
[MIRROR] Adds Gondoland and the rare Gondolas
 2017-09-12 01:21:09 -05:00
LetterJay
5822e04980 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-11 22:47:45 -05:00
LetterJay
39687189b6 donation 2017-09-11 22:47:27 -05:00
LetterJay
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