LetterJay
|
914434891a
|
Merge pull request #1744 from Citadel-Station-13/upstream-merge-28685
[MIRROR] Fixes the sprite for the nullrod clown dagger skin
|
2017-06-26 10:52:21 -05:00 |
|
LetterJay
|
090b8b5055
|
Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740
[MIRROR] Station Engineers Spawn With Industrial Welder
|
2017-06-26 10:51:51 -05:00 |
|
CitadelStationBot
|
b16aa00517
|
Small jungle trees
|
2017-06-26 09:42:52 -05:00 |
|
LetterJay
|
d3c2f5aee6
|
Merge pull request #1778 from Citadel-Station-13/upstream-merge-28766
[MIRROR] Robotic legs are not weak to glass shards
|
2017-06-26 06:26:46 -05:00 |
|
LetterJay
|
2fc5c3785a
|
Merge pull request #1782 from Citadel-Station-13/upstream-merge-28789
[MIRROR] Fixes resin attack message
|
2017-06-26 06:18:36 -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 |
|
LetterJay
|
faa0849b4b
|
Merge pull request #1663 from Citadel-Station-13/upstream-merge-28573
[MIRROR] Alien closets now correctly cost two alloy to make (Fixes #28561)
|
2017-06-26 06:13:59 -05:00 |
|
CitadelStationBot
|
04dd1ffdbd
|
Fixes resin attack message
|
2017-06-26 06:03:44 -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
|
1982321419
|
Robotic legs are not weak to glass shards
|
2017-06-25 23:47:38 -05:00 |
|
CitadelStationBot
|
0c2bf7e5ea
|
Station Engineers Spawn With Industrial Welder
|
2017-06-25 09:17:52 -05:00 |
|
CitadelStationBot
|
acc03ae85e
|
Fixes bad del runtime
|
2017-06-24 11:48:05 -05:00 |
|
LetterJay
|
2259f604d6
|
Merge pull request #1749 from Citadel-Station-13/upstream-merge-28659
[MIRROR] Intercoms are now constructable
|
2017-06-23 22:54:27 -05:00 |
|
CitadelStationBot
|
2530d8a09a
|
Intercoms are now constructable
|
2017-06-23 13:40:25 -05:00 |
|
Matthew
|
6558f31395
|
Adding Locker reset function
|
2017-06-22 23:53:02 -05:00 |
|
CitadelStationBot
|
3d84f4bdbb
|
Fixes the sprite for the nullrod clown dagger skin
|
2017-06-22 20:07:34 -05:00 |
|
LetterJay
|
b81b9a4f61
|
Merge pull request #1739 from Citadel-Station-13/upstream-merge-28673
[MIRROR] Readds sprites for grey & nanotrasen bedsheets
|
2017-06-22 19:22:23 -05:00 |
|
LetterJay
|
9f52f1cea2
|
Merge pull request #1737 from Citadel-Station-13/upstream-merge-28486
[MIRROR] Stamina projectiles no longer set off grenades and flamethrowers
|
2017-06-22 19:21:30 -05:00 |
|
CitadelStationBot
|
d0d1ae1e01
|
Readds sprites for grey & nanotrasen bedsheets
|
2017-06-22 11:03:26 -05:00 |
|
CitadelStationBot
|
f919e995dc
|
Stamina projectiles no longer set off grenades and flamethrowers
|
2017-06-22 11:00:13 -05:00 |
|
CitadelStationBot
|
c98248cf7e
|
Fixes swarmers dying to radiation
|
2017-06-22 10:59:03 -05:00 |
|
LetterJay
|
d04001c09d
|
another huge sync
|
2017-06-21 18:00:00 -05:00 |
|
CitadelStationBot
|
d587d692c6
|
Flame thrower plasma tanks can be removed easily.
|
2017-06-21 13:21:31 -05:00 |
|
LetterJay
|
b84426d8fa
|
Merge pull request #1712 from Citadel-Station-13/upstream-merge-28618
[MIRROR] Fixes shining lights into peoples eyes
|
2017-06-20 20:30:24 -05:00 |
|
CitadelStationBot
|
4102d88802
|
Fixes shining lights into peoples eyes
|
2017-06-20 20:06:25 -05:00 |
|
CitadelStationBot
|
39ad327fab
|
Fixes grenade belt and bandolier UI obscuring half the screen
|
2017-06-20 15:37:20 -05:00 |
|
CitadelStationBot
|
f0dc32ef4f
|
Space cash descriptions are more descriptive (#1651)
|
2017-06-20 08:04:28 -07:00 |
|
CitadelStationBot
|
e1c8973f82
|
Fixes things getting unbuckled in nullspace (#1606)
|
2017-06-20 08:04:01 -07:00 |
|
CitadelStationBot
|
72d329cf31
|
Makes RADIMMUNE species incompatible with radiation based DNA injectors (#1518)
|
2017-06-20 08:00:21 -07:00 |
|
LetterJay
|
35df3ca80e
|
Merge pull request #1683 from Citadel-Station-13/upstream-merge-28583
[MIRROR] Adds framework for equip delays and adds it to the straight jacket
|
2017-06-20 01:30:32 -05:00 |
|
LetterJay
|
a8b498a2a9
|
Merge pull request #1666 from Citadel-Station-13/upstream-merge-28407
[MIRROR] [READY]Adds examine tooltips
|
2017-06-20 01:29:44 -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
|
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
|
52fa6e4df8
|
wrong way around
|
2017-06-19 16:25:07 -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
|
9863f88366
|
[READY]Adds examine tooltips
|
2017-06-18 21:58:37 -05:00 |
|
CitadelStationBot
|
ba0e9e8e93
|
Alien closets now correctly cost two alloy to make (Fixes #28561)
|
2017-06-18 20:20:49 -05:00 |
|
CitadelStationBot
|
9985430c31
|
Minor flamethrower fix (#1579)
|
2017-06-17 13:36:31 -07:00 |
|
CitadelStationBot
|
4be9681e6b
|
Fixes being unable to cremate one thing (#1464)
|
2017-06-17 13:32:54 -07:00 |
|
CitadelStationBot
|
2fa5d08bf5
|
Prevents cyborgs from extruding materials (#1463)
|
2017-06-17 13:32:44 -07:00 |
|
CitadelStationBot
|
a090e33a15
|
Adds Prolonging Prism as an application scripture (#1472)
|
2017-06-17 13:31:04 -07:00 |
|
CitadelStationBot
|
9301af36da
|
Makes RCD ammo use consistent + small speed tweaks (#1646)
|
2017-06-17 13:14:59 -07: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
|
8a1a4dd671
|
Hand drill, jaws of life, and emitter grammar tweaks
|
2017-06-16 15:19:22 -05:00 |
|
LetterJay
|
63ae7e2d58
|
Merge pull request #1612 from Citadel-Station-13/upstream-merge-28456
[MIRROR] Knocked-over chairs have materials.
|
2017-06-16 11:08:35 -05:00 |
|
CitadelStationBot
|
c97658e39a
|
Knocked-over chairs have materials.
|
2017-06-15 19:48:25 -05:00 |
|