CitadelStationBot
7162120fc4
Adds screaming for burns ( #1645 )
2017-06-17 13:25:55 -07: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
f86bda7cda
Adds onions
2017-06-16 16:22:38 -05:00
CitadelStationBot
9bd98194b2
Vomit fix
2017-06-16 15:19:26 -05:00
LetterJay
310ff0ea94
Merge pull request #1599 from Verkister/master
...
A new dogborgo.
2017-06-14 16:38:56 -05:00
Verkister
bac4cebfe8
removed a twig fro mthe gearbox.
2017-06-14 23:43:21 +03: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
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
67770a25be
final commit(?)
2017-06-14 09:54:14 -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
28d726d1af
Still need to fix the head.
2017-06-14 04:54:28 -05:00
CitadelStationBot
16f968f5e5
Some other code now uses ai status display list ( #1506 )
2017-06-13 13:43:04 -07:00
CitadelStationBot
33eb60747f
Refactored advanced camera consoles ( #1576 )
2017-06-13 13:39:47 -07:00
CitadelStationBot
9c31812e5b
Fixes dead PKborgs having active dampener fields
2017-06-13 02:24:06 -05:00
LetterJay
226345d82a
upstream-merge-28109
...
upstream-merge-28352
2017-06-13 01:10:21 -05:00
LetterJay
2a5be91970
compile fixes
2017-06-12 16:12:00 -05:00
CitadelStationBot
b2fc9c4dee
Outfits janitor cyborgs with a screwdriver, crowbar, and floor tiles
2017-06-12 15:34:37 -05:00
LetterJay
ee910591ef
Merge pull request #1521 from Citadel-Station-13/upstream-merge-28262
...
[MIRROR] Fixes basic spiderlings becoming ice spiders
2017-06-12 12:41:49 -05:00
LetterJay
55d30f865b
upstream-merge-28062
2017-06-12 12:20:07 -05:00
LetterJay
28d4372aa0
upstream-merge-27852
2017-06-11 00:20:55 -05:00
LetterJay
4624ec7e04
upstream-merge-27899
2017-06-11 00:09:55 -05:00
LetterJay
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
CitadelStationBot
5dd146a819
MMI-in-mecha can use the mecha tools again
2017-06-10 13:50:08 -05:00
CitadelStationBot
fb40986f89
Fixes basic spiderlings becoming ice spiders
2017-06-10 12:22:48 -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
b2cc05b6b5
Makes dismembered heads and brains respect NOCLONE
2017-06-09 20:08:45 -05:00
LetterJay
3f66d97005
Merge pull request #1402 from cebutris/oof
...
oof
2017-06-09 09:12:49 -05:00
CitadelStationBot
54d8e3a159
You can no longer mount borgs while stunned.
2017-06-08 17:18:09 -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
35b56f3075
Merge branch 'master' into upstream-merge-27773
2017-06-06 09:05:26 -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
60b5c7b33e
Merge pull request #1247 from Citadel-Station-13/upstream-merge-27726
...
[MIRROR] Custom emotes no longer replace the pronouns
2017-06-06 09:00:47 -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
cebutris
97027d1631
it actually works now
2017-06-05 03:37:25 -04:00
cebutris
ec90b20862
oof
2017-06-04 13:20:08 -04:00
CitadelStationBot
c1adecc0e2
Fix AI status displays to use a list instead of the world list ( #1391 )
2017-06-04 09:08:04 -07:00
CitadelStationBot
63f9657d9b
Refactors a cooldown var to not require a spawn or sleep ( #1381 )
2017-06-04 09:06:47 -07:00
CitadelStationBot
1c1cbe8e5b
Refactor another spawn var ( #1395 )
2017-06-04 09:04:56 -07:00
CitadelStationBot
9f02ba1245
Refactors another spawn cooldown var ( #1393 )
2017-06-04 09:04:49 -07:00
CitadelStationBot
e59e7f8d06
Fixes bsa not showing up ( #1396 )
2017-06-04 09:03:30 -07:00
CitadelStationBot
f8505883d4
Removes dragoontomb ruin and loot. ( #1290 )
2017-06-03 06:39:11 -07:00
CitadelStationBot
d74b8d187a
Binary talk now logs in the individual logging ( #1335 )
2017-06-02 22:01:15 -07:00
CitadelStationBot
dbc902ef29
Fixes martial arts resetting on cloning. ( #1338 )
2017-06-02 21:21:47 -07:00
CitadelStationBot
ac23b06edd
Borg module resets now require cutting instead of pulsing the reset wire
2017-05-31 19:56:43 -05:00
LetterJay
46bcc34a0e
Merge pull request #1214 from Citadel-Station-13/upstream-merge-27677
...
[MIRROR] Adds marker beacons to miner borgs
2017-05-31 01:53:38 -05:00
LetterJay
8f06db65c9
Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534
...
[MIRROR] Replaced mob spawner vars with outfits
2017-05-30 21:43:31 -05:00
LetterJay
1763c4b65d
Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530
...
[MIRROR] Area Refactor + Var-edit Cleanup
2017-05-30 20:49:42 -05:00
LetterJay
976086e490
Merge branch 'master' into upstream-merge-27534
2017-05-30 16:45:59 -05:00
LetterJay
df34173509
Merge pull request #1301 from Citadel-Station-13/upstream-merge-27831
...
[MIRROR] Fixes multi cyborgs
2017-05-30 15:50:56 -05:00
