a47776705a
Automatic changelog generation for PR #2666 [ci skip]
2017-09-09 01:04:24 -05:00
f47e4a8280
Merge pull request #2666 from Citadel-Station-13/upstream-merge-30498
...
[MIRROR] Golem shells can no longer fit in bags
2017-09-09 01:04:23 -05:00
12a30f8ec1
Automatic changelog generation for PR #2663 [ci skip]
2017-09-09 01:03:18 -05:00
5c4940c832
Merge pull request #2663 from Citadel-Station-13/upstream-merge-30389
...
[MIRROR] Adds a short telegraph to the watcher's blasts
2017-09-09 01:03:15 -05:00
80d0048ac0
Automatic changelog generation for PR #2662 [ci skip]
2017-09-09 01:02:52 -05:00
5202705ed7
Merge pull request #2662 from Citadel-Station-13/upstream-merge-30487
...
[MIRROR] Adds shamebrero penguin for dumb alphonzo
2017-09-09 01:02:50 -05:00
4cae24d2c0
Merge pull request #2655 from Citadel-Station-13/upstream-merge-30477
...
[MIRROR] Updates metadata on title1.ogg
2017-09-09 01:00:15 -05:00
780faec591
Merge pull request #2652 from Citadel-Station-13/upstream-merge-30202
...
[MIRROR] You can now drag things up and down ladders
2017-09-09 00:59:58 -05:00
d35717e1ab
[MIRROR] Fixes assault pod blinking docking effects ( #2667 )
...
* Fixes assault pod blinking docking effects (#30492 )
* Fixes assault pod blinking docking effects
2017-09-08 20:15:10 -05:00
a1f79ba143
Golem shells can no longer fit in bags
2017-09-08 13:53:01 -05:00
8010c44c72
Golem shells can no longer fit in bags ( #30498 )
...
* Automatic changelog generation for PR #30056 [ci skip]
* RIP pocket army
* Delete AutoChangeLog-pr-30056.yml
2017-09-08 13:53:00 -05:00
ec1fe518bb
Adds a short telegraph to the watcher's blasts
2017-09-08 10:18:41 -05:00
2f438e5f4a
Adds a short telegraph to the watcher's blasts ( #30389 )
...
* Adds a telegraph to the watcher's blasts
* hmm
2017-09-08 10:18:41 -05:00
3be70082b5
Adds shamebrero penguin for dumb alphonzo
2017-09-08 10:11:21 -05:00
2ab29ccac4
Adds shamebrero penguin for dumb alphonzo ( #30487 )
2017-09-08 10:11:21 -05:00
157eb57cab
Updates metadata on title1.ogg
2017-09-08 07:07:13 -05:00
17b5eecf83
Updated metadata on title1.ogg ( #30477 )
2017-09-08 07:07:13 -05:00
ce787e7726
Reverts sav file persistance for poly/pun-pun ( #2654 )
...
* Reverts sav file persistance for poly/pun-pun
* makes sure poly writes to poly
2017-09-08 06:58:08 -05:00
ed4488bd1d
cleans merge conflict mess of #2638 ( #2639 )
2017-09-08 06:55:51 -05:00
50cd75df7d
Actually makes Citadel reagents process ( #2653 )
2017-09-08 06:55:19 -05:00
7155e1c631
Automatic changelog generation for PR #2651 [ci skip]
2017-09-07 16:17:35 -05:00
a806ecad19
Merge pull request #2651 from Citadel-Station-13/upstream-merge-30486
...
[MIRROR] Fixes goliath butchering
2017-09-07 15:57:03 -05:00
d5c4f6e62d
Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451
...
[MIRROR] Disablers and ions wont burn plasma statues statues
2017-09-07 15:55:04 -05:00
93a98c000b
Merge pull request #2648 from Citadel-Station-13/upstream-merge-30460
...
[MIRROR] You can't fly with hair on your wings [Bee Suit Hair Suffix Fix]
2017-09-07 15:54:49 -05:00
217e077342
Merge pull request #2645 from Citadel-Station-13/upstream-merge-30469
...
[MIRROR] Fixes containment field CanPass
2017-09-07 15:54:34 -05:00
82cfa67581
Merge pull request #2644 from Citadel-Station-13/upstream-merge-30233
...
[MIRROR] Adds a message when trying to move while buckled
2017-09-07 15:53:38 -05:00
a803a512ea
You can now drag things up and down ladders
2017-09-07 12:48:43 -05:00
b9bbd348df
You can now drag things up and down ladders ( #30202 )
...
* Can drag things up and down ladders
* Somehow left out this line
* Icon update, auto_connect
* Uses the proper pulling proc
2017-09-07 12:48:43 -05:00
99aa3a9217
Fixes goliath butchering
2017-09-07 11:58:42 -05:00
ff219f365e
Update goliath.dm ( #30486 )
2017-09-07 11:58:42 -05:00
df50c6b57b
Disablers and ions wont burn plasma statues statues
2017-09-07 10:34:45 -05:00
b172025e96
Disablers and ions wont burn statues
2017-09-07 10:34:44 -05:00
6521dfa216
You can't fly with hair on your wings [Bee Suit Hair Suffix Fix]
2017-09-07 10:34:36 -05:00
b6eddd8845
ok
2017-09-07 10:34:36 -05:00
2a0996b0af
Fixes containment field CanPass
2017-09-07 10:34:11 -05:00
df3b4c10bc
Fixes containment field CanPass
2017-09-07 10:34:11 -05:00
c55ac69e4a
Merge pull request #2634 from Citadel-Station-13/upstream-merge-30458
...
[MIRROR] Allows atmos techs to download the SM monitor
2017-09-07 10:23:15 -05:00
21a72cd04c
Merge pull request #2640 from Citadel-Station-13/upstream-merge-30436
...
[MIRROR] More timer debugging for the debug gods.
2017-09-07 10:22:45 -05:00
c1ccc98513
Automatic changelog generation for PR #2642 [ci skip]
2017-09-07 10:22:19 -05:00
9ca0d6588d
Merge pull request #2642 from Citadel-Station-13/upstream-merge-30400
...
[MIRROR] Adds a unique suicide to the hierophant club, plus some attack verbs
2017-09-07 10:22:17 -05:00
8d854a53d8
Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426
...
[MIRROR] Fixes swarmers breaking the SM's containment
2017-09-07 10:21:57 -05:00
dd27a1850a
Adds a message when trying to move while buckled
2017-09-07 10:12:32 -05:00
06649108c5
Adds a unique suicide to the hierophant club, plus some attack verbs
2017-09-07 10:01:55 -05:00
938c10ad1c
Adds a unique suicide to the hierophant club, plus some attack verbs ( #30400 )
...
* Adds a suicide to the hierophant club
* Above
* good point
* Removes the delay
2017-09-07 10:01:55 -05:00
73aaf8a90b
Automatic changelog generation for PR #2608 [ci skip]
2017-09-07 10:01:37 -05:00
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
393c4bb419
More timer debugging for the debug gods.
2017-09-07 09:59:29 -05:00
4b02f01a66
More timer debugging for the debug gods. ( #30436 )
...
* More timer debugging for the debug gods.
* Its times like this I wish I could amend commit from the web interface
* git commit -a -amend&&git push --force
2017-09-07 09:59:28 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
2768aa68f9
Merge pull request #2638 from Citadel-Station-13/upstream-merge-30441
...
[MIRROR] Fixes tgstation-server autotagging
2017-09-07 07:37:40 -05:00
CitadelStationBot