LetterJay
7f250e742a
Merge pull request #1798 from Citadel-Station-13/upstream-merge-28856
...
[MIRROR] Straight jackets can now properly be put onto others
2017-06-27 22:53:40 -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
ed4aa5a01a
Straight jackets can now properly be put onto others
2017-06-27 15:34:06 -05:00
CitadelStationBot
360209314d
Some fixes for the anomalous crystal
2017-06-27 08:13:38 -05:00
LetterJay
bd0f0c794b
Merge pull request #1789 from Citadel-Station-13/upstream-merge-28822
...
[MIRROR] Fixes the Hierophant's walls runtiming
2017-06-26 21:17:16 -05:00
CitadelStationBot
0f23003c2f
Fixes the Hierophant's walls runtiming
2017-06-26 15:59:25 -05:00
CitadelStationBot
abeac9d2ae
Fixes PAIs deleting their card on death
2017-06-26 15:55:15 -05:00
LetterJay
ba2e896d8c
Merge pull request #1719 from Citadel-Station-13/upstream-merge-28636
...
[MIRROR] Fixes random runtime
2017-06-26 10:53:07 -05:00
CitadelStationBot
10f3b3db50
Fixes the AI core being flammable
2017-06-26 09:38:44 -05:00
LetterJay
260ee23be8
Merge pull request #1649 from Citadel-Station-13/upstream-merge-28490
...
[MIRROR] The Hierophant is a little less chaotic and murdery on average
2017-06-26 06:23:25 -05:00
LetterJay
f1937eb1fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-06-26 06:14:55 -05:00
LetterJay
5571cca37c
.rej cleanup
2017-06-26 06:14:42 -05:00
CitadelStationBot
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
CitadelStationBot
bef1ffc086
Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit
2017-06-24 14:49:11 -05:00
CitadelStationBot
f919e995dc
Stamina projectiles no longer set off grenades and flamethrowers
2017-06-22 11:00:13 -05:00
LetterJay
20486e0184
🆑
...
sounddel: Removes oof
/🆑
2017-06-22 08:59:33 -05:00
LetterJay
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
CitadelStationBot
ce21809692
Fixes random runtime
2017-06-21 07:47:09 -05:00
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
31b7f9a074
The Hierophant is a little less chaotic and murdery on average
2017-06-17 16:54:43 -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
