LetterJay
|
e6830cfec3
|
Merge pull request #3103 from Citadel-Station-13/upstream-merge-31222
[MIRROR] Ports dash weapons to the dash datum
|
2017-10-04 23:01:59 -04:00 |
|
LetterJay
|
c2d8f048f8
|
Update cult_items.dm
|
2017-10-04 21:49:46 -05:00 |
|
LetterJay
|
7c4373c1fe
|
Update cult_items.dm
|
2017-10-04 21:15:11 -05:00 |
|
LetterJay
|
f57929b26c
|
Update book.dm
|
2017-10-04 21:14:25 -05:00 |
|
LetterJay
|
d4cd519730
|
Merge pull request #3123 from Citadel-Station-13/upstream-merge-31276
[MIRROR] Moves laughter to the emote
|
2017-10-04 22:01:49 -04:00 |
|
LetterJay
|
365adf852c
|
Merge branch 'master' into upstream-merge-31222
|
2017-10-04 21:50:07 -04:00 |
|
LetterJay
|
e2738722fc
|
Merge pull request #3045 from Citadel-Station-13/upstream-merge-31198
[MIRROR] Fixes master
|
2017-10-04 21:48:22 -04:00 |
|
LetterJay
|
58d012b502
|
Merge branch 'master' into upstream-merge-31198
|
2017-10-04 19:06:59 -04:00 |
|
LetterJay
|
13cf0696e0
|
Merge branch 'master' into upstream-merge-31198
|
2017-10-04 19:06:42 -04:00 |
|
CitadelStationBot
|
2d27df3adc
|
Automatic changelog generation for PR #3041 [ci skip]
|
2017-10-04 18:06:04 -05:00 |
|
LetterJay
|
1a70aa0227
|
Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
|
2017-10-04 19:06:02 -04:00 |
|
CitadelStationBot
|
aa52ba93c6
|
Automatic changelog generation for PR #3134 [ci skip]
|
2017-10-04 17:45:11 -05:00 |
|
LetterJay
|
3fdc29ba42
|
Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283
[MIRROR] Fixes shaking people up while buckled into a bed/resin nest
|
2017-10-04 18:45:09 -04:00 |
|
CitadelStationBot
|
0c7aa3c39c
|
Automatic changelog generation for PR #3133 [ci skip]
|
2017-10-04 17:44:52 -05:00 |
|
LetterJay
|
9ee8b6298f
|
Merge pull request #3133 from Citadel-Station-13/upstream-merge-31275
[MIRROR] Adds deconstruction hints to various things
|
2017-10-04 18:44:50 -04:00 |
|
LetterJay
|
c2fe00cebd
|
Merge pull request #3132 from Citadel-Station-13/upstream-merge-31264
[MIRROR] Preliminary blast cannon cleanup
|
2017-10-04 18:44:38 -04:00 |
|
LetterJay
|
ecf44ff651
|
Merge pull request #3131 from Citadel-Station-13/upstream-merge-31150
[MIRROR] Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower
|
2017-10-04 18:44:21 -04:00 |
|
LetterJay
|
b217a804b6
|
Merge pull request #3130 from Citadel-Station-13/upstream-merge-31238
[MIRROR] Space vision fix V2.0 - GAME_PLANE change
|
2017-10-04 18:44:08 -04:00 |
|
LetterJay
|
aa91d6193b
|
Merge pull request #3129 from Citadel-Station-13/upstream-merge-31254
[MIRROR] Hosts can lock config options from admins
|
2017-10-04 18:43:55 -04:00 |
|
LetterJay
|
4610a7a61d
|
Merge pull request #3128 from Citadel-Station-13/upstream-merge-31180
[MIRROR] removes carp piggyback exploit
|
2017-10-04 18:43:31 -04:00 |
|
CitadelStationBot
|
ac845da94d
|
Automatic changelog generation for PR #3127 [ci skip]
|
2017-10-04 17:43:25 -05:00 |
|
LetterJay
|
4db896ed2d
|
Merge pull request #3127 from Raeschen/master
Attempt 2 at adding FTL's "Milky way" to lobby music roster
|
2017-10-04 18:43:24 -04:00 |
|
LetterJay
|
e6ccc7077a
|
Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279
[MIRROR] why plus a minus value and not just minus the value...
|
2017-10-04 18:43:04 -04:00 |
|
LetterJay
|
cfd98caf98
|
Update emote.dm
|
2017-10-04 17:42:38 -05:00 |
|
CitadelStationBot
|
497a49337d
|
Automatic changelog generation for PR #3114 [ci skip]
|
2017-10-04 17:42:04 -05:00 |
|
LetterJay
|
8c77408bb1
|
Merge pull request #3114 from Daniel0Mclovin/patch-2
Rebalanced pod people so they arnt as weak.
|
2017-10-04 18:42:02 -04:00 |
|
LetterJay
|
944c749dfc
|
Merge pull request #3117 from Citadel-Station-13/upstream-merge-31256
[MIRROR] Zombies regen toxin damage
|
2017-10-04 18:41:45 -04:00 |
|
CitadelStationBot
|
1be8e9891b
|
Automatic changelog generation for PR #3105 [ci skip]
|
2017-10-04 17:40:58 -05:00 |
|
LetterJay
|
6fe3f2a6b9
|
Merge pull request #3105 from Citadel-Station-13/upstream-merge-31125
[MIRROR] Fixes stealth nerf to detectives gun
|
2017-10-04 18:40:56 -04:00 |
|
LetterJay
|
ade361855a
|
missing icon for cult sword
|
2017-10-04 17:40:22 -05:00 |
|
LetterJay
|
b2184c1a78
|
Update cult_structures.dm
|
2017-10-04 17:38:01 -05:00 |
|
CitadelStationBot
|
406a26b701
|
Fixes shaking people up while buckled into a bed/resin nest
|
2017-10-04 17:01:27 -05:00 |
|
ShizCalev
|
929c737dfe
|
Fixes shaking people up while buckled into a bed/resin nest (#31283)
* Fixes shaking people up when buckled into bed
* CB
|
2017-10-04 17:01:27 -05:00 |
|
CitadelStationBot
|
2104347185
|
Adds deconstruction hints to various things
|
2017-10-04 16:33:51 -05:00 |
|
oranges
|
25cf971fef
|
Merge pull request #31275 from kingofkosmos/moredeconhints
Adds deconstruction hints to various things
|
2017-10-04 16:33:51 -05:00 |
|
CitadelStationBot
|
eec7dcac98
|
Preliminary blast cannon cleanup
|
2017-10-04 16:32:41 -05:00 |
|
kevinz000
|
d9d08ed57f
|
Preliminary blast cannon cleanup (#31264)
* Update blastcannon.dm
* Update blastcannon.dm
* Update blastcannon.dm
|
2017-10-04 16:32:41 -05:00 |
|
CitadelStationBot
|
946e35ee79
|
Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower
|
2017-10-04 16:29:30 -05:00 |
|
ShizCalev
|
4d23dd56b8
|
Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower (#31150)
* Hides ninja socks, draining updated to DisplayPower
* CB
* KEEP_TOGETHER
|
2017-10-04 16:29:30 -05:00 |
|
LetterJay
|
77c422d011
|
Update emote.dm
|
2017-10-04 16:11:24 -05:00 |
|
CitadelStationBot
|
35f0963fd6
|
Space vision fix V2.0 - GAME_PLANE change
|
2017-10-04 15:14:07 -05:00 |
|
oranges
|
c22f4a044d
|
Merge pull request #31238 from AnturK/specialeyes
Space vision fix V2.0 - GAME_PLANE change
|
2017-10-04 15:14:07 -05:00 |
|
CitadelStationBot
|
72bee84877
|
Hosts can lock config options from admins
|
2017-10-04 14:59:33 -05:00 |
|
JJRcop
|
65a997f929
|
Hosts can lock config options from admins (#31254)
* Hosts can lock config options from admins
* Optimization of LoadEntries
a very very very small one
|
2017-10-04 14:59:33 -05:00 |
|
CitadelStationBot
|
5b7d74700a
|
removes carp piggyback exploit
|
2017-10-04 14:51:16 -05:00 |
|
kevinz000
|
9e59a29e35
|
Update projectile.dm (#31180)
|
2017-10-04 14:51:16 -05:00 |
|
Raeschen
|
e3f8145b07
|
Merge branch 'master' into master
|
2017-10-04 20:24:26 +01:00 |
|
Raeschen
|
26c262542e
|
Merge branch 'master' into master
|
2017-10-04 20:23:58 +01:00 |
|
Raeschen
|
48e5582d0a
|
Attempt 2 at adding FTL's "Milky way" to lobby music roster
|
2017-10-04 20:20:09 +01:00 |
|
CitadelStationBot
|
d6e0bb03cd
|
why plus a minus value and not just minus the value...
|
2017-10-04 14:03:20 -05:00 |
|