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 |
|
LetterJay
|
53afc150f9
|
Merge pull request #1581 from Citadel-Station-13/upstream-merge-28398
[MIRROR] Changes config tag for secret extended
|
2017-06-26 02:30:58 -05:00 |
|
CitadelStationBot
|
acc03ae85e
|
Fixes bad del runtime
|
2017-06-24 11:48:05 -05:00 |
|
CitadelStationBot
|
b7d8fea575
|
Fixes nuclear bombs being radioactive (#1757)
|
2017-06-24 09:11:49 -07: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 |
|
LetterJay
|
42b910b768
|
Merge pull request #1742 from Citadel-Station-13/upstream-merge-28682
[MIRROR] Fixes a comment typo
|
2017-06-22 19:22:57 -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
|
84cd74bc4b
|
Merge pull request #1738 from Citadel-Station-13/upstream-merge-28677
[MIRROR] Areas.dm cleanup + new icons
|
2017-06-22 19:21:59 -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
|
fd3cc10b55
|
Fixes a comment typo
|
2017-06-22 14:34:12 -05:00 |
|
CitadelStationBot
|
d0d1ae1e01
|
Readds sprites for grey & nanotrasen bedsheets
|
2017-06-22 11:03:26 -05:00 |
|
CitadelStationBot
|
7ce0be3ab6
|
Areas.dm cleanup + new icons
|
2017-06-22 11:02:21 -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 |
|
LetterJay
|
0719541100
|
Merge pull request #1721 from Citadel-Station-13/upstream-merge-28640
[MIRROR] Lavaland's default atmos is now a define
|
2017-06-21 15:45:34 -05:00 |
|
CitadelStationBot
|
d587d692c6
|
Flame thrower plasma tanks can be removed easily.
|
2017-06-21 13:21:31 -05:00 |
|
CitadelStationBot
|
df815e99bd
|
Lavaland's default atmos is now a define
|
2017-06-21 08:32:00 -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
|
68498b3597
|
RADIMMUNE species can no longer be used for radiation free DNA research (#1553)
|
2017-06-20 08:02:38 -07:00 |
|
CitadelStationBot
|
72d329cf31
|
Makes RADIMMUNE species incompatible with radiation based DNA injectors (#1518)
|
2017-06-20 08:00:21 -07:00 |
|
CitadelStationBot
|
30d3a42db6
|
Minor telecom code cleanup (#1691)
|
2017-06-20 07:58:53 -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
|
f668021230
|
commit
|
2017-06-19 17:33:40 -05:00 |
|
LetterJay
|
9332353714
|
update
|
2017-06-19 17:31:00 -05:00 |
|
LetterJay
|
866a569e41
|
dmi to png
|
2017-06-19 17:28:06 -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
|
12055144e4
|
fix it
|
2017-06-19 16:09:16 -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
|
7ad1ab9f0f
|
Ratvar is no longer stopped by pathetic windows
|
2017-06-17 22:11:36 -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
|
4c3f515fd6
|
Fixes borging factory (#1580)
|
2017-06-17 13:30:27 -07:00 |
|
CitadelStationBot
|
9301af36da
|
Makes RCD ammo use consistent + small speed tweaks (#1646)
|
2017-06-17 13:14:59 -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 |
|
LetterJay
|
67db8fc9ad
|
Merge pull request #1630 from Citadel-Station-13/upstream-merge-28492
[MIRROR] Vomit fix
|
2017-06-17 10:03:11 -05:00 |
|