shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,856 Commits 5 Branches 0 Tags
b2e176346c33afbefeb744b4e88198d1ea9fe3aa
Commit Graph

167 Commits

Author SHA1 Message Date
LetterJay
6986c3bb91 PDA Icon Update (Again) (#2147) 2017-07-27 01:19:05 -07:00
CitadelStationBot
d2e771c9f3 Adds cybernetic organs (#2135) 2017-07-26 00:04:59 -07:00
CitadelStationBot
d54d52c7e0 Tablet resprite (#2098) 2017-07-24 04:07:51 -07:00
CitadelStationBot
2fb28c97c7 Pizza box additions (#2111) 2017-07-24 04:06:31 -07:00
LetterJay
c9b38b8f5d New PDA + Missing icons fix 2017-07-21 00:45:33 -05:00
CitadelStationBot
e6d6478482 Small belt overlay rewrite, and tool overlays for toolbelts 2017-07-19 09:30:06 -05:00
LetterJay
fa9e1577ec Fix missing PDA icons 2017-07-18 01:14:09 -05:00
CitadelStationBot
260a140f97 Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#2034) 2017-07-17 00:52:43 -07:00
LetterJay
dcf957f0b2 adds icons for PDAs by Cecily and the hunter hat (#2015) 
* adds icons for PDAs by Cecily and the hunter hat

* Update cit_hats.dm
 2017-07-15 11:44:26 -07:00
CitadelStationBot
a0a77f5a41 Refactors screwdriver coloring to use greyscale (#2003) 2017-07-14 19:34:03 -07:00
CitadelStationBot
106cdfc37b [MIRROR] Fixes the maid costume's apron (#2010) 
* Fixes the maid costume's apron

* Delete admins.txt.rej
 2017-07-14 19:29:55 -07:00
CitadelStationBot
5e079fa54f Welding tools now use overlays for fuel gauges, rather than icons (#1994) 2017-07-14 03:13:55 -07:00
CitadelStationBot
b3f8b2a2d7 Adds a "synthesizer" that's basically a handheld piano 2017-07-13 17:46:46 -05:00
CitadelStationBot
059e1ad46b Replaces clockwork component initials with icons (#1971) 2017-07-10 16:14:11 -07:00
CitadelStationBot
4133d62161 [MIRROR] New portable generator icons (#1943) 
* New portable generator icons

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-08 21:50:51 -07:00
CitadelStationBot
b42fb13549 Adds Headphones! 2017-07-07 12:44:47 -05:00
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
CitadelStationBot
ec253c4e28 [MIRROR] cryotube pod improvements (#1681) 
* Bay-like cryotube pods

* Update cryo.dm

* Delete cryo.dm.rej

* Delete cryo.dm

* cryogenics.dmi
 2017-06-28 04:01:35 -05:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
CitadelStationBot
b16aa00517 Small jungle trees 2017-06-26 09:42:52 -05:00
LetterJay
b4473bedb2 Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382 
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
 2017-06-26 05:57:59 -05:00
LetterJay
ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227 
[MIRROR] Clown Toy Box + Wooden Crates
 2017-06-26 04:29:08 -05:00
CitadelStationBot
d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
CitadelStationBot
919f9f0cfc Turns the maid costume's apron into a detachable accessory. 2017-06-24 15:40:03 -05:00
LetterJay
68604eeb63 Merge pull request #1751 from Citadel-Station-13/upstream-merge-28713 
[MIRROR] Fixes goliath hide stacks having no sprite at high amounts
 2017-06-23 22:55:32 -05:00
CitadelStationBot
9b5f343906 Fixes goliath hide stacks having no sprite at high amounts 2017-06-23 13:51:43 -05:00
CitadelStationBot
2530d8a09a Intercoms are now constructable 2017-06-23 13:40:25 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay
4b79e996da icon name fixes 2017-06-20 15:25:22 -05:00
LetterJay
a1bd66ef8b Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414 
[MIRROR] Adds onions
 2017-06-17 10:04:59 -05:00
CitadelStationBot
3f92d14933 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. 2017-06-16 20:12:20 -05:00
CitadelStationBot
f86bda7cda Adds onions 2017-06-16 16:22:38 -05:00
CitadelStationBot
de79dc399f Fixes the rack sprite 2017-06-16 15:18:18 -05:00
LetterJay
c877fdb501 Merge branch 'master' into upstream-merge-28046 2017-06-14 13:10:37 -05:00
LetterJay
b0bc3d546f Merge branch 'SyndicateStuff' of https://github.com/Citadel-Station-13/Citadel-Station-13 into SyndicateStuff 2017-06-14 11:46:40 -05:00
LetterJay
01e49188b6 missed some icons 2017-06-14 11:46:25 -05:00
LetterJay
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
e1e60417f2 Merge pull request #1325 from Citadel-Station-13/upstream-merge-27884 
[MIRROR] CereStation Security Department Revamp (and other misc fixes/changes)
 2017-06-14 08:49:01 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
LetterJay
6f8a156321 Merge pull request #1527 from Citadel-Station-13/upstream-merge-28285 
[MIRROR] ports sprites from Endless-Horizon/CEV-Eris
 2017-06-12 12:39:53 -05:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
CitadelStationBot
57dc205514 Adds the ability to attach papers and photos to airlocks 2017-06-11 17:29:48 -05:00
LetterJay
28d4372aa0 upstream-merge-27852 2017-06-11 00:20:55 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot
2b3978476c ports sprites from Endless-Horizon/CEV-Eris 2017-06-10 17:16:28 -05:00
LetterJay
7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115 
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
 2017-06-10 09:01:25 -05:00
CitadelStationBot
d8e6b4acc2 Polishes the glass tables 2017-06-10 02:02:40 -05:00