LetterJay
310ff0ea94
Merge pull request #1599 from Verkister/master
...
A new dogborgo.
2017-06-14 16:38:56 -05:00
Verkister
4f3d39c693
A new dogborgo.
...
-Stole some virgo borgo modifications for them puppies.
-Added janiborgo dog.
-Nuked the fine balance with horribly abusable exploits :^)
-Y'all hubbie 4chog gamerkids can suck my egg.
-This update received Jay's blessing before I even started porting these.
2017-06-14 23:13:38 +03:00
LetterJay
c877fdb501
Merge branch 'master' into upstream-merge-28046
2017-06-14 13:10:37 -05:00
LetterJay
defb7d75c1
Merge pull request #1598 from Citadel-Station-13/SyndicateStuff
...
New syndicate cosmetics, turfs, and spawners.
2017-06-14 12:28:08 -05:00
LetterJay
be70bbbd5c
Merge pull request #1597 from Citadel-Station-13/GulimonsRus
...
Adds guilmon as a race (via Muffin)
2017-06-14 11:47:09 -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
c11b9632dd
incorrect layer fix
2017-06-14 10:46:15 -05:00
LetterJay
67770a25be
final commit(?)
2017-06-14 09:54:14 -05:00
LetterJay
c1af381233
Merge pull request #1460 from Citadel-Station-13/upstream-merge-28142
...
[MIRROR] Adds another parallax layer
2017-06-14 08:55:44 -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
ec415077c1
final commit for merge
2017-06-14 05:07:20 -05:00
LetterJay
28d726d1af
Still need to fix the head.
2017-06-14 04:54:28 -05:00
CitadelStationBot
5db49fb44b
Last Cult Master Spell: Eldritch Pulse & Various Tweaks ( #1430 )
2017-06-13 13:48:36 -07:00
LetterJay
226345d82a
upstream-merge-28109
...
upstream-merge-28352
2017-06-13 01:10:21 -05:00
LetterJay
212491e1ab
Merge pull request #1524 from Citadel-Station-13/upstream-merge-28290
...
[MIRROR] Made bedsheets on back more accurate towards their sprites
2017-06-12 12:41:04 -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
LetterJay
169f206f04
Merge pull request #1545 from Citadel-Station-13/upstream-merge-28188
...
[MIRROR] Adds the ability to attach papers and photos to airlocks
2017-06-12 12:13:10 -05:00
CitadelStationBot
57dc205514
Adds the ability to attach papers and photos to airlocks
2017-06-11 17:29:48 -05:00
CitadelStationBot
721842d8fa
Fixes duffel bags not appearing on backs
2017-06-11 08:37:39 -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
CitadelStationBot
5fb4997ed7
Made bedsheets on back more accurate towards their sprites
2017-06-10 16:17:26 -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
LetterJay
190b47983c
cleanup
2017-06-08 03:39:13 -05:00
LetterJay
923c5b9035
Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881
...
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
2017-06-08 03:35:23 -05:00
CitadelStationBot
cb15acf8b2
Adds another parallax layer
2017-06-07 14:18:39 -05:00
CitadelStationBot
9725329268
A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-07 03:06:15 -05:00
LetterJay
71bb6c930c
Merge pull request #1274 from Citadel-Station-13/upstream-merge-27652
...
[MIRROR] [Centcom] Nanotrasen Private Security 2.0
2017-06-06 09:01:33 -05:00
LetterJay
962177c423
Merge branch 'master' into upstream-merge-27652
2017-06-05 23:16:40 -05:00
LetterJay
54549d43a2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728
2017-06-05 23:07:52 -05:00
CitadelStationBot
f03aa5e0fa
Adds some more syndicate equipment.
2017-06-05 13:50:54 -05:00
LetterJay
8add0bbf63
missing stack icons
2017-06-05 10:48:03 -05:00
LetterJay
1690ac291b
missing beacon icons
2017-06-05 03:19:30 -05:00
CitadelStationBot
b5d2cf3c99
[READY] Stacks will change item_states and w_class based on how full they are. ( #1370 )
2017-06-04 09:08:33 -07:00
CitadelStationBot
11d5262e0c
Dominator colors are now directly determined by the gang's color ( #1355 )
2017-06-03 06:36:49 -07:00
CitadelStationBot
2c7e3ad4f7
Makes op belts less brown ( #1336 )
2017-06-02 21:18:26 -07:00
CitadelStationBot
cb755fc6d0
Adds three unique kinetic accelerator modules to necropolis chests
2017-06-01 15:32:16 -05:00
CitadelStationBot
96eb21fa2a
CereStation Security Department Revamp (and other misc fixes/changes)
2017-05-31 19:57:52 -05:00
LetterJay
52881797d0
update area turfs
2017-05-30 23:33:19 -05:00
CitadelStationBot
4f9c8a0869
Luxury Bluespace Shelter Capsules, Take 2.
2017-05-30 17:05:54 -05:00
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
