CitadelStationBot
989b991b05
Adds framework for equip delays and adds it to the straight jacket
2017-06-19 22:06:18 -05:00
LetterJay
767fe0b490
fixes examine text with people who have flavor
2017-06-19 20:43:33 -05:00
LetterJay
a63fbd9286
Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965
...
[MIRROR] Ports Goonchat
2017-06-19 17:25:18 -05:00
LetterJay
a4c9dc43dd
Dufflebag => Dufflebag
2017-06-19 16:42:05 -05:00
LetterJay
5e759fd792
Update examine.dm
2017-06-19 15:47:08 -05:00
LetterJay
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
LetterJay
a544d99f9f
cleanup and commits
2017-06-19 12:35:05 -05:00
CitadelStationBot
078824266e
Tablets with IDs in them now show the ID's name on examine
2017-06-17 16:56:48 -05:00
CitadelStationBot
6ec1b66a9d
Refactors soundbang_act to use adjustEarDamage ( #1467 )
2017-06-17 13:37:28 -07:00
CitadelStationBot
ef07d6b9ee
Makes Zombies 2 spooky ( #1583 )
2017-06-17 13:29:23 -07:00
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
LetterJay
d5807f3a62
Merge pull request #1567 from Citadel-Station-13/upstream-merge-28368
...
[MIRROR] Fixes MC panel Location not working while inside containers
2017-06-13 06:37:37 -05:00
CitadelStationBot
9ba274a3da
Fixes MC panel Location not working while inside containers
2017-06-13 02:45:50 -05: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
276bb8b786
Merge pull request #1483 from Citadel-Station-13/upstream-merge-28185
...
[MIRROR] Fixes ghosts not returning an initialize hint
2017-06-12 12:44:10 -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
a00551316b
Merge pull request #1522 from Citadel-Station-13/upstream-merge-28280
...
[MIRROR] MMI-in-mecha can use the mecha tools again
2017-06-12 12:41:20 -05:00
LetterJay
55d30f865b
upstream-merge-28062
2017-06-12 12:20:07 -05:00
CitadelStationBot
ea05bdbc26
Makes arrivals shuttle slightly more juicy
2017-06-11 17:28:44 -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
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
CitadelStationBot
180f0e82c8
Fixes ghosts not returning an initialize hint
2017-06-08 09:45:52 -05:00
LetterJay
f367878119
Merge pull request #1277 from Citadel-Station-13/upstream-merge-27773
...
[MIRROR] Splits mining_mobs.dm into separate files
2017-06-08 03:30:13 -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
CitadelStationBot
c5143880d2
Fixes logged out spawning new_players
2017-06-06 13:28:23 -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
