shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,540 Commits 5 Branches 0 Tags
92c693ecc70d76a04873d5b60d4468bb7ad3f310
Commit Graph

226 Commits

Author SHA1 Message Date
LetterJay
8cb93a512c Merge pull request #2907 from Michiyamenotehifunana/wave2ofguns 
Wave 2 of guns
 2017-09-24 11:32:41 -04: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
Joan Lung
2dc3868949 Makes shiny versions of lavaland monsters slightly more distinct (#30502) 
* Makes shiny versions of lavaland monsters slightly more distinct

* classic

* lower drop

* tweak drops

* this is kind of absurd
 2017-09-11 20:54:55 -05:00
LetterJay
360e7b60cf Merge pull request #2668 from Citadel-Station-13/upstream-merge-30242 
[MIRROR] New blackbox sprites
 2017-09-11 18:47:25 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
KorPhaeron
4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
ExcessiveUseOfCobblestone
f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
LetterJay
037faa1305 Merge pull request #2633 from Citadel-Station-13/upstream-merge-30456 
[MIRROR] Adds CE power tool sprites for the toolbelt
 2017-09-10 11:44:46 -05:00
Kerbin-Fiber
d158ec9528 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter 2017-09-10 03:43:09 -05:00
Lexorion
770c6a8e54 New blackbox sprites (#30242) 
* New blackbox sprites

* Changes the blackbox sprite again
 2017-09-08 20:53:21 -05:00
LetterJay
b5d80219ac donation item 2017-09-07 07:21:42 -05:00
Ashe Higgs
4099a17c52 Adds CE power tool sprites for the toolbelt (#30456) 2017-09-06 20:59:17 -05:00
LetterJay
bbab9d8d5a donation 2017-09-06 14:41:35 -05:00
Poojawa
3ba2f650dd Adds Paradise Sofas (#2623) 
* Adds Paradise Sofas

* Actually enable them to be constructed

* Coding standards, sheesh

* am path guder
 2017-09-06 07:54:23 -05:00
LetterJay
f8413517bb testing 2017-09-02 07:43:34 -05:00
CitadelStationBot
50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
CitadelStationBot
5f3775388c Gives cult blades updated item and inhand sprites 2017-08-29 17:08:43 -05:00
kevinz000
c64aeef239 Revert "goddamnit (#2491)" (#2510) 
This reverts commit d2c89ad25c.
 2017-08-26 16:13:23 -07:00
kevinz000
d2c89ad25c goddamnit (#2491) 2017-08-26 04:50:59 -07:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
CitadelStationBot
a6d64204ad [MIRROR] Updates PubbyStation (#2325) 
no
 2017-08-22 18:20:46 -07:00
LetterJay
8ab87aa0bd Merge pull request #2403 from Citadel-Station-13/upstream-merge-29943 
[MIRROR] New telecomm sprites
 2017-08-17 10:06:47 -05:00
CitadelStationBot
5a1123e09b New telecomm sprites 2017-08-16 21:05:49 -05:00
CitadelStationBot
68830dac71 Changes smes, cells, cell charger, terminals and apcs icons 2017-08-16 20:02:24 -05:00
CitadelStationBot
0e7b9a008e Ports a slightly edited version of Eris APC sprites 2017-08-13 17:54:27 -05:00
CitadelStationBot
1e3ea07d8b Adds icon_states to the unused and used Eldritch whetstones 2017-08-13 01:28:24 -05:00
CitadelStationBot
d3b5f0aa6d Laptops now have actual sprites for using the supermatter monitoring instead of defaulting to a generic one. 2017-08-08 05:49:17 -05:00